[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/statetransfer ...
Vladmir Blagojevic
vladimir.blagojevic at jboss.com
Fri Dec 22 13:55:05 EST 2006
User: vblagojevic
Date: 06/12/22 13:55:05
Modified: tests/functional/org/jboss/cache/statetransfer
VersionedTestBase.java StateTransferTestBase.java
Added: tests/functional/org/jboss/cache/statetransfer
StateTransferCompatibilityTest.java
Log:
split tests to avoid timeout
Revision Changes Path
1.21 +0 -119 JBossCache/tests/functional/org/jboss/cache/statetransfer/VersionedTestBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: VersionedTestBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/statetransfer/VersionedTestBase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- VersionedTestBase.java 21 Dec 2006 21:41:36 -0000 1.20
+++ VersionedTestBase.java 22 Dec 2006 18:55:05 -0000 1.21
@@ -69,93 +69,6 @@
initialStateTferWithLoaderTest(false);
}
-
- /**
- * These tests ensure that http://jira.jboss.com/jira/browse/JBCACHE-738
- * compatibility between non-delegating cacheloaders is maintained. In the tests
- * below first cacheloader parameter is the state producer and the second cacheloader
- * parameter is the state receiver. By having each cacheloader be a state receiver
- * and a state producer we ensure complete cacheloader compatibility.
- */
- public void testCompatibilityBetweenFileAndJbdmCacheLoaders() throws Exception
- {
- initialStateTferWithLoaderTest("org.jboss.cache.loader.FileCacheLoader",
- "org.jboss.cache.loader.jdbm.JdbmCacheLoader", false);
- }
-
- public void testCompatibilityBetweenFileAndJDBCCacheLoaders() throws Exception
- {
- initialStateTferWithLoaderTest("org.jboss.cache.loader.FileCacheLoader",
- "org.jboss.cache.loader.JDBCCacheLoader", false);
- }
-
- public void testCompatibilityBetweenFileAndBdbjeCacheLoaders() throws Exception
- {
-
- initialStateTferWithLoaderTest("org.jboss.cache.loader.FileCacheLoader",
- "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", false);
- }
-
- public void testCompatibilityBetweenJbdmAndJDBCCacheLoaders() throws Exception
- {
- initialStateTferWithLoaderTest("org.jboss.cache.loader.jdbm.JdbmCacheLoader",
- "org.jboss.cache.loader.JDBCCacheLoader", false);
- }
-
- public void testCompatibilityBetweenJbdmAndBdbjeCacheLoaders() throws Exception
- {
- initialStateTferWithLoaderTest("org.jboss.cache.loader.jdbm.JdbmCacheLoader",
- "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", false);
- }
-
- public void testCompatibilityBetweenJbdmAndFileCacheLoaders() throws Exception
- {
- initialStateTferWithLoaderTest("org.jboss.cache.loader.jdbm.JdbmCacheLoader",
- "org.jboss.cache.loader.FileCacheLoader", false);
- }
-
- public void testCompatibilityBetweenJDBCAndBdjeCacheLoaders() throws Exception
- {
-
- initialStateTferWithLoaderTest("org.jboss.cache.loader.JDBCCacheLoader",
- "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", false);
- }
-
- public void testCompatibilityBetweenJDBCAndFileCacheLoaders() throws Exception
- {
-
- initialStateTferWithLoaderTest("org.jboss.cache.loader.JDBCCacheLoader",
- "org.jboss.cache.loader.FileCacheLoader", false);
- }
-
- public void testCompatibilityBetweenJDBCAndJbdmCacheLoaders() throws Exception
- {
-
- initialStateTferWithLoaderTest("org.jboss.cache.loader.JDBCCacheLoader",
- "org.jboss.cache.loader.jdbm.JdbmCacheLoader", false);
- }
-
- public void testCompatibilityBetweenBdbjeandJDBCCacheLoaders() throws Exception
- {
-
- initialStateTferWithLoaderTest("org.jboss.cache.loader.bdbje.BdbjeCacheLoader",
- "org.jboss.cache.loader.JDBCCacheLoader", false);
- }
-
- public void testCompatibilityBetweenBdbjeandFileCacheLoaders() throws Exception
- {
-
- initialStateTferWithLoaderTest("org.jboss.cache.loader.bdbje.BdbjeCacheLoader",
- "org.jboss.cache.loader.FileCacheLoader", false);
- }
-
- public void testCompatibilityBetweenBdbjeandJbdmCacheLoaders() throws Exception
- {
-
- initialStateTferWithLoaderTest("org.jboss.cache.loader.bdbje.BdbjeCacheLoader",
- "org.jboss.cache.loader.jdbm.JdbmCacheLoader", false);
- }
-
public void testInitialStateTferWithAsyncLoader() throws Exception
{
initialStateTferWithLoaderTest(true);
@@ -167,38 +80,6 @@
"org.jboss.cache.loader.FileCacheLoader", asyncLoader);
}
- protected void initialStateTferWithLoaderTest(String cacheLoaderClass1, String cacheLoaderClass2, boolean asyncLoader) throws Exception
- {
- CacheSPI cache1 = createCache("cache1", false, false, cacheLoaderClass1, false, true);
-
- cache1.put(A_B, "name", JOE);
- cache1.put(A_B, "age", TWENTY);
- cache1.put(A_C, "name", BOB);
- cache1.put(A_C, "age", FORTY);
-
- CacheSPI cache2 = createCache("cache2", false, false, cacheLoaderClass2, asyncLoader, false);
-
- cache2.start();
-
- // Pause to give caches time to see each other
- TestingUtil.blockUntilViewsReceived(new CacheSPI[]{cache1, cache2}, 60000);
-
- if (asyncLoader)
- TestingUtil.sleepThread((long) 100);
-
- CacheLoader loader = cache2.getCacheLoader();
-
- assertEquals("Incorrect loader name for /a/b", JOE, loader.get(A_B).get("name"));
- assertEquals("Incorrect loader age for /a/b", TWENTY, loader.get(A_B).get("age"));
- assertEquals("Incorrect loader name for /a/c", BOB, loader.get(A_C).get("name"));
- assertEquals("Incorrect loader age for /a/c", FORTY, loader.get(A_C).get("age"));
-
- assertEquals("Incorrect name for /a/b", JOE, cache2.get(A_B, "name"));
- assertEquals("Incorrect age for /a/b", TWENTY, cache2.get(A_B, "age"));
- assertEquals("Incorrect name for /a/c", BOB, cache2.get(A_C, "name"));
- assertEquals("Incorrect age for /a/c", FORTY, cache2.get(A_C, "age"));
- }
-
public void testPartialStateTransfer() throws Exception
{
CacheSPI cache1 = createCache("cache1", false, true, false);
1.26 +35 -0 JBossCache/tests/functional/org/jboss/cache/statetransfer/StateTransferTestBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StateTransferTestBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/statetransfer/StateTransferTestBase.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- StateTransferTestBase.java 21 Dec 2006 21:41:36 -0000 1.25
+++ StateTransferTestBase.java 22 Dec 2006 18:55:05 -0000 1.26
@@ -29,7 +29,9 @@
import org.jboss.cache.factories.DefaultCacheFactory;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.loader.AbstractCacheLoaderTestBase;
+import org.jboss.cache.loader.CacheLoader;
import org.jboss.cache.marshall.SelectedClassnameClassLoader;
+import org.jboss.cache.misc.TestingUtil;
import java.io.File;
@@ -189,6 +191,38 @@
}
}
+ protected void initialStateTferWithLoaderTest(String cacheLoaderClass1, String cacheLoaderClass2, boolean asyncLoader) throws Exception
+ {
+ CacheSPI cache1 = createCache("cache1", false, false, cacheLoaderClass1, false, true);
+
+ cache1.put(A_B, "name", JOE);
+ cache1.put(A_B, "age", TWENTY);
+ cache1.put(A_C, "name", BOB);
+ cache1.put(A_C, "age", FORTY);
+
+ CacheSPI cache2 = createCache("cache2", false, false, cacheLoaderClass2, asyncLoader, false);
+
+ cache2.start();
+
+ // Pause to give caches time to see each other
+ TestingUtil.blockUntilViewsReceived(new CacheSPI[]{cache1, cache2}, 60000);
+
+ if (asyncLoader)
+ TestingUtil.sleepThread((long) 100);
+
+ CacheLoader loader = cache2.getCacheLoader();
+
+ assertEquals("Incorrect loader name for /a/b", JOE, loader.get(A_B).get("name"));
+ assertEquals("Incorrect loader age for /a/b", TWENTY, loader.get(A_B).get("age"));
+ assertEquals("Incorrect loader name for /a/c", BOB, loader.get(A_C).get("name"));
+ assertEquals("Incorrect loader age for /a/c", FORTY, loader.get(A_C).get("age"));
+
+ assertEquals("Incorrect name for /a/b", JOE, cache2.get(A_B, "name"));
+ assertEquals("Incorrect age for /a/b", TWENTY, cache2.get(A_B, "age"));
+ assertEquals("Incorrect name for /a/c", BOB, cache2.get(A_C, "name"));
+ assertEquals("Incorrect age for /a/c", FORTY, cache2.get(A_C, "age"));
+ }
+
protected String getTempLocation(String cacheID)
{
String tmp_location = System.getProperty("java.io.tmpdir", "c:\\tmp");
@@ -239,6 +273,7 @@
for (int i = 0; i < cacheIDs.length; i++)
{
stopCache((Cache) caches.get(cacheIDs[i]));
+ TestingUtil.sleepThread(1500);
File file = new File(getTempLocation(cacheIDs[i]));
cleanFile(file);
}
1.1 date: 2006/12/22 18:55:05; author: vblagojevic; state: Exp;JBossCache/tests/functional/org/jboss/cache/statetransfer/StateTransferCompatibilityTest.java
Index: StateTransferCompatibilityTest.java
===================================================================
package org.jboss.cache.statetransfer;
public class StateTransferCompatibilityTest extends StateTransferTestBase
{
protected String getReplicationVersion()
{
return "2.0.0.GA";
}
/**
* These tests ensure that http://jira.jboss.com/jira/browse/JBCACHE-738
* compatibility between non-delegating cacheloaders is maintained. In the tests
* below first cacheloader parameter is the state producer and the second cacheloader
* parameter is the state receiver. By having each cacheloader be a state receiver
* and a state producer we ensure complete cacheloader compatibility.
*/
public void testCompatibilityBetweenFileAndJbdmCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.FileCacheLoader",
"org.jboss.cache.loader.jdbm.JdbmCacheLoader", false);
}
public void testCompatibilityBetweenFileAndJDBCCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.FileCacheLoader",
"org.jboss.cache.loader.JDBCCacheLoader", false);
}
public void testCompatibilityBetweenFileAndBdbjeCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.FileCacheLoader",
"org.jboss.cache.loader.bdbje.BdbjeCacheLoader", false);
}
public void testCompatibilityBetweenJbdmAndJDBCCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.jdbm.JdbmCacheLoader",
"org.jboss.cache.loader.JDBCCacheLoader", false);
}
public void testCompatibilityBetweenJbdmAndBdbjeCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.jdbm.JdbmCacheLoader",
"org.jboss.cache.loader.bdbje.BdbjeCacheLoader", false);
}
public void testCompatibilityBetweenJbdmAndFileCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.jdbm.JdbmCacheLoader",
"org.jboss.cache.loader.FileCacheLoader", false);
}
public void testCompatibilityBetweenJDBCAndBdjeCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.JDBCCacheLoader",
"org.jboss.cache.loader.bdbje.BdbjeCacheLoader", false);
}
public void testCompatibilityBetweenJDBCAndFileCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.JDBCCacheLoader",
"org.jboss.cache.loader.FileCacheLoader", false);
}
public void testCompatibilityBetweenJDBCAndJbdmCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.JDBCCacheLoader",
"org.jboss.cache.loader.jdbm.JdbmCacheLoader", false);
}
public void testCompatibilityBetweenBdbjeandJDBCCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.bdbje.BdbjeCacheLoader",
"org.jboss.cache.loader.JDBCCacheLoader", false);
}
public void testCompatibilityBetweenBdbjeandFileCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.bdbje.BdbjeCacheLoader",
"org.jboss.cache.loader.FileCacheLoader", false);
}
public void testCompatibilityBetweenBdbjeandJbdmCacheLoaders() throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.bdbje.BdbjeCacheLoader",
"org.jboss.cache.loader.jdbm.JdbmCacheLoader", false);
}
protected void initialStateTferWithLoaderTest(boolean asyncLoader) throws Exception
{
initialStateTferWithLoaderTest("org.jboss.cache.loader.FileCacheLoader",
"org.jboss.cache.loader.FileCacheLoader", asyncLoader);
}
}
More information about the jboss-cvs-commits
mailing list