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

[Brian Stansberry]

  User: bstansberry
  Date: 06/08/11 15:58:21

  Modified:    tests/functional/org/jboss/cache/statetransfer  Tag:
                        Branch_JBossCache_1_4_0 VersionedTestBase.java
  Log:
  Generate failures instead of NPEs when state isn't transferred
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.1   +48 -22    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.6
  retrieving revision 1.6.2.1
  diff -u -b -r1.6 -r1.6.2.1
  --- VersionedTestBase.java	5 May 2006 12:06:59 -0000	1.6
  +++ VersionedTestBase.java	11 Aug 2006 19:58:21 -0000	1.6.2.1
  @@ -8,6 +8,7 @@
   package org.jboss.cache.statetransfer;
   
   import java.lang.reflect.Method;
  +import java.util.Map;
   import java.util.Random;
   
   import org.jboss.cache.CacheException;
  @@ -82,10 +83,15 @@
         
         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"));
  +      Map ab = loader.get(A_B);
  +      assertNotNull("Loader transferred /a/b", ab);
  +      assertEquals("Incorrect loader name for /a/b", JOE, ab.get("name"));
  +      assertEquals("Incorrect loader age for /a/b", TWENTY, ab.get("age"));
  +
  +      Map ac = loader.get(A_C);
  +      assertNotNull("Loader transferred /a/c", ac);
  +      assertEquals("Incorrect loader name for /a/c", BOB, ac.get("name"));
  +      assertEquals("Incorrect loader age for /a/c", FORTY, ac.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"));
  @@ -181,8 +187,11 @@
         
         cache2.activateRegion("/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"));
  +      
  +      Map ab = loader.get(A_B);
  +      assertNotNull("Loader transferred /a/b", ab);
  +      assertEquals("Incorrect name from loader for /a/b", JOE, ab.get("name"));
  +      assertEquals("Incorrect age from loader for /a/b", TWENTY, ab.get("age"));
         assertNull("/a/c transferred to loader against policy", loader.get(A_C));
   
         assertEquals("Incorrect name for /a/b", JOE, cache2.get("/a/b", "name"));
  @@ -196,10 +205,15 @@
         
         cache2.activateRegion("/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"));
  -      assertEquals("Incorrect name from loader for /a/c", BOB, loader.get(A_C).get("name"));
  -      assertEquals("Incorrect age from loader for /a/c", FORTY, loader.get(A_C).get("age"));
  +      ab = loader.get(A_B);
  +      assertNotNull("Loader still has /a/b", ab);
  +      assertEquals("Incorrect name from loader for /a/b", JOE, ab.get("name"));
  +      assertEquals("Incorrect age from loader for /a/b", TWENTY, ab.get("age"));
  +
  +      Map ac = loader.get(A_C);
  +      assertNotNull("Loader transferred /a/c", ac);
  +      assertEquals("Incorrect name from loader for /a/c", BOB, ac.get("name"));
  +      assertEquals("Incorrect age from loader for /a/c", FORTY, ac.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"));
  @@ -209,11 +223,17 @@
         
         cache2.activateRegion("/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"));
  -      assertEquals("Incorrect name from loader for /a/c", BOB, loader.get(A_C).get("name"));
  -      assertEquals("Incorrect age from loader for /a/c", FORTY, loader.get(A_C).get("age"));
  -      assertEquals("Incorrect name from loader for /a/d", JANE, loader.get(A_D).get("name"));
  +      ab = loader.get(A_B);
  +      assertNotNull("Loader still has /a/b", ab);      
  +      assertEquals("Incorrect name from loader for /a/b", JOE, ab.get("name"));
  +      assertEquals("Incorrect age from loader for /a/b", TWENTY, ab.get("age"));
  +      ac = loader.get(A_C);
  +      assertNotNull("Loader transferred /a/c", ac);
  +      assertEquals("Incorrect name from loader for /a/c", BOB, ac.get("name"));
  +      assertEquals("Incorrect age from loader for /a/c", FORTY, ac.get("age"));
  +      Map ad = loader.get(A_D);
  +      assertNotNull("Loader transferred /a/d", ad);
  +      assertEquals("Incorrect name from loader for /a/d", JANE, ad.get("name"));
         
         assertEquals("Incorrect name for /a/b", JOE, cache2.get("/a/b", "name"));
         assertEquals("Incorrect age for /a/b", TWENTY, cache2.get("/a/b", "age"));
  @@ -229,11 +249,17 @@
         
         loader = cache1.getCacheLoader();     
         
  -      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"));
  -      assertEquals("Incorrect name from loader for /a/c", BOB, loader.get(A_C).get("name"));
  -      assertEquals("Incorrect age from loader for /a/c", FORTY, loader.get(A_C).get("age"));
  -      assertEquals("Incorrect name from loader for /a/d", JANE, loader.get(A_D).get("name"));
  +      ab = loader.get(A_B);
  +      assertNotNull("Loader still has /a/b", ab);
  +      assertEquals("Incorrect name from loader for /a/b", JOE, ab.get("name"));
  +      assertEquals("Incorrect age from loader for /a/b", TWENTY, ab.get("age"));
  +      ac = loader.get(A_C);
  +      assertNotNull("Loader transferred /a/c", ac);
  +      assertEquals("Incorrect name from loader for /a/c", BOB, ac.get("name"));
  +      assertEquals("Incorrect age from loader for /a/c", FORTY, ac.get("age"));
  +      ad = loader.get(A_D);
  +      assertNotNull("Loader transferred /a/d", ad);
  +      assertEquals("Incorrect name from loader for /a/d", JANE, ad.get("name"));
         
         assertEquals("Incorrect name for /a/b", JOE, cache1.get("/a/b", "name"));
         assertEquals("Incorrect age for /a/b", TWENTY, cache1.get("/a/b", "age"));