[jbosscache-commits] JBoss Cache SVN: r7450 - in core/trunk/src/test/java/org/jboss/cache: factories and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-11 06:33:01 -0500 (Sun, 11 Jan 2009)
New Revision: 7450

Modified:
   core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java
   core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java
   core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
Log:
default cluster config is also mangled now

Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java	2009-01-11 10:59:40 UTC (rev 7449)
+++ core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java	2009-01-11 11:33:01 UTC (rev 7450)
@@ -271,7 +271,7 @@
 
    }
 
-   public String mangleClusterConfiguration(String clusterConfig)
+   public static String mangleClusterConfiguration(String clusterConfig)
    {
       if (clusterConfig == null)
       {
@@ -298,7 +298,7 @@
    /**
     * Updates cluster configuration to ensure mutual thread isolation.
     */
-   public String mangleClusterConfigurationUdp(String clusterConfig)
+   public static String mangleClusterConfigurationUdp(String clusterConfig)
    {
       if (clusterConfig == null)
       {
@@ -339,7 +339,7 @@
    /**
     * Updates cluster configuration to ensure mutual thread isolation.
     */
-   public String mangleClusterConfigurationTcp(String clusterConfig)
+   public static String mangleClusterConfigurationTcp(String clusterConfig)
    {
       if (clusterConfig == null)
       {

Modified: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java	2009-01-11 10:59:40 UTC (rev 7449)
+++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java	2009-01-11 11:33:01 UTC (rev 7450)
@@ -15,6 +15,7 @@
 import org.jboss.cache.config.parsing.XmlConfigurationParser;
 import org.jboss.cache.transaction.TransactionSetup;
 import org.jboss.cache.util.FileLookup;
+import org.jboss.cache.UnitTestCacheFactory;
 import org.jgroups.conf.XmlConfigurator;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -188,7 +189,7 @@
    {
       Configuration tmp = createConfiguration(CacheMode.REPL_SYNC);
       Configuration conf = new Configuration();
-      conf.setClusterConfig(tmp.getClusterConfig());
+      conf.setClusterConfig(UnitTestCacheFactory.mangleClusterConfiguration(tmp.getClusterConfig()));
       assert conf.getClusterConfig() != null;
       return conf;
    }

Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java	2009-01-11 10:59:40 UTC (rev 7449)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java	2009-01-11 11:33:01 UTC (rev 7450)
@@ -57,7 +57,7 @@
    private CacheSPI initCache(boolean notifying) throws Exception           
    {      
       Configuration conf = UnitTestConfigurationFactory.getEmptyConfiguration();
-      conf.setCacheMode("REPL_SYNC");
+      conf.setCacheMode(Configuration.CacheMode.REPL_SYNC);
       conf.setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC);
       conf.setFetchInMemoryState(false);
       CacheSPI c = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(conf, false, getClass());