Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9D4ED200D0F for ; Thu, 14 Sep 2017 16:41:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9BCCB1609CC; Thu, 14 Sep 2017 14:41:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EAEBD1609CF for ; Thu, 14 Sep 2017 16:41:04 +0200 (CEST) Received: (qmail 81870 invoked by uid 500); 14 Sep 2017 14:41:04 -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 81709 invoked by uid 99); 14 Sep 2017 14:41:03 -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, 14 Sep 2017 14:41:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FC97F57D5; Thu, 14 Sep 2017 14:41:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Thu, 14 Sep 2017 14:41:07 -0000 Message-Id: <3146e5c444d549359b37ebf7f5acbc9c@git.apache.org> In-Reply-To: <525a2fc0ba7645339a822a0978a3e0ed@git.apache.org> References: <525a2fc0ba7645339a822a0978a3e0ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/10] ignite git commit: IGNITE-6379 - Fixed CacheExchangeMessageDuplicatedStateTest archived-at: Thu, 14 Sep 2017 14:41:05 -0000 IGNITE-6379 - Fixed CacheExchangeMessageDuplicatedStateTest Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2776cb6f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2776cb6f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2776cb6f Branch: refs/heads/ignite-5896 Commit: 2776cb6f33c409e582311a0c250f2afa652ae863 Parents: c0bd57c Author: Alexey Goncharuk Authored: Thu Sep 14 11:33:19 2017 +0300 Committer: Alexey Goncharuk Committed: Thu Sep 14 11:33:19 2017 +0300 ---------------------------------------------------------------------- ...CacheExchangeMessageDuplicatedStateTest.java | 27 +++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2776cb6f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java index bff63fb..3341095 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java @@ -27,6 +27,8 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.TestRecordingCommunicationSpi; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionFullCountersMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionPartialCountersMap; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsAbstractMessage; @@ -193,7 +195,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT List msgs = commSpi0.recordedMessages(false); - assertTrue(msgs.size() > 0); + assertTrue(!msgs.isEmpty()); for (Object msg : msgs) { assertTrue("Unexpected messages: " + msg, msg instanceof GridDhtPartitionsFullMessage); @@ -217,7 +219,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT List msgs = commSpi0.recordedMessages(false); - assertTrue(msgs.size() > 0); + assertTrue(!msgs.isEmpty()); for (Object msg : msgs) { assertTrue("Unexpected messages: " + msg, msg instanceof GridDhtPartitionsSingleMessage); @@ -244,12 +246,19 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT assertFalse(dupPartsData.containsKey(CU.cacheId(AFF3_CACHE1))); - Map> partCntrs = - getFieldValue(getFieldValue(msg, "partCntrs"), "map"); + Map partCntrs = + getFieldValue(getFieldValue(msg, "partCntrs2"), "map"); if (partCntrs != null) { - for (Map cntrs : partCntrs.values()) - assertTrue(cntrs.isEmpty()); + for (CachePartitionFullCountersMap cntrs : partCntrs.values()) { + long[] initialUpdCntrs = getFieldValue(cntrs, "initialUpdCntrs"); + long[] updCntrs = getFieldValue(cntrs, "updCntrs"); + + for (int i = 0; i < initialUpdCntrs.length; i++) { + assertEquals(0, initialUpdCntrs[i]); + assertEquals(0, updCntrs[i]); + } + } } } @@ -266,11 +275,11 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT assertFalse(dupPartsData.containsKey(CU.cacheId(AFF3_CACHE1))); - Map> partCntrs = getFieldValue(msg, "partCntrs"); + Map partCntrs = getFieldValue(msg, "partCntrs"); if (partCntrs != null) { - for (Map cntrs : partCntrs.values()) - assertTrue(cntrs.isEmpty()); + for (CachePartitionPartialCountersMap cntrs : partCntrs.values()) + assertEquals(0, cntrs.size()); } }