[jbosscache-commits] JBoss Cache SVN: r4597 - core/trunk/src/test/java/org/jboss/cache/options.

[jbosscache-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-10-10 14:01:21 -0400 (Wed, 10 Oct 2007)
New Revision: 4597

Modified:
   core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java
Log:
Don't reuse Option; avoid JBCACHE-1196 (which probably isn't an issue anyway; reusing the Option is bad practice).

Modified: core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java	2007-10-10 16:52:43 UTC (rev 4596)
+++ core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java	2007-10-10 18:01:21 UTC (rev 4597)
@@ -8,11 +8,11 @@
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertTrue;
 
 import java.util.concurrent.CountDownLatch;
 
-import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
 import org.apache.commons.logging.Log;
@@ -90,10 +90,18 @@
 
       cache1.getInvocationContext().setOptionOverrides(local);
       cache1.put(FQNA, KEY, VALUE1);
-
+      
+      assertEquals("Cache1 correct", VALUE1, cache1.get(FQNA, KEY));
+      
+      local = new Option();
+      local.setCacheModeLocal(true);
       cache2.getInvocationContext().setOptionOverrides(local);
       cache2.put(FQNA, KEY, VALUE1);
 
+      // Validate data is as expected
+      assertEquals("Cache1 correct", VALUE1, cache1.get(FQNA, KEY));
+      assertEquals("Cache2 correct", VALUE1, cache2.get(FQNA, KEY));
+      
       listener = new BlockingListener();
       cache2.addCacheListener(listener);
    }
@@ -312,6 +320,7 @@
 
       updater.join(250);
       assertTrue("Updater finished", updater.finished);
+      assertNull("Updater succeeded", updater.failure);
 
       for (int i = 0; i < 50; i++)
       {
@@ -375,6 +384,10 @@
             break;
          TestingUtil.sleepThread(10);
       }
+      
+      assertTrue("Updater finished", updater.finished);
+      assertFalse("Listener blocked", listener.blocked);
+      assertNull("Updater succeeded", updater.failure);
 
       assertEquals("Cache1 correct", removeTest ? null : VALUE2, cache1.get(FQNA, KEY));