[infinispan-commits] Infinispan SVN: r647 - in trunk/core/src/test/java/org/infinispan: tx and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-08-10 11:41:30 -0400 (Mon, 10 Aug 2009)
New Revision: 647

Modified:
   trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
   trunk/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
Log:
[ISPN-149] - (Infinispan transaction commit with many modifications) - fixed

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-08-10 14:18:39 UTC (rev 646)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-08-10 15:41:30 UTC (rev 647)
@@ -29,12 +29,6 @@
       return new DefaultCacheManager(globalConfiguration);
    }
 
-   public static GlobalConfiguration getGlobalClusteredConfigurtion() {
-      GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
-      amendMarshaller(globalConfiguration);
-      return globalConfiguration;
-   }
-
    /**
     * Creates an cache manager that does support clustering.
     */

Modified: trunk/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java	2009-08-10 14:18:39 UTC (rev 646)
+++ trunk/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java	2009-08-10 15:41:30 UTC (rev 647)
@@ -3,7 +3,6 @@
 import org.infinispan.Cache;
 import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheManager;
-import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
@@ -37,7 +36,7 @@
       c.setSyncRollbackPhase(true);
       c.setUseLockStriping(false);
 
-      CacheManager manager = new DefaultCacheManager(TestCacheManagerFactory.getGlobalClusteredConfigurtion(), c);
+      CacheManager manager = TestCacheManagerFactory.createClusteredCacheManager(c);
       manager.start();
       manager.getCache();
       registerCacheManager(manager);
@@ -45,7 +44,7 @@
       assert cache1.getConfiguration().getCacheMode().equals(Configuration.CacheMode.REPL_SYNC);
       cache1.start();
 
-      manager = new DefaultCacheManager(TestCacheManagerFactory.getGlobalClusteredConfigurtion(), c);
+      manager = TestCacheManagerFactory.createClusteredCacheManager(c);
       manager.start();
       registerCacheManager(manager);
       cache2 = manager.getCache("TestCache");