[jbosscache-commits] JBoss Cache SVN: r7849 - in core/branches/flat/src: test/java/org/horizon/statetransfer and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-03-04 12:21:12 -0500 (Wed, 04 Mar 2009)
New Revision: 7849

Modified:
   core/branches/flat/src/main/java/org/horizon/statetransfer/StateTransferManagerImpl.java
   core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferCacheLoaderFunctionalTest.java
   core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferFunctionalTest.java
Log:
Improved NBST tests

Modified: core/branches/flat/src/main/java/org/horizon/statetransfer/StateTransferManagerImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/statetransfer/StateTransferManagerImpl.java	2009-03-04 17:02:56 UTC (rev 7848)
+++ core/branches/flat/src/main/java/org/horizon/statetransfer/StateTransferManagerImpl.java	2009-03-04 17:21:12 UTC (rev 7849)
@@ -90,8 +90,8 @@
       this.interceptorChain = interceptorChain;
    }
 
-   @Start(priority = 14)
-   // it is imperative that this starts *after* the RPCManager does.
+   @Start(priority = 55)
+   // it is imperative that this starts *after* the RPCManager does, and *after* the cache loader manager (if any) inits and preloads
    public void start() throws StateTransferException {
       log.trace("Data container is {0}", System.identityHashCode(dataContainer));
       cs = clm == null ? null : clm.getCacheStore();

Modified: core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferCacheLoaderFunctionalTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferCacheLoaderFunctionalTest.java	2009-03-04 17:02:56 UTC (rev 7848)
+++ core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferCacheLoaderFunctionalTest.java	2009-03-04 17:21:12 UTC (rev 7849)
@@ -72,21 +72,24 @@
       assert !l.containsKey(A_D_NAME);
    }
 
-
    public void testSharedLoader() throws Exception {
-      sharedCacheLoader.set(true);
-      Cache<Object, Object> c1 = createCacheManager().getCache(cacheName);
-      writeInitialData(c1);
+      try {
+         sharedCacheLoader.set(true);
+         Cache<Object, Object> c1 = createCacheManager().getCache(cacheName);
+         writeInitialData(c1);
 
-      // starting the second cache would initialize an in-memory state transfer but not a persistent one since the loader is shared
-      Cache<Object, Object> c2 = createCacheManager().getCache(cacheName);
+         // starting the second cache would initialize an in-memory state transfer but not a persistent one since the loader is shared
+         Cache<Object, Object> c2 = createCacheManager().getCache(cacheName);
 
-      TestingUtil.blockUntilViewsReceived(60000, c1, c2);
+         TestingUtil.blockUntilViewsReceived(60000, c1, c2);
 
-      verifyInitialDataOnLoader(c1);
-      verifyInitialData(c1);
+         verifyInitialDataOnLoader(c1);
+         verifyInitialData(c1);
 
-      verifyNoDataOnLoader(c2);
-      verifyNoData(c2);
+         verifyNoDataOnLoader(c2);
+         verifyNoData(c2);
+      } finally {
+         sharedCacheLoader.set(false);
+      }
    }
 }

Modified: core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferFunctionalTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferFunctionalTest.java	2009-03-04 17:02:56 UTC (rev 7848)
+++ core/branches/flat/src/test/java/org/horizon/statetransfer/StateTransferFunctionalTest.java	2009-03-04 17:21:12 UTC (rev 7849)
@@ -110,7 +110,10 @@
             try {
                if (c % 1000 == 0) {
                   if (tx) tm.begin();
-                  for (int i = 0; i < 1000; i++) cache.remove("test" + c);
+                  for (int i = 0; i < 1000; i++) {
+                     cache.remove("test" + c);
+                     c++;
+                  }
                   if (tx) tm.commit();
                   c = 0;
                } else {
@@ -158,7 +161,7 @@
 
       cache2 = createCacheManager().getCache(cacheName);
 
-      cache1.put("delay", new DelayTransfer());
+      cache1.put("delay", new StateTransferFunctionalTest.DelayTransfer());
 
       // Pause to give caches time to see each other
       TestingUtil.blockUntilViewsReceived(60000, cache1, cache2);