[jbosscache-commits] JBoss Cache SVN: r7421 - core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-09 04:03:32 -0500 (Fri, 09 Jan 2009)
New Revision: 7421

Modified:
   core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
Log:
test run now on appropriate protocol stack

Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java	2009-01-09 08:49:36 UTC (rev 7420)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java	2009-01-09 09:03:32 UTC (rev 7421)
@@ -42,7 +42,6 @@
    public void setUp() throws Exception
    {
       cache1 = initCache(false);
-      TestingUtil.sleepThread(1500); // to ensure cache1 is the coordinator
       cache2 = initCache(false);
       cache3 = initCache(true);
    }
@@ -58,10 +57,9 @@
 
    private CacheSPI initCache(boolean notifying) throws Exception           
    {      
-      Configuration conf = new Configuration();
+      Configuration conf = UnitTestCacheConfigurationFactory.getEmptyConfiguration();
       conf.setCacheMode("REPL_SYNC");
       conf.setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC);
-      conf.setClusterConfig(getJGroupsStack());
       conf.setFetchInMemoryState(false);
       CacheSPI c = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(conf, false, getClass());
       if (!notifying)
@@ -76,21 +74,6 @@
       return c;
    }
 
-   // we need a 'special' stack that does not attempt redelivery since we kill a channel midway during a tx in this test.
-   private String getJGroupsStack() throws Exception           
-   {
-      return UnitTestCacheConfigurationFactory.getClusterConfigFromProperties(JChannel.DEFAULT_PROTOCOL_STACK);
-   }
-
-   private void destroyCache(CacheSPI c)
-   {
-      if (c != null)
-      {
-         c.stop();
-         c.destroy();
-      }
-   }
-
    public void testSyncCaches() throws Exception
    {
       performTest(false, false);
@@ -138,6 +121,7 @@
 
       cacheLister2.expect(PutKeyValueCommand.class);
       cacheLister3.expect(PutKeyValueCommand.class);
+
       cache1.put("/test", "key", "value");
       cacheLister2.waitForReplicationToOccur();
       cacheLister3.waitForReplicationToOccur();