ISPN-5023 Random Failues on *FactoryBeanTest in the Spring Modules

Force the test JMX domain even if the configuration was loaded from a file.
infinispan · Nov 26, 2014 · fb65b15 · fb65b15
1 parent 2519083
commit fb65b15
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 36 deletions.
diff --git a/spring/spring/pom.xml b/spring/spring/pom.xml
@@ -41,10 +41,6 @@
 
     </description>
 
-    <properties>
-        <infinispan.test.parallel.threads>1</infinispan.test.parallel.threads>
-    </properties>
-
     <developers>
         <developer>
             <id>obergner</id>

diff --git a/spring/spring/src/main/java/org/infinispan/spring/AbstractEmbeddedCacheManagerFactory.java b/spring/spring/src/main/java/org/infinispan/spring/AbstractEmbeddedCacheManagerFactory.java
@@ -11,7 +11,6 @@
 import org.springframework.core.io.Resource;
 
 import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * <p>
@@ -47,7 +46,7 @@ protected EmbeddedCacheManager createBackingEmbeddedCacheManager() throws IOExce
             configurationBuilderHolder.getDefaultConfigurationBuilder().read(builder.build());
          }
 
-         return new DefaultCacheManager(configurationBuilderHolder, true);
+         return createCacheManager(configurationBuilderHolder);
       } else {
          if (gcb == null) {
             if (logger.isDebugEnabled()) logger.debug("GlobalConfigurationBuilder is null. Using default new " +
@@ -65,8 +64,8 @@ protected EmbeddedCacheManager createBackingEmbeddedCacheManager() throws IOExce
       }
    }
 
-   protected EmbeddedCacheManager createCacheManager(InputStream is) throws IOException {
-      return new DefaultCacheManager(is);
+   protected EmbeddedCacheManager createCacheManager(ConfigurationBuilderHolder configurationBuilderHolder) {
+      return new DefaultCacheManager(configurationBuilderHolder, true);
    }
 
    protected EmbeddedCacheManager createCacheManager(GlobalConfigurationBuilder globalBuilder, ConfigurationBuilder builder) {

diff --git a/...c/test/java/org/infinispan/spring/provider/TestSpringEmbeddedCacheManagerFactoryBean.java b/...c/test/java/org/infinispan/spring/provider/TestSpringEmbeddedCacheManagerFactoryBean.java
@@ -2,12 +2,10 @@
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
+import org.infinispan.configuration.parsing.ConfigurationBuilderHolder;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
  * Bean that creates cache manager instances produced
  * by the test cache manager factory.
@@ -23,8 +21,8 @@ protected EmbeddedCacheManager createCacheManager(GlobalConfigurationBuilder glo
    }
 
    @Override
-   protected EmbeddedCacheManager createCacheManager(InputStream is) throws IOException {
-      return TestCacheManagerFactory.fromStream(is);
+   protected EmbeddedCacheManager createCacheManager(ConfigurationBuilderHolder configurationBuilderHolder) {
+      return TestCacheManagerFactory.createClusteredCacheManager(configurationBuilderHolder);
    }
 
 }
diff --git a/...org/infinispan/spring/support/embedded/TestInfinispanEmbeddedCacheManagerFactoryBean.java b/...org/infinispan/spring/support/embedded/TestInfinispanEmbeddedCacheManagerFactoryBean.java
@@ -2,12 +2,10 @@
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
+import org.infinispan.configuration.parsing.ConfigurationBuilderHolder;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
  * Bean that creates cache manager instances produced
  * by the test cache manager factory.
@@ -23,8 +21,8 @@ protected EmbeddedCacheManager createCacheManager(GlobalConfigurationBuilder glo
    }
 
    @Override
-   protected EmbeddedCacheManager createCacheManager(InputStream is) throws IOException {
-      return TestCacheManagerFactory.fromStream(is);
+   protected EmbeddedCacheManager createCacheManager(ConfigurationBuilderHolder configurationBuilderHolder) {
+      return TestCacheManagerFactory.createClusteredCacheManager(configurationBuilderHolder);
    }
 
 }
diff --git a/spring/spring4/pom.xml b/spring/spring4/pom.xml
@@ -41,10 +41,6 @@
 
     </description>
 
-    <properties>
-        <infinispan.test.parallel.threads>1</infinispan.test.parallel.threads>
-    </properties>
-
     <developers>
         <developer>
             <id>obergner</id>

diff --git a/spring/spring4/src/main/java/org/infinispan/spring/AbstractEmbeddedCacheManagerFactory.java b/spring/spring4/src/main/java/org/infinispan/spring/AbstractEmbeddedCacheManagerFactory.java
@@ -11,7 +11,6 @@
 import org.springframework.core.io.Resource;
 
 import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * <p>
@@ -47,7 +46,7 @@ protected EmbeddedCacheManager createBackingEmbeddedCacheManager() throws IOExce
             configurationBuilderHolder.getDefaultConfigurationBuilder().read(builder.build());
          }
 
-         return new DefaultCacheManager(configurationBuilderHolder, true);
+         return createCacheManager(configurationBuilderHolder);
       } else {
          if (gcb == null) {
             if (logger.isDebugEnabled()) logger.debug("GlobalConfigurationBuilder is null. Using default new " +
@@ -65,8 +64,8 @@ protected EmbeddedCacheManager createBackingEmbeddedCacheManager() throws IOExce
       }
    }
 
-   protected EmbeddedCacheManager createCacheManager(InputStream is) throws IOException {
-      return new DefaultCacheManager(is);
+   protected EmbeddedCacheManager createCacheManager(ConfigurationBuilderHolder configurationBuilderHolder) {
+      return new DefaultCacheManager(configurationBuilderHolder, true);
    }
 
    protected EmbeddedCacheManager createCacheManager(GlobalConfigurationBuilder globalBuilder, ConfigurationBuilder builder) {

diff --git a/...c/test/java/org/infinispan/spring/provider/TestSpringEmbeddedCacheManagerFactoryBean.java b/...c/test/java/org/infinispan/spring/provider/TestSpringEmbeddedCacheManagerFactoryBean.java
@@ -2,12 +2,10 @@
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
+import org.infinispan.configuration.parsing.ConfigurationBuilderHolder;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
  * Bean that creates cache manager instances produced
  * by the test cache manager factory.
@@ -23,8 +21,8 @@ protected EmbeddedCacheManager createCacheManager(GlobalConfigurationBuilder glo
    }
 
    @Override
-   protected EmbeddedCacheManager createCacheManager(InputStream is) throws IOException {
-      return TestCacheManagerFactory.fromStream(is);
+   protected EmbeddedCacheManager createCacheManager(ConfigurationBuilderHolder configurationBuilderHolder) {
+      return TestCacheManagerFactory.createClusteredCacheManager(configurationBuilderHolder);
    }
 
 }
diff --git a/...org/infinispan/spring/support/embedded/TestInfinispanEmbeddedCacheManagerFactoryBean.java b/...org/infinispan/spring/support/embedded/TestInfinispanEmbeddedCacheManagerFactoryBean.java
@@ -2,12 +2,10 @@
 
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
+import org.infinispan.configuration.parsing.ConfigurationBuilderHolder;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
  * Bean that creates cache manager instances produced
  * by the test cache manager factory.
@@ -23,8 +21,8 @@ protected EmbeddedCacheManager createCacheManager(GlobalConfigurationBuilder glo
    }
 
    @Override
-   protected EmbeddedCacheManager createCacheManager(InputStream is) throws IOException {
-      return TestCacheManagerFactory.fromStream(is);
+   protected EmbeddedCacheManager createCacheManager(ConfigurationBuilderHolder configurationBuilderHolder) {
+      return TestCacheManagerFactory.createClusteredCacheManager(configurationBuilderHolder);
    }
 
 }