[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/statetransfer ...
Manik Surtani
manik at jboss.org
Tue Apr 3 14:12:49 EDT 2007
User: msurtani
Date: 07/04/03 14:12:48
Modified: tests/functional/org/jboss/cache/statetransfer
VersionedTestBase.java
Log:
Fixed failures
Revision Changes Path
1.32 +27 -37 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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- VersionedTestBase.java 3 Apr 2007 14:18:51 -0000 1.31
+++ VersionedTestBase.java 3 Apr 2007 18:12:48 -0000 1.32
@@ -91,9 +91,7 @@
{
CacheSPI cache1 = createCache("cache1", false, true, false);
- Region c1RegionA = cache1.getRegion(A, true);
- c1RegionA.activate();
- c1RegionA.registerContextClassLoader(getClass().getClassLoader());
+ createAndActivateRegion(cache1, A);
cache1.put(A_B, "name", JOE);
cache1.put(A_B, "age", TWENTY);
@@ -110,10 +108,7 @@
assertNull("/a/c name transferred against policy", cache2.get(A_C, "name"));
assertNull("/a/c age transferred against policy", cache2.get(A_C, "age"));
- Region c2RegionAB = cache2.getRegion(A_B, true);
- c2RegionAB.registerContextClassLoader(this.getClass().getClassLoader()); // need to do this so this region is recognised as a marshalling region.
- c2RegionAB.activate();
- System.out.println("Region A_B on cache2: " + c2RegionAB);
+ createAndActivateRegion(cache2, A_B);
assertEquals("Incorrect name for /a/b", JOE, cache2.get(A_B, "name"));
assertEquals("Incorrect age for /a/b", TWENTY, cache2.get(A_B, "age"));
@@ -124,9 +119,7 @@
assertNull("/a/d name transferred against policy", cache2.get(A_D, "name"));
- Region c2RegionAC = cache2.getRegion(A_C, true);
- c2RegionAC.registerContextClassLoader(this.getClass().getClassLoader()); // need to do this so this region is recognised as a marshalling region.
- c2RegionAC.activate();
+ createAndActivateRegion(cache2, A_C);
assertEquals("Incorrect name for /a/b", JOE, cache2.get(A_B, "name"));
assertEquals("Incorrect age for /a/b", TWENTY, cache2.get(A_B, "age"));
@@ -134,9 +127,7 @@
assertEquals("Incorrect age for /a/c", FORTY, cache2.get(A_C, "age"));
assertNull("/a/d name transferred against policy", cache2.get(A_D, "name"));
- Region c2RegionAD = cache2.getRegion(A_D, true);
- c2RegionAD.registerContextClassLoader(this.getClass().getClassLoader()); // need to do this so this region is recognised as a marshalling region.
- c2RegionAD.activate();
+ createAndActivateRegion(cache2, A_D);
assertEquals("Incorrect name for /a/b", JOE, cache2.get(A_B, "name"));
assertEquals("Incorrect age for /a/b", TWENTY, cache2.get(A_B, "age"));
@@ -145,18 +136,10 @@
assertEquals("Incorrect name for /a/d", JANE, cache2.get(A_D, "name"));
- c1RegionA.deactivate();
- Region c1RegionAB = cache1.getRegion(A_B, true);
- Region c1RegionAC = cache1.getRegion(A_C, true);
- Region c1RegionAD = cache1.getRegion(A_D, true);
-
- c1RegionAB.registerContextClassLoader(getClass().getClassLoader());
- c1RegionAC.registerContextClassLoader(getClass().getClassLoader());
- c1RegionAD.registerContextClassLoader(getClass().getClassLoader());
-
- c1RegionAB.activate();
- c1RegionAC.activate();
- c1RegionAD.activate();
+ cache1.getRegion(A, false).deactivate();
+ createAndActivateRegion(cache1, A_B);
+ createAndActivateRegion(cache1, A_C);
+ createAndActivateRegion(cache1, A_D);
assertEquals("Incorrect name for /a/b", JOE, cache1.get(A_B, "name"));
assertEquals("Incorrect age for /a/b", TWENTY, cache1.get(A_B, "age"));
@@ -166,11 +149,18 @@
}
+ private void createAndActivateRegion(CacheSPI c, Fqn f)
+ {
+ Region r = c.getRegion(f, true);
+ r.registerContextClassLoader(getClass().getClassLoader());
+ r.activate();
+ }
+
public void testPartialStateTferWithLoader() throws Exception
{
CacheSPI cache1 = createCache("cache1", false, true, true);
- cache1.getRegion(A, true).activate();
+ createAndActivateRegion(cache1, A);
cache1.put(A_B, "name", JOE);
cache1.put(A_B, "age", TWENTY);
@@ -191,7 +181,7 @@
assertNull("/a/c name transferred against policy", cache2.get(A_C, "name"));
assertNull("/a/c age transferred against policy", cache2.get(A_C, "age"));
- cache2.getRegion(A_B, true).activate();
+ createAndActivateRegion(cache2, A_B);
assertEquals("Incorrect name from loader for /a/b", JOE, loader.get(A_B).get("name"));
assertEquals("Incorrect age from loader for /a/b", TWENTY, loader.get(A_B).get("age"));
@@ -206,7 +196,7 @@
assertNull("/a/d name transferred against policy", cache2.get(A_D, "name"));
- cache2.getRegion(A_C, true).activate();
+ createAndActivateRegion(cache2, A_C);
assertEquals("Incorrect name from loader for /a/b", JOE, loader.get(A_B).get("name"));
assertEquals("Incorrect age from loader for /a/b", TWENTY, loader.get(A_B).get("age"));
@@ -219,7 +209,7 @@
assertEquals("Incorrect age for /a/c", FORTY, cache2.get(A_C, "age"));
assertNull("/a/d name transferred against policy", cache2.get(A_D, "name"));
- cache2.getRegion(A_D, true).activate();
+ createAndActivateRegion(cache2, A_D);
assertEquals("Incorrect name from loader for /a/b", JOE, loader.get(A_B).get("name"));
assertEquals("Incorrect age from loader for /a/b", TWENTY, loader.get(A_B).get("age"));
@@ -233,11 +223,11 @@
assertEquals("Incorrect age for /a/c", FORTY, cache2.get(A_C, "age"));
assertEquals("Incorrect name for /a/d", JANE, cache2.get(A_D, "name"));
- cache1.getRegion(A, true).deactivate();
+ cache1.getRegion(A, false).deactivate();
- cache1.getRegion(A_B, true).activate();
- cache1.getRegion(A_C, true).activate();
- cache1.getRegion(A_D, true).activate();
+ createAndActivateRegion(cache1, A_B);
+ createAndActivateRegion(cache1, A_C);
+ createAndActivateRegion(cache1, A_D);
loader = cache1.getCacheLoaderManager().getCacheLoader();
@@ -314,7 +304,7 @@
{
CacheSPI cache1 = createCache("cache1", false, true, true);
- cache1.getRegion(Fqn.ROOT, true).activate();
+ createAndActivateRegion(cache1, Fqn.ROOT);
cache1.put(A_B, "name", JOE);
cache1.put(A_B, "age", TWENTY);
@@ -335,7 +325,7 @@
assertNull("/a/c name transferred against policy", cache2.get(A_C, "name"));
assertNull("/a/c age transferred against policy", cache2.get(A_C, "age"));
- cache2.getRegion(Fqn.ROOT, true).activate();
+ createAndActivateRegion(cache2, Fqn.ROOT);
assertEquals("Incorrect name from loader for /a/b", JOE, loader.get(A_B).get("name"));
assertEquals("Incorrect age from loader for /a/b", TWENTY, loader.get(A_B).get("age"));
@@ -993,7 +983,7 @@
void useCache() throws Exception
{
TestingUtil.sleepRandom(5000);
- cache.getRegion(A_B, true).activate();
+ createAndActivateRegion(cache, A_B);
// System.out.println(name + " activated region" + " " + System.currentTimeMillis());
Fqn childFqn = Fqn.fromString("/a/b/" + name);
@@ -1027,7 +1017,7 @@
{
for (int i = 0; i < regionCount; i++)
{
- cache.getRegion(Fqn.fromString("/a/" + i), true).activate();
+ createAndActivateRegion(cache, Fqn.fromString("/a/" + i));
Fqn childFqn = Fqn.fromString("/a/" + i + "/" + name);
cache.put(childFqn, "KEY", "VALUE");
More information about the jboss-cvs-commits
mailing list