Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D16F018E3A for ; Thu, 24 Sep 2015 23:11:38 +0000 (UTC) Received: (qmail 87113 invoked by uid 500); 24 Sep 2015 23:11:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87029 invoked by uid 500); 24 Sep 2015 23:11:38 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 85894 invoked by uid 99); 24 Sep 2015 23:11:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2015 23:11:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA3E9E0A00; Thu, 24 Sep 2015 23:11:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Thu, 24 Sep 2015 23:12:07 -0000 Message-Id: <3ac67a153135449ebc56db9d5190a30e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/50] ignite git commit: Added test. Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1942d758 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1942d758 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1942d758 Branch: refs/heads/ignite-257 Commit: 1942d75856ab6d317b743de71b53a29abf81316a Parents: ca2bce0 Author: sboikov Authored: Tue Sep 22 17:36:18 2015 +0300 Committer: sboikov Committed: Tue Sep 22 17:36:18 2015 +0300 ---------------------------------------------------------------------- .../IgniteCachePutRetryAbstractSelfTest.java | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1942d758/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java index 943caeb..76f12c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java @@ -168,6 +168,13 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst /** * @throws Exception If failed. */ + public void testGetAndPut() throws Exception { + checkRetry(Test.GET_AND_PUT, TestMemoryMode.HEAP, false); + } + + /** + * @throws Exception If failed. + */ public void testPutStoreEnabled() throws Exception { checkRetry(Test.PUT, TestMemoryMode.HEAP, true); } @@ -275,6 +282,29 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst break; } + case GET_AND_PUT: { + for (int i = 0; i < keysCnt; i++) + cache.put(i, 0); + + while (System.currentTimeMillis() < stopTime) { + Integer expOld = iter; + + Integer val = ++iter; + + for (int i = 0; i < keysCnt; i++) { + Integer old = cache.getAndPut(i, val); + + assertTrue("Unexpected old value [old=" + old + ", exp=" + expOld + ']', + expOld.equals(old) || val.equals(old)); + } + + for (int i = 0; i < keysCnt; i++) + assertEquals(val, cache.get(i)); + } + + break; + } + case PUT_ALL: { while (System.currentTimeMillis() < stopTime) { Integer val = ++iter; @@ -495,6 +525,9 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst PUT, /** */ + GET_AND_PUT, + + /** */ PUT_ALL, /** */