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

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2010-01-15 13:31:09 -0500 (Fri, 15 Jan 2010)
New Revision: 1380

Modified:
   trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
   trunk/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java
   trunk/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java
Log:
[ISPN-285]-Enhance test fwk to avoid JMX domains collisions

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-01-15 18:23:29 UTC (rev 1379)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-01-15 18:31:09 UTC (rev 1380)
@@ -169,11 +169,19 @@
       return createCacheManager(configuration, defaultCfg, false, false);
    }
 
-   public static CacheManager createCacheManager(GlobalConfiguration configuration, Configuration defaultCfg, boolean transactional, boolean keepJmxDomainName) {
+   public static CacheManager createCacheManager(GlobalConfiguration configuration, Configuration defaultCfg, boolean transactional) {
       minimizeThreads(configuration);
       amendMarshaller(configuration);
       amendTransport(configuration);
       if (transactional) amendJTA(defaultCfg);
+      return newDefaultCacheManager(configuration, defaultCfg, false);
+   }
+
+   private static CacheManager createCacheManager(GlobalConfiguration configuration, Configuration defaultCfg, boolean transactional, boolean keepJmxDomainName) {
+      minimizeThreads(configuration);
+      amendMarshaller(configuration);
+      amendTransport(configuration);
+      if (transactional) amendJTA(defaultCfg);
       return newDefaultCacheManager(configuration, defaultCfg, keepJmxDomainName);
    }
 

Modified: trunk/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java	2010-01-15 18:23:29 UTC (rev 1379)
+++ trunk/core/src/test/java/org/infinispan/tx/OnePhaseXATest.java	2010-01-15 18:31:09 UTC (rev 1380)
@@ -62,7 +62,7 @@
       c.setLockAcquisitionTimeout(60000);
       c.setUseLockStriping(false);
       c.setSyncCommitPhase(true);
-      CacheManager manager = TestCacheManagerFactory.createCacheManager(gc, c, true, false);
+      CacheManager manager = TestCacheManagerFactory.createCacheManager(gc, c, true);
       return manager.getCache("TestCache");
    }
 }
\ No newline at end of file

Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java	2010-01-15 18:23:29 UTC (rev 1379)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/CacheTestSupport.java	2010-01-15 18:31:09 UTC (rev 1380)
@@ -138,7 +138,7 @@
       cfg.setExposeJmxStatistics(false);
       cfg.setL1CacheEnabled(false);
       cfg.setWriteSkewCheck(false);
-      return TestCacheManagerFactory.createCacheManager(globalConfiguration, cfg, true, false);
+      return TestCacheManagerFactory.createCacheManager(globalConfiguration, cfg, true);
    }
    
    public static void initializeDirectory(Directory directory) throws IOException {