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

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-01-23 12:14:55 -0500 (Wed, 23 Jan 2008)
New Revision: 5206

Modified:
   core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java
Log:
Removed all direct refs to DummyTM

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java	2008-01-23 17:08:28 UTC (rev 5205)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java	2008-01-23 17:14:55 UTC (rev 5206)
@@ -8,11 +8,11 @@
 
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.loader.CacheLoader;
-import org.jboss.cache.transaction.DummyTransactionManager;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
 
 /**
  * Tests optimistic locking with cache loaders
@@ -46,7 +46,7 @@
          CacheSPI<Object, Object> cache = createCacheWithLoader();
          loader = cache.getCacheLoaderManager().getCacheLoader();
 
-         DummyTransactionManager mgr = DummyTransactionManager.getInstance();
+         TransactionManager mgr = cache.getTransactionManager();
          Transaction tx;
 
          // make sure the fqn is not in cache
@@ -84,7 +84,7 @@
       CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
 
       // test the cache ...
-      DummyTransactionManager mgr = DummyTransactionManager.getInstance();
+      TransactionManager mgr = cache.getTransactionManager();
       assertNull(mgr.getTransaction());
       mgr.begin();
       cache.put(fqn, key, value);
@@ -131,7 +131,7 @@
       CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
 
       // test the cache ...
-      DummyTransactionManager mgr = DummyTransactionManager.getInstance();
+      TransactionManager mgr = cache.getTransactionManager();
       assertNull(mgr.getTransaction());
       cache.put(fqn, key, value);
 
@@ -186,7 +186,7 @@
       CacheLoader loader2 = cache2.getCacheLoaderManager().getCacheLoader();
 
       // test the cache ...
-      DummyTransactionManager mgr = DummyTransactionManager.getInstance();
+      TransactionManager mgr = cache1.getTransactionManager();
       assertNull(mgr.getTransaction());
 
       mgr.begin();
@@ -210,7 +210,7 @@
       assertEquals(value, cache2.get(fqn, key));
 
       // cache2 removes entry
-      mgr.begin();
+      cache2.getTransactionManager().begin();
       cache2.removeNode(fqn);
       assertNull(cache2.get(fqn, key));
       // test that loader1, loader2 and cache2 have the entry
@@ -219,7 +219,7 @@
       assertEquals(value, loader2.get(fqn).get(key));
 
       // commit
-      mgr.commit();
+      cache2.getTransactionManager().commit();
 
       // test that the entry has been removed everywhere.
       assertNull(cache1.getNode(fqn));
@@ -238,7 +238,7 @@
       CacheLoader loader2 = cache2.getCacheLoaderManager().getCacheLoader();
 
       // test the cache ...
-      DummyTransactionManager mgr = DummyTransactionManager.getInstance();
+      TransactionManager mgr = cache1.getTransactionManager();
       assertNull(mgr.getTransaction());
 
       mgr.begin();
@@ -263,7 +263,7 @@
       assertEquals(value, cache2.get(fqn, key));
 
       // cache2 removes entry
-      mgr.begin();
+      cache2.getTransactionManager().begin();
       cache2.removeNode(fqn);
       assertNull(cache2.get(fqn, key));
       // test that loader1, loader2 and cache2 have the entry
@@ -272,7 +272,7 @@
       assertEquals(value, loader2.get(fqn).get(key));
 
       // commit
-      mgr.commit();
+      cache2.getTransactionManager().commit();
 
       // test that the entry has been removed everywhere.
       assertNull(cache1.getNode(fqn));