[infinispan-commits] Infinispan SVN: r2535 - in branches/4.2.x/core/src/test/java/org/infinispan/test: fwk and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-10-21 08:17:24 -0400 (Thu, 21 Oct 2010)
New Revision: 2535

Modified:
   branches/4.2.x/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
Log:
Test harness improvements

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java	2010-10-20 18:00:27 UTC (rev 2534)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java	2010-10-21 12:17:24 UTC (rev 2535)
@@ -198,6 +198,10 @@
       waitForClusterToForm(null);
    }
 
+   protected TransactionManager tm(Cache<?, ?> c) {
+      return c.getAdvancedCache().getTransactionManager();
+   }
+
    protected TransactionManager tm(int i) {
       return cache(i).getAdvancedCache().getTransactionManager();
    }

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-10-20 18:00:27 UTC (rev 2534)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-10-21 12:17:24 UTC (rev 2535)
@@ -252,6 +252,18 @@
       return c;
    }
 
+   public static Configuration getDefaultConfiguration(boolean transactional, Configuration.CacheMode cacheMode) {
+      Configuration c = new Configuration();
+      if (transactional) amendJTA(c);
+      c.setCacheMode(cacheMode);
+      if (cacheMode.isClustered()) {
+         c.setSyncRollbackPhase(true);
+         c.setSyncCommitPhase(true);
+      }
+      return c;
+   }
+
+
    private static void amendTransport(GlobalConfiguration configuration) {
       if (configuration.getTransportClass() != null) { //this is local
          Properties newTransportProps = new Properties();