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

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-03-11 16:36:36 -0400 (Tue, 11 Mar 2008)
New Revision: 5411

Modified:
   core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java
Log:
Added test

Modified: core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java	2008-03-11 04:05:28 UTC (rev 5410)
+++ core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java	2008-03-11 20:36:36 UTC (rev 5411)
@@ -11,6 +11,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.Option;
+import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 import org.testng.annotations.AfterMethod;
@@ -41,9 +42,6 @@
       c.setCacheMode("REPL_SYNC");
       c.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
 
-      cache1.start();
-      cache2.start();
-
       cacheModeLocal = new Option();
       cacheModeLocal.setCacheModeLocal(true);
    }
@@ -51,21 +49,32 @@
    @AfterMethod(alwaysRun = true)
    public void tearDown()
    {
-      if (cache1 != null)
-      {
-         cache1.stop();
-         cache1 = null;
-      }
+      TestingUtil.killCaches(cache1, cache2);
+   }
 
-      if (cache2 != null)
+   public void testCacheModeLocalWithTx() throws Exception
+   {
+      doTest(false);
+   }
+
+   public void testCacheModeLocalOptimisticWithTx() throws Exception
+   {
+      doTest(true);
+   }
+
+   private void doTest(boolean optimistic) throws Exception
+   {
+      if (optimistic)
       {
-         cache2.stop();
-         cache2 = null;
+         cache1.getConfiguration().setNodeLockingScheme(Configuration.NodeLockingScheme.OPTIMISTIC);
+         cache2.getConfiguration().setNodeLockingScheme(Configuration.NodeLockingScheme.OPTIMISTIC);
       }
-   }
 
-   public void testCacheModeLocalWithTx() throws Exception
-   {
+      cache1.start();
+      cache2.start();
+
+      TestingUtil.blockUntilViewsReceived(10000, cache1, cache2);
+
       TransactionManager mgr = cache1.getTransactionManager();
       mgr.begin();