[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/statetransfer ...

[Manik Surtani]

  User: msurtani
  Date: 07/04/03 10:18:51

  Modified:    tests/functional/org/jboss/cache/statetransfer 
                        VersionedTestBase.java
  Log:
  Fixed failures
  
  Revision  Changes    Path
  1.31      +45 -29    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.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- VersionedTestBase.java	26 Mar 2007 14:37:49 -0000	1.30
  +++ VersionedTestBase.java	3 Apr 2007 14:18:51 -0000	1.31
  @@ -91,7 +91,9 @@
      {
         CacheSPI cache1 = createCache("cache1", false, true, false);
   
  -      cache1.getRegion(A, true).activate();
  +      Region c1RegionA = cache1.getRegion(A, true);
  +      c1RegionA.activate();
  +      c1RegionA.registerContextClassLoader(getClass().getClassLoader());
   
         cache1.put(A_B, "name", JOE);
         cache1.put(A_B, "age", TWENTY);
  @@ -108,8 +110,10 @@
         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();
  -      System.out.println("Region A_B on cache2: " + cache2.getRegion(A_B, false));
  +      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);
   
         assertEquals("Incorrect name for /a/b", JOE, cache2.get(A_B, "name"));
         assertEquals("Incorrect age for /a/b", TWENTY, cache2.get(A_B, "age"));
  @@ -120,7 +124,9 @@
   
         assertNull("/a/d name transferred against policy", cache2.get(A_D, "name"));
   
  -      cache2.getRegion(A_C, true).activate();
  +      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();
   
         assertEquals("Incorrect name for /a/b", JOE, cache2.get(A_B, "name"));
         assertEquals("Incorrect age for /a/b", TWENTY, cache2.get(A_B, "age"));
  @@ -128,7 +134,9 @@
         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();
  +      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();
   
         assertEquals("Incorrect name for /a/b", JOE, cache2.get(A_B, "name"));
         assertEquals("Incorrect age for /a/b", TWENTY, cache2.get(A_B, "age"));
  @@ -136,11 +144,19 @@
         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_B, true).activate();
  -      cache1.getRegion(A_C, true).activate();
  -      cache1.getRegion(A_D, true).activate();
  +      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();
   
         assertEquals("Incorrect name for /a/b", JOE, cache1.get(A_B, "name"));
         assertEquals("Incorrect age for /a/b", TWENTY, cache1.get(A_B, "age"));