[jbosscache-commits] JBoss Cache SVN: r7453 - in core/trunk/src/test/java/org/jboss/cache: config/parsing and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-12 07:29:59 -0500 (Mon, 12 Jan 2009)
New Revision: 7453

Modified:
   core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java
   core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java
Log:
test files are in concordance with in-use protocol stack

Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java	2009-01-12 11:52:58 UTC (rev 7452)
+++ core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java	2009-01-12 12:29:59 UTC (rev 7453)
@@ -58,7 +58,7 @@
 
    private static final ThreadLocal<String> threadTcpStartPort = new ThreadLocal<String>()
    {
-      private final AtomicInteger uniqueAddr = new AtomicInteger(7800);
+      private final AtomicInteger uniqueAddr = new AtomicInteger(7900);
 
       @Override
       protected String initialValue()
@@ -122,6 +122,7 @@
    public Cache<K, V> createCache(String configFileName, boolean start, Class ownerClass) throws ConfigurationException
    {
       Configuration c = getConfigurationFromFile(configFileName);
+      c.setClusterConfig(UnitTestConfigurationFactory.getEmptyConfiguration().getClusterConfig());
       return createCache(c, start, ownerClass);
    }
 

Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java	2009-01-12 11:52:58 UTC (rev 7452)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java	2009-01-12 12:29:59 UTC (rev 7453)
@@ -29,6 +29,7 @@
 import org.apache.log4j.spi.LoggingEvent;
 import org.jboss.cache.Cache;
 import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.DefaultCacheFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -90,11 +91,11 @@
 
    public void testConfigWarnings()
    {
-      UnitTestCacheFactory ucf = new UnitTestCacheFactory();
+      DefaultCacheFactory ucf = new DefaultCacheFactory();
       for (String aConfFile : getConfigFileNames())
       {
          assert !appender.isFoundUnknownWarning();
-         Cache cache = ucf.createCache(CONFIG_ROOT + "/" + aConfFile, true, getClass());
+         Cache cache = ucf.createCache(CONFIG_ROOT + "/" + aConfFile, true);
          cache.stop();
          cache.destroy();
          assert !appender.isFoundUnknownWarning();