Repository: ignite Updated Branches: refs/heads/ignite-1.5 c30def8f0 -> 3baf4d163
http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java index 1f494c0..5bb6794 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java @@ -220,8 +220,6 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { Thread.sleep(1000); jcache().get(rand.nextInt(cnt)); - - assertEquals(0, local().map.iteratorMapSize()); } /** @@ -315,8 +313,6 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { Thread.sleep(1000); jcache().get(rand.nextInt(cnt)); - - assertEquals(0, local().map.iteratorMapSize()); } /** @@ -352,14 +348,7 @@ public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest { System.gc(); c.get(100); - - if (local().map.iteratorMapSize() == 0) - break; - else - U.sleep(500); } - - assertEquals(0, local().map.iteratorMapSize()); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3baf4d16/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java index a41f6c8..b459dde 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java @@ -81,7 +81,7 @@ public class GridHashMapLoadTest extends GridCommonAbstractTest { Integer val = i++; map.put(key, new GridCacheMapEntry(ctx, ctx.toCacheKeyObject(key), - key.hashCode(), ctx.toCacheObject(val), null, 1) { + key.hashCode(), ctx.toCacheObject(val)) { @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, @@ -103,4 +103,4 @@ public class GridHashMapLoadTest extends GridCommonAbstractTest { info("Inserted objects: " + i / 2); } } -} \ No newline at end of file +}