ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [04/11] ignite git commit: ignite-gg-12163 fix testExchangeMessages after merge
Date Mon, 29 May 2017 07:46:14 GMT
ignite-gg-12163 fix testExchangeMessages after merge


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59b88f5f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59b88f5f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59b88f5f

Branch: refs/heads/ignite-5267
Commit: 59b88f5fef05e36cc50962d156e78b539f136e13
Parents: 059008e
Author: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Authored: Thu May 25 20:25:48 2017 +0300
Committer: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Committed: Thu May 25 20:25:48 2017 +0300

----------------------------------------------------------------------
 .../cache/CacheExchangeMessageDuplicatedStateTest.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/59b88f5f/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 d8a2065..99e6afb 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
@@ -40,9 +40,10 @@ import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
+import static org.apache.ignite.testframework.GridTestUtils.getFieldValue;
+
 /**
  *
  */
@@ -234,7 +235,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
      * @param msg Message.
      */
     private void checkFullMessage(GridDhtPartitionsFullMessage msg) {
-        Map<Integer, Integer> dupPartsData = GridTestUtils.getFieldValue(msg, "dupPartsData");
+        Map<Integer, Integer> dupPartsData = getFieldValue(msg, "dupPartsData");
 
         assertNotNull(dupPartsData);
 
@@ -243,7 +244,8 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
 
         assertFalse(dupPartsData.containsKey(CU.cacheId(AFF3_CACHE1)));
 
-        Map<Integer, Map<Integer, Long>> partCntrs = GridTestUtils.getFieldValue(msg,
"partCntrs");
+        Map<Integer, Map<Integer, Long>> partCntrs =
+            getFieldValue(getFieldValue(msg, "partCntrs"), "map");
 
         if (partCntrs != null) {
             for (Map<Integer, Long> cntrs : partCntrs.values())
@@ -255,7 +257,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
      * @param msg Message.
      */
     private void checkSingleMessage(GridDhtPartitionsSingleMessage msg) {
-        Map<Integer, Integer> dupPartsData = GridTestUtils.getFieldValue(msg, "dupPartsData");
+        Map<Integer, Integer> dupPartsData = getFieldValue(msg, "dupPartsData");
 
         assertNotNull(dupPartsData);
 
@@ -264,7 +266,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
 
         assertFalse(dupPartsData.containsKey(CU.cacheId(AFF3_CACHE1)));
 
-        Map<Integer, Map<Integer, Long>> partCntrs = GridTestUtils.getFieldValue(msg,
"partCntrs");
+        Map<Integer, Map<Integer, Long>> partCntrs = getFieldValue(msg, "partCntrs");
 
         if (partCntrs != null) {
             for (Map<Integer, Long> cntrs : partCntrs.values())


Mime
View raw message