8:41 a.m.
Author: mircea.markus
Date: 2008-12-05 09:41:23 -0500 (Fri, 05 Dec 2008)
New Revision: 7254
Modified:
core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java
core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java
core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java
core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java
core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java
Log:
shutdown databases
Modified:
core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -31,7 +31,7 @@
* @author Mircea.Markus(a)iquestint.com
* @version 1.0
*/
-@Test(groups = {"functional"}, sequential = true, testName =
"loader.AdjListJDBCCacheLoaderCompatibilityTest")
+@Test(groups = {"functional"}, testName =
"loader.AdjListJDBCCacheLoaderCompatibilityTest")
@SuppressWarnings("deprecation")
public class AdjListJDBCCacheLoaderCompatibilityTest
{
@@ -72,6 +72,8 @@
TestingUtil.killCaches(cache, cache2);
cache = null;
cache2 = null;
+
TestDbPropertiesFactory.shutdownInMemoryDatabase(oldImpl.getConfig().getProperties());
+
TestDbPropertiesFactory.shutdownInMemoryDatabase(newImpl.getConfig().getProperties());
}
public void testCommonOperations() throws Exception
@@ -209,7 +211,7 @@
{
return TestDbPropertiesFactory.getTestDbProperties();
}
-
+
private JDBCCacheLoader getNewCacheLoader(Properties prop) throws Exception
{
String tablePkPrefix = prop.getProperty("cache.jdbc.table.primarykey",
"jbosscache_pk");
Modified: core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -40,6 +40,7 @@
public void tearDown() throws Exception
{
cf.stop();
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(config.getProperties());
}
public void testSetConfig() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -62,29 +62,37 @@
*/
public void testDataSourceIntegration() throws Exception
{
- Context context = new InitialContext();
+ Properties props = null;
try
{
+ Context context = new InitialContext();
+ try
+ {
Object obj = context.lookup(JNDI_NAME);
- assertNull(JNDI_NAME + " not bound", obj);
+ assertNull(JNDI_NAME + " not bound", obj);
+ }
+ catch (NameNotFoundException n)
+ {
+ // expected
+ }
+ props = TestDbPropertiesFactory.getTestDbProperties();
+ cache = (CacheSPI) new UnitTestCacheFactory<Object,
Object>().createCache(false);
+ cache.getConfiguration().setCacheMode("local");
+
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
+ cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(props));
+ cache.create();
+
+
+ context.bind(JNDI_NAME, new MockDataSource(props));
+ assertNotNull(JNDI_NAME + " bound", context.lookup(JNDI_NAME));
+ cache.start();
+
+ assertNotNull("Cache has a cache loader",
cache.getCacheLoaderManager().getCacheLoader());
}
- catch (NameNotFoundException n)
+ finally
{
- // expected
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
}
- Properties props = TestDbPropertiesFactory.getTestDbProperties();
- cache = (CacheSPI) new UnitTestCacheFactory<Object,
Object>().createCache(false);
- cache.getConfiguration().setCacheMode("local");
-
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
- cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(props));
- cache.create();
-
-
- context.bind(JNDI_NAME, new MockDataSource(props));
- assertNotNull(JNDI_NAME + " bound", context.lookup(JNDI_NAME));
- cache.start();
-
- assertNotNull("Cache has a cache loader",
cache.getCacheLoaderManager().getCacheLoader());
}
@AfterMethod(alwaysRun = true)
Modified:
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -21,11 +21,12 @@
public class JDBCCacheLoaderConnectionTest extends AbstractCacheLoaderTestBase
{
private Cache cache;
+ private Properties props;
@BeforeMethod
public void setUp() throws Exception
{
- Properties props = TestDbPropertiesFactory.getTestDbProperties();
+ props = TestDbPropertiesFactory.getTestDbProperties();
cache = new UnitTestCacheFactory<Object, Object>().createCache(false);
cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("",
JDBCCacheLoader.class.getName(), props, false, false, true));
cache.start();
@@ -35,6 +36,7 @@
public void tearDown()
{
TestingUtil.killCaches(cache);
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
cache = null;
}
Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -18,6 +18,7 @@
import javax.naming.NameNotFoundException;
import java.util.Properties;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.util.TestDbPropertiesFactory;
@@ -33,13 +34,14 @@
* @author <a href="hmesha(a)novell.com">Hany Mesha</a>
* @version <tt>$Revision$</tt>
*/
-@Test(groups = {"functional"}, sequential = true, testName =
"loader.JDBCCacheLoaderDerbyDSTest")
-public class JDBCCacheLoaderDerbyDSTest
- extends CacheLoaderTestsBase
+@Test(groups = {"functional"}, testName =
"loader.JDBCCacheLoaderDerbyDSTest")
+public class JDBCCacheLoaderDerbyDSTest extends CacheLoaderTestsBase
{
//private String old_factory = null;
private final String FACTORY =
"org.jboss.cache.transaction.DummyContextFactory";
private final String JNDI_NAME = "java:/DerbyDS";
+ private Properties prop;
+ private EmbeddedXADataSource ds;
protected void configureCache() throws Exception
{
@@ -58,10 +60,10 @@
// expected
}
- Properties prop = TestDbPropertiesFactory.getTestDbProperties();
+ prop = TestDbPropertiesFactory.getTestDbProperties();
- EmbeddedXADataSource ds = new EmbeddedXADataSource();
- ds.setDatabaseName("jbossdb");
+ ds = new EmbeddedXADataSource();
+ ds.setDatabaseName(TestDbPropertiesFactory.getDatabaseName(prop));
ds.setCreateDatabase("create");
ds.setUser(prop.getProperty("cache.jdbc.user"));
ds.setPassword(prop.getProperty("cache.jdbc.password"));
@@ -72,9 +74,10 @@
"cache.jdbc.sql-concat= 1 || 2" + "\n" +
"cache.jdbc.table.name=jbosscache" + TestingUtil.getThreadId() +
"\n" +
"cache.jdbc.table.primarykey=jbosscache_pk" +
TestingUtil.getThreadId();
-
+
CacheSPI<Object, Object> cache = cacheTL.get();
-
cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("",
"org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false));
+ CacheLoaderConfig config = getSingleCacheLoaderConfig("",
"org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false);
+ cache.getConfiguration().setCacheLoaderConfig(config);
cache.create();
@@ -82,6 +85,12 @@
assertNotNull(JNDI_NAME + " bound", context.lookup(JNDI_NAME));
}
+ protected void cleanup()
+ {
+ ds.setShutdownDatabase("shutdown");
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(prop);
+ }
+
public void testLargeObject()
{
CacheLoader loader = loaderTL.get();
Modified:
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -51,6 +51,10 @@
{
if (first != null) first.stop();
if (second != null) second.stop();
+ Properties props =
first.getCacheLoaderManager().getCacheLoaderConfig().getFirstCacheLoaderConfig().getProperties();
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
+ props =
second.getCacheLoaderManager().getCacheLoaderConfig().getFirstCacheLoaderConfig().getProperties();
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
}
private Configuration getConfiguration() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -9,12 +9,14 @@
import org.jboss.cache.Fqn;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
+import org.testng.annotations.AfterMethod;
import java.util.Properties;
import java.sql.DriverManager;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.util.TestDbPropertiesFactory;
+import org.jboss.cache.util.TestingUtil;
/**
* This test runs cache loader tests using Database as the cache loader store.
@@ -55,22 +57,13 @@
return p.toString();
}
- protected void cleanup()
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws Exception
{
+ CacheSPI<Object, Object> cache = cacheTL.get();
+ TestingUtil.killCaches(cache);
Properties props =
cacheTL.get().getConfiguration().getCacheLoaderConfig().getIndividualCacheLoaderConfigs().get(0).getProperties();
- try
- {
- String shutDownConnection = TestDbPropertiesFactory.getShutdownUrl(props);
- System.out.println("shutDownConnection = " + shutDownConnection);
- DriverManager.getConnection(shutDownConnection);
- fail("Exception should be raised to confirm the DB is closed");
- //here is why: Important: The XJ015 error (successful shutdown of the Derby
engine) and the 08006 error
- //(successful shutdown of a single database) are the *only exceptions thrown by
Derby that might indicate that an operation succeeded*.
- }
- catch (Throwable e)
- {
- //expected
- }
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
}
private void append(String propertyName, Properties prop, StringBuilder builder)
Modified:
core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -40,6 +40,8 @@
@Override public void tearDown() throws Exception
{
TestingUtil.killCaches(cache);
+ Properties props =
cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().getProperties();
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
super.tearDown();
cache = null;
}
Modified:
core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -77,7 +77,7 @@
c = new Configuration();
c.setClusterName("test");
- c.setStateRetrievalTimeout(1000);
+ c.setStateRetrievalTimeout(10000);
c.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
c.setNodeLockingScheme(nodeLockingScheme);
c.setCacheMode(cacheMode);
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -79,8 +79,6 @@
log.info("**** TEARING DOWN ****");
if (loader != null) loader.remove(Fqn.ROOT);
TestingUtil.killCaches(cache);
- cacheTL.set(null);
- loaderTL.set(null);
}
Modified:
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java 2008-12-04
16:20:46 UTC (rev 7253)
+++
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -8,11 +8,14 @@
import java.util.Properties;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.loader.CacheLoader;
import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.*;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.util.TestDbPropertiesFactory;
import org.testng.annotations.Test;
+import org.testng.annotations.AfterMethod;
/**
* Tests passivation using JDBC Cache Loader.
@@ -24,7 +27,7 @@
@Test(groups = "functional", testName =
"passivation.PassivationToJDBCCacheLoaderTest")
public class PassivationToJDBCCacheLoaderTest extends PassivationTestsBase
{
- protected String getJDBCProps()
+ private String getJDBCProps()
{
Properties prop = TestDbPropertiesFactory.getTestDbProperties();
return "cache.jdbc.driver =" +
prop.getProperty("cache.jdbc.driver") + "\n" +
@@ -38,6 +41,19 @@
}
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws Exception
+ {
+ CacheSPI<Object, Object> cache = cacheTL.get();
+ CacheLoader loader = loaderTL.get();
+ log.info("**** TEARING DOWN ****");
+ if (loader != null) loader.remove(Fqn.ROOT);
+ TestingUtil.killCaches(cache);
+ Properties props = loader.getConfig().getProperties();
+ TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
+ }
+
+
protected void configureCache() throws Exception
{
CacheLoaderConfig loaderConfig = buildSingleCacheLoaderConfig(true, null,
"org.jboss.cache.loader.JDBCCacheLoader",
Modified: core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java 2008-12-04
16:20:46 UTC (rev 7253)
+++ core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java 2008-12-05
14:41:23 UTC (rev 7254)
@@ -6,6 +6,8 @@
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.io.IOException;
+import java.io.File;
+import java.sql.DriverManager;
/**
* @author Mircea.Markus(a)jboss.com
@@ -18,7 +20,7 @@
static {
//so that all individual databases are created here
- System.setProperty("derby.system.home","derby");
+ System.setProperty("derby.system.home", TestingUtil.TEST_FILES);
try
{
realProps.load(TestDbPropertiesFactory.class.getClassLoader().getResourceAsStream("cache-jdbc.properties"));
@@ -37,8 +39,39 @@
}
}
- public static String getShutdownUrl(Properties props)
+ public static void shutdownInMemoryDatabase(Properties props)
{
+ try
+ {
+ String shutDownConnection = getShutdownUrl(props);
+ System.out.println("shutDownConnection = " + shutDownConnection);
+ DriverManager.getConnection(shutDownConnection);
+ assert false: "Exception should be raised to confirm the DB is
closed";
+ //here is why: Important: The XJ015 error (successful shutdown of the Derby
engine) and the 08006 error
+ //(successful shutdown of a single database) are the *only exceptions thrown by
Derby that might indicate that an operation succeeded*.
+ }
+ catch (Throwable e)
+ {
+ //expected
+ }
+ //now delete the disk folder
+ String dbName = getDatabaseName(props);
+ String toDel = TestingUtil.TEST_FILES + File.separator + dbName;
+ TestingUtil.recursiveFileRemove(toDel);
+ System.out.println("Deleted file " + toDel);
+ }
+
+ public static String getDatabaseName(Properties prop)
+ {
+ //jdbc:derby:jbossdb;create=true
+ StringTokenizer tokenizer = new
StringTokenizer(prop.getProperty("cache.jdbc.url"), ":;");
+ tokenizer.nextToken();
+ tokenizer.nextToken();
+ return tokenizer.nextToken();
+ }
+
+ private static String getShutdownUrl(Properties props)
+ {
String url = props.getProperty("cache.jdbc.url");
assert url != null;
//jdbc:derby:jbossdb;create=true
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-04 16:20:46 UTC
(rev 7253)
+++ core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java 2008-12-05 14:41:23 UTC
(rev 7254)
@@ -42,7 +42,7 @@
{
private static Random random = new Random();
- public static final String TEST_FILES = "./testFiles";
+ public static final String TEST_FILES = "testFiles";
/**
* Holds unique mcast_port for each thread used for JGroups channel construction.