ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] incubator-ignite git commit: # sprint-2 fixed test
Date Wed, 25 Mar 2015 11:54:43 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/sprint-2 56bccdea4 -> c3768f74c


# sprint-2 fixed test


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

Branch: refs/heads/sprint-2
Commit: 32a441fc290344efa5aa885dfe79f337574163d9
Parents: 88f7fc2
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Mar 25 14:27:25 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Mar 25 14:54:09 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheSwapPreloadSelfTest.java           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32a441fc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
index f457ca6..df7e2b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
@@ -34,13 +34,14 @@ import java.util.concurrent.atomic.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheRebalanceMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
  * Test for cache swap preloading.
  */
 public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
     /** Entry count. */
-    private static final int ENTRY_CNT = 15000;
+    private static final int ENTRY_CNT = 15_000;
 
     /** */
     private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -62,7 +63,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest
{
 
         CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
-        cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+        cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
         cacheCfg.setSwapEnabled(true);
         cacheCfg.setCacheMode(cacheMode);
         cacheCfg.setRebalanceMode(SYNC);
@@ -134,12 +135,9 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest
{
     }
 
     /**
-     * TODO: GG-4804 Swap preloading test failed with NotNull assertion, TODO: GG-4804 while
key should have been found
-     * either in swap or in cache
-     *
      * @throws Exception If failed.
      */
-    public void _testSwapReplicatedMultithreaded() throws Exception {
+    public void testSwapReplicatedMultithreaded() throws Exception {
         cacheMode = REPLICATED;
 
         checkSwapMultithreaded();
@@ -195,6 +193,10 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest
{
 
             done.set(true);
 
+            fut.get();
+
+            fut = null;
+
             int size = grid(1).cache(null).localSize();
 
             info("New node cache size: " + size);


Mime
View raw message