[infinispan-commits] Infinispan SVN: r1068 - in trunk/core/src/test/java/org/infinispan/distribution: rehash and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-10-29 10:11:18 -0400 (Thu, 29 Oct 2009)
New Revision: 1068

Modified:
   trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
   trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java
Log:
Enable rehashing for certain tests

Modified: trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-10-29 14:10:48 UTC (rev 1067)
+++ trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-10-29 14:11:18 UTC (rev 1068)
@@ -36,10 +36,12 @@
    protected boolean tx = false;
    protected boolean testRetVals = true;
    protected boolean l1CacheEnabled = true;
+   protected boolean performRehashing = false;
 
    protected void createCacheManagers() throws Throwable {
       cacheName = "dist";
       configuration = getDefaultClusteredConfig(sync ? Configuration.CacheMode.DIST_SYNC : Configuration.CacheMode.DIST_ASYNC, tx);
+      configuration.setFetchInMemoryState(performRehashing);
       if (!testRetVals) {
          configuration.setUnsafeUnreliableReturnValues(true);
          // we also need to use repeatable read for tests to work when we dont have reliable return values, since the

Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java	2009-10-29 14:10:48 UTC (rev 1067)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java	2009-10-29 14:11:18 UTC (rev 1068)
@@ -27,6 +27,7 @@
    protected RehashTestBase() {
       cleanup = CleanupPhase.AFTER_METHOD;
       tx = true;
+      performRehashing = true;
    }
 
    // this setup has 4 running caches: {c1, c2, c3, c4}

Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java	2009-10-29 14:10:48 UTC (rev 1067)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/SingleJoinTest.java	2009-10-29 14:11:18 UTC (rev 1068)
@@ -1,11 +1,11 @@
 package org.infinispan.distribution.rehash;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 import org.infinispan.Cache;
 import org.infinispan.manager.CacheManager;
 import org.testng.annotations.Test;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 @Test(groups = "functional", testName = "distribution.rehash.SingleJoinTest")
 public class SingleJoinTest extends RehashTestBase {
    CacheManager joinerManager;