[jbosscache-commits] JBoss Cache SVN: r7285 - in core/trunk/src/test/java/org/jboss/cache/api: nodevalidity and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-12-12 03:33:22 -0500 (Fri, 12 Dec 2008)
New Revision: 7285

Modified:
   core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
   core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java
Log:
fixed tests

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java	2008-12-12 05:00:02 UTC (rev 7284)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java	2008-12-12 08:33:22 UTC (rev 7285)
@@ -37,7 +37,7 @@
 
    private TransactionManager tm;
 
-   public CacheSPI createCache()
+   protected CacheSPI createCache()
    {
       // start a single cache instance
       CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache("configs/local-tx.xml", false, getClass());

Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java	2008-12-12 05:00:02 UTC (rev 7284)
+++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java	2008-12-12 08:33:22 UTC (rev 7285)
@@ -21,17 +21,28 @@
       nodeLockingScheme = NodeLockingScheme.PESSIMISTIC;
    }
 
+
+   Cache<String, String> onlyInstance;
+
    protected Cache<String, String> createObserver()
    {
-      return createModifier();
+      return returnOnlyInstance();
    }
 
    protected Cache<String, String> createModifier()
    {
+      return returnOnlyInstance();
+   }
+
+   private Cache<String, String> returnOnlyInstance()
+   {
+      if (onlyInstance == null)
+      {
          UnitTestCacheFactory<String, String> f = new UnitTestCacheFactory<String, String>();
-         Cache<String, String> cache = f.createCache(false, getClass());
-         nodeLockingSchemeSpecificSetup(cache.getConfiguration());
-         cache.start();
-         return cache;
+         onlyInstance = f.createCache(false, getClass());
+         nodeLockingSchemeSpecificSetup(onlyInstance.getConfiguration());
+         onlyInstance.start();
+      }
+      return onlyInstance;
    }
 }