[jbosscache-commits] JBoss Cache SVN: r7252 - in core/trunk/src/test/java/org/jboss/cache: eviction and 5 other directories.

Author: mircea.markus Date: 2008-12-04 10:36:15 -0500 (Thu, 04 Dec 2008) New Revision: 7252 Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java Log: files are being created in the local dir now Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -186,8 +186,7 @@ } catch (IOException e) { System.err.println("+++++++++++++++++++++++++++ Error : " + e.getMessage()); - log.error("+++++++++++++++++++++++++++ Error : " + e.getMessage()); - e.printStackTrace(); + log.error("+++++++++++++++++++++++++++ Error : " + e.getMessage(), e); } } Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -38,7 +38,7 @@ { private Cache<Integer, String> cache; private long wakeupIntervalMillis = 0; - private String tmpDir = System.getProperty("java.io.tmpdir", "/tmp"); + private String tmpDir = TestingUtil.TEST_FILES; private String cacheLoaderDir = "JBossCacheFileCacheLoader"; @BeforeMethod(alwaysRun = true) Modified: core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -20,7 +20,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional", testName = "loader.AbstractCacheLoaderTestBase") +@Test(groups = "functional") public abstract class AbstractCacheLoaderTestBase { protected final Log log = LogFactory.getLog(getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -20,7 +20,7 @@ protected void configureCache() throws Exception { CacheSPI<Object, Object> cache = cacheTL.get(); - String tmpDir = System.getProperty("java.io.tmpdir", "/tmp"); + String tmpDir = TestingUtil.TEST_FILES; String threadId = Thread.currentThread().getName(); String tmpCLLoc = tmpDir + "/JBossCache-BdbjeCacheLoaderTest-" + threadId; Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -42,7 +42,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true, testName = "loader.CacheLoaderTestsBase") +@Test(groups = {"functional"}) abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase { private static final Log log = LogFactory.getLog(CacheLoaderTestsBase.class); Modified: core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -12,9 +12,8 @@ protected void configureCache() throws Exception { CacheSPI<Object, Object> cache = cacheTL.get(); - String tmpDir = System.getProperty("java.io.tmpdir", "/tmp"); String threadId = Thread.currentThread().getName(); - String tmpCLLoc = tmpDir + "/JBossCache-FileCacheLoaderTest-" + threadId; + String tmpCLLoc = TestingUtil.TEST_FILES + "/JBossCache-FileCacheLoaderTest-" + threadId; cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + tmpCLLoc, false, true, false)); TestingUtil.recursiveFileRemove(tmpCLLoc); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -16,7 +16,7 @@ protected void configureCache() throws Exception { CacheSPI<Object, Object> cache = cacheTL.get(); - String tmpDir = System.getProperty("java.io.tmpdir", "/tmp"); + String tmpDir = TestingUtil.TEST_FILES; String threadId = Thread.currentThread().getName(); String tmpCLLoc = tmpDir + "/JBossCache-JdbmCacheLoaderTest-" + threadId; cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.jdbm.JdbmCacheLoader", "location=" + tmpCLLoc, false, true, false)); Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -33,7 +33,7 @@ @Test(groups = "functional", testName = "marshall.CacheLoaderMarshallingTest") public class CacheLoaderMarshallingTest extends RegionBasedMarshallingTestBase { - private static final String tmpDir = System.getProperty("java.io.tmpdir") + File.separatorChar + "CacheLoaderMarshallingTest"; + private static final String tmpDir = TestingUtil.TEST_FILES + File.separatorChar + "CacheLoaderMarshallingTest"; private Cache<Object, Object> cache; private Fqn fqn = Fqn.fromString("/a"); Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -6,6 +6,7 @@ import java.io.File; import java.io.FileFilter; import org.jboss.cache.CacheSPI; +import org.jboss.cache.util.TestingUtil; /** * Runs the same tests as {@link PassivationToFileCacheLoaderTest}, but with @@ -17,7 +18,7 @@ @Test(groups = "functional", testName = "passivation.PassivationToBdbjeCacheLoaderTest") public class PassivationToBdbjeCacheLoaderTest extends PassivationTestsBase { - private String tmp_location = System.getProperty("java.io.tmpdir", "c:\\tmp"); + private String tmp_location = TestingUtil.TEST_FILES; private File dir = new File(tmp_location); public PassivationToBdbjeCacheLoaderTest() @@ -52,7 +53,7 @@ } } - String tmpDir = System.getProperty("java.io.tmpdir", "/tmp"); + String tmpDir = TestingUtil.TEST_FILES; String threadId = Thread.currentThread().getName(); String tmpCLLoc = tmpDir + "/JBossCache-PassivationToBdbjeCacheLoaderTest-" + threadId; Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -1,6 +1,7 @@ package org.jboss.cache.passivation; import org.jboss.cache.CacheSPI; +import org.jboss.cache.util.TestingUtil; import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig; import org.testng.annotations.Test; @@ -18,14 +19,14 @@ String tmpLocation = null; String OS = System.getProperty("os.name").toLowerCase(); - if (OS.contains("win") || OS.contains("nt")) - { - tmpLocation = System.getProperty("java.io.tmpdir", "c:\\tmp"); - } - else - { - tmpLocation = System.getProperty("jva.io.tmpdir", "/tmp"); - } +// if (OS.contains("win") || OS.contains("nt")) +// { +// tmpLocation = TestingUtil.TEST_FILES; +// } +// else +// { + tmpLocation = TestingUtil.TEST_FILES; +// } String threadId = Thread.currentThread().getName(); String tmpCLLoc = tmpLocation + "/JBossCache-PassivationToFileCacheLoaderTest-" + threadId; Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -290,7 +290,7 @@ protected String getTempLocation(String cacheID) { - String tmp_location = System.getProperty("java.io.tmpdir", "c:\\tmp"); + String tmp_location = TestingUtil.TEST_FILES; File file = new File(tmp_location); file = new File(file, cacheID); return file.getAbsolutePath(); Modified: core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java 2008-12-03 16:38:27 UTC (rev 7251) +++ core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java 2008-12-04 15:36:15 UTC (rev 7252) @@ -41,6 +41,8 @@ public class TestingUtil { private static Random random = new Random(); + + public static final String TEST_FILES = "./testFiles"; /** * Holds unique mcast_port for each thread used for JGroups channel construction.