[infinispan-commits] Infinispan SVN: r1481 - in trunk/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-02-09 09:50:23 -0500 (Tue, 09 Feb 2010)
New Revision: 1481

Modified:
   trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
   trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
Log:
Allow dupe JMX domains for this test

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java	2010-02-09 14:41:13 UTC (rev 1480)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java	2010-02-09 14:50:23 UTC (rev 1481)
@@ -16,6 +16,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 
+import static java.lang.Thread.currentThread;
 import static org.testng.Assert.assertEquals;
 
 /**
@@ -41,16 +42,16 @@
     * Transforms and tests the transformation of a complex file.
     */
    private void testAllFile(String ehCacheFile) throws Exception {
-      ClassLoader existingCl = Thread.currentThread().getContextClassLoader();
+      ClassLoader existingCl = currentThread().getContextClassLoader();
       DefaultCacheManager dcm = null;
       Cache<Object, Object> sampleDistributedCache2 = null;
       try {
          ClassLoader delegatingCl = new Jbc2InfinispanTransformerTest.TestClassLoader(existingCl);
-         Thread.currentThread().setContextClassLoader(delegatingCl);
+         currentThread().setContextClassLoader(delegatingCl);
          String fileName = getFileName(ehCacheFile);
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          convertor.parse(fileName, baos, XSLT_FILE);
-         dcm = (DefaultCacheManager) TestCacheManagerFactory.fromStream(new ByteArrayInputStream(baos.toByteArray()));
+         dcm = (DefaultCacheManager) TestCacheManagerFactory.fromStream(new ByteArrayInputStream(baos.toByteArray()), true);
          Cache<Object,Object> defaultCache = dcm.getCache();
          defaultCache.put("key", "value");
          Configuration configuration = defaultCache.getConfiguration();
@@ -78,7 +79,7 @@
          assertEquals(sampleDistributedCache2.getConfiguration().getCacheMode(), Configuration.CacheMode.INVALIDATION_SYNC);
 
       } finally {
-         Thread.currentThread().setContextClassLoader(existingCl);
+         currentThread().setContextClassLoader(existingCl);
          TestingUtil.killCaches(sampleDistributedCache2);
          TestingUtil.killCacheManagers(dcm);
       }

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-02-09 14:41:13 UTC (rev 1480)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-02-09 14:50:23 UTC (rev 1481)
@@ -46,18 +46,23 @@
                xmlFile,
                InfinispanConfiguration.resolveSchemaPath(),
                new ConfigurationValidatingVisitor());
-      return fromConfigFileParser(parser);
+      return fromConfigFileParser(parser, false);
    }
 
    public static CacheManager fromStream(InputStream is) throws IOException {
+      return fromStream(is, false);
+   }
+
+   public static CacheManager fromStream(InputStream is, boolean allowDupeDomains) throws IOException {
       InfinispanConfiguration parser = InfinispanConfiguration.newInfinispanConfiguration(
                is, InfinispanConfiguration.findSchemaInputStream(),
                new ConfigurationValidatingVisitor());
-      return fromConfigFileParser(parser);      
+      return fromConfigFileParser(parser, allowDupeDomains);
    }
 
-   private static CacheManager fromConfigFileParser(InfinispanConfiguration parser) {
+   private static CacheManager fromConfigFileParser(InfinispanConfiguration parser, boolean allowDupeDomains) {
       GlobalConfiguration gc = parser.parseGlobalConfiguration();
+      if (allowDupeDomains) gc.setAllowDuplicateDomains(true);
       Map<String, Configuration> named = parser.parseNamedConfigurations();
       Configuration c = parser.parseDefaultConfiguration();