ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: Fixed GridCacheLocalIsolatedNodesSelfTest and GridCacheLocalFullApiMultithreadedSelfTest.testRemoveAllAsync tests.
Date Mon, 30 Nov 2015 13:49:24 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 8e605e9f3 -> 407bf939a


Fixed GridCacheLocalIsolatedNodesSelfTest and GridCacheLocalFullApiMultithreadedSelfTest.testRemoveAllAsync
tests.


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

Branch: refs/heads/ignite-1.5
Commit: 407bf939a8beae32108cdb60bfba3efe3cc8d7c1
Parents: 8e605e9
Author: Tikhonov Nikolay <tikhonovnicolay@gmail.com>
Authored: Mon Nov 30 16:49:14 2015 +0300
Committer: Tikhonov Nikolay <tikhonovnicolay@gmail.com>
Committed: Mon Nov 30 16:49:14 2015 +0300

----------------------------------------------------------------------
 .../GridCacheAbstractFullApiMultithreadedSelfTest.java      | 9 +++++++--
 .../cache/local/GridCacheLocalIsolatedNodesSelfTest.java    | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/407bf939/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index e89288f..5e43b2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.HashSet;
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -341,12 +342,16 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest
extends Grid
 
                 IgniteCache<String, Integer> cacheAsync = cache.withAsync();
 
+                Set<Integer> ids = new HashSet<>(set);
+
                 cacheAsync.removeAll(rangeKeys(0, rnd));
 
                 cacheAsync.future().get();
 
-                for (int i = 0; i < rnd; i++)
-                    assert cache.localPeek("key" + i, CachePeekMode.ONHEAP) == null;
+                for (int i = 0; i < rnd; i++) {
+                    if (ids.contains(i))
+                        assert cache.localPeek("key" + i, CachePeekMode.ONHEAP) == null;
+                }
             }
         });
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/407bf939/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
index e6b66ca..53122c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
@@ -66,7 +66,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest
         assert !nid1.equals(nid3);
 
         // Local cache on first node only.
-        CacheConfiguration<String, String> ccfg1 = new CacheConfiguration<>("A");
+        CacheConfiguration<String, String> ccfg1 = new CacheConfiguration<>("A1");
         ccfg1.setCacheMode(LOCAL);
         ccfg1.setNodeFilter(new NodeIdFilter(nid1));
 
@@ -74,7 +74,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest
         c1.put("g1", "c1");
 
         // Local cache on second node only.
-        CacheConfiguration<String, String> ccfg2 = new CacheConfiguration<>("A");
+        CacheConfiguration<String, String> ccfg2 = new CacheConfiguration<>("A2");
         ccfg2.setCacheMode(LOCAL);
         ccfg2.setNodeFilter(new NodeIdFilter(nid2));
 
@@ -82,7 +82,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest
         c2.put("g2", "c2");
 
         // Local cache on third node only.
-        CacheConfiguration<String, String> ccfg3 = new CacheConfiguration<>("A");
+        CacheConfiguration<String, String> ccfg3 = new CacheConfiguration<>("A3");
         ccfg3.setCacheMode(LOCAL);
         ccfg3.setNodeFilter(new NodeIdFilter(nid3));
 


Mime
View raw message