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

Ben Wang bwang at jboss.com
Tue Jan 9 02:51:30 EST 2007


  User: bwang   
  Date: 07/01/09 02:51:30

  Modified:    tests-50/functional/org/jboss/cache/pojo/statetransfer 
                        StateTransferAopTestBase.java
  Log:
  Updated for partial state transfer.
  
  Revision  Changes    Path
  1.10      +19 -56    JBossCache/tests-50/functional/org/jboss/cache/pojo/statetransfer/StateTransferAopTestBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferAopTestBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/statetransfer/StateTransferAopTestBase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- StateTransferAopTestBase.java	2 Jan 2007 17:15:31 -0000	1.9
  +++ StateTransferAopTestBase.java	9 Jan 2007 07:51:30 -0000	1.10
  @@ -39,7 +39,7 @@
    * Tests state transfer in PojoCache.
    *
    * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public abstract class StateTransferAopTestBase extends TestCase
   {
  @@ -156,61 +156,35 @@
         assertNull("/a/b/2 not transferred per policy", cache2.find(A_B_2));
   
         // TODO: Reinstate once we have proper FLUSH working.
  -      // This test relies on calls to inactive regions being queued and re-run
  -      // when the region is activated.  After discussions with Brian, the queueing
  -      // was removed, presuming FLUSH will fix this.  Need to test with FLUSH.
  -      // - Manik Surtani (16 Oct 2006)
  -/*
  -      cache2.getCache().getRegion(Fqn.fromString("/a/b"), true).activate();
  +      cache2.getCache().getRegion(Fqn.fromString("/a"), true).activate();
   
         Person ab1 = (Person) cache2.find(A_B_1);
         Person ab2 = (Person) cache2.find(A_B_2);
  -      assertEquals("Name for /a/b/1 is Joe", joe.getLastElementAsString(), ab1.getLastElementAsString());
  +      assertEquals("Name for /a/b/1 is Joe", joe.getName(), ab1.getName());
         assertEquals("City for /a/b/1 is Anytown", joe.getAddress().getCity(), ab1.getAddress().getCity());
  -      assertEquals("Name for /a/b/2 is Jane", jane.getLastElementAsString(), ab2.getLastElementAsString());
  +      assertEquals("Name for /a/b/2 is Jane", jane.getName(), ab2.getName());
         assertEquals("City for /a/b/2 is Anytown", jane.getAddress().getCity(), ab2.getAddress().getCity());
         assertTrue("Address for Joe and Jane is the same object", ab1.getAddress() == ab2.getAddress());
   
         cache1.attach(A_C_1, bob);
         cache1.attach(A_C_2, jill);
   
  -      assertNull("/a/c/1 not transferred per policy", cache2.find(A_C_1));
  -
  -      cache2.getCache().getRegion(Fqn.fromString("/a/c"), true).activate();
  -
  -      Person ac1 = (Person) cache2.find(A_C_1);
  -      Person ac2 = (Person) cache2.find(A_C_2);
  -      assertEquals("Name for /a/c/1 is Bob", bob.getLastElementAsString(), ac1.getLastElementAsString());
  -      assertEquals("City for /a/c/1 is Fremont", addr2.getCity(), ac1.getAddress().getCity());
  -      assertEquals("Name for /a/c/2 is Jill", jill.getLastElementAsString(), ac2.getLastElementAsString());
  -      assertEquals("City for /a/c/2 is Fremont", addr2.getCity(), ac2.getAddress().getCity());
  -      assertTrue("Bob and Jill have same Address", ac1.getAddress() == ac2.getAddress());
  +      assertNotNull("/a/c/1 should be transferred per policy", cache2.find(A_C_1));
   
         cache1.getCache().getRegion(Fqn.fromString("/a"), true).deactivate();
   
  -      cache1.getCache().getRegion(Fqn.fromString("/a/b/1"), true).activate();
  -      cache1.getCache().getRegion(Fqn.fromString("/a/b/2"), true).activate();
  -      cache1.getCache().getRegion(Fqn.fromString("/a/c/1"), true).activate();
  -      cache1.getCache().getRegion(Fqn.fromString("/a/c/2"), true).activate();
  +      cache1.getCache().getRegion(Fqn.fromString("/a"), true).activate();
   
         ab1 = (Person) cache1.find(A_B_1);
  -      assertEquals("Name for /a/b/1 is Joe", joe.getLastElementAsString(), ab1.getLastElementAsString());
  +      assertEquals("Name for /a/b/1 is Joe", joe.getName(), ab1.getName());
         assertEquals("City for /a/b/1 is Anytown", addr1.getCity(), ab1.getAddress().getCity());
         ab2 = (Person) cache1.find(A_B_2);
  -      assertEquals("Name for /a/b/1 is Jane", jane.getLastElementAsString(), ab2.getLastElementAsString());
  +      assertEquals("Name for /a/b/1 is Jane", jane.getName(), ab2.getName());
         assertEquals("City for /a/b/1 is Anytown", addr1.getCity(), ab2.getAddress().getCity());
         assertTrue("Address for Joe and Jane is the same object", ab1.getAddress() == ab2.getAddress());
  -      ac1 = (Person) cache1.find(A_C_1);
  -      assertEquals("Name for /a/c/1 is Bob", bob.getLastElementAsString(), ac1.getLastElementAsString());
  -      assertEquals("City for /a/c/1 is Fremont", addr2.getCity(), ac1.getAddress().getCity());
  -      ac2 = (Person) cache1.find(A_C_2);
  -      assertEquals("Name for /a/c/2 is Jill", jill.getLastElementAsString(), ac2.getLastElementAsString());
  -      assertEquals("City for /a/c/2 is Fremont", addr2.getCity(), ac2.getAddress().getCity());
  -      assertTrue("Address for Bob and Jill is the same object", ac1.getAddress() == ac2.getAddress());
  -      */
      }
   
  -   public void XtestPartialStateTransferWithLoader() throws Exception
  +   public void testPartialStateTransferWithLoader() throws Exception
      {
         log.info("Enter testPartialStateTransferWithLoader");
   
  @@ -243,11 +217,11 @@
         assertNull("/a/b/1 not transferred per policy", cache2.find(A_B_1));
         assertNull("/a/b/2 not transferred per policy", cache2.find(A_B_2));
   
  -      cache1.getCache().getRegion(Fqn.fromString("/a/b"), true).activate();
  +      cache2.getCache().getRegion(Fqn.fromString("/a"), true).activate();
   
  -//      assertEquals("Correct name from loader for /a/b/1", joe.getLastElementAsString(), loader.get(A_B_1_f).get("name"));
  +//      assertEquals("Correct name from loader for /a/b/1", joe.getName(), loader.get(A_B_1_f).get("name"));
   //      assertEquals("Correct age from loader for /a/b/1", TWENTY, loader.get(A_B_1_f).get("age"));
  -//      assertEquals("Correct name from loader for /a/b/2", jane.getLastElementAsString(), loader.get(A_B_2_f).get("name"));
  +//      assertEquals("Correct name from loader for /a/b/2", jane.getName(), loader.get(A_B_2_f).get("name"));
   //      assertEquals("Correct age from loader for /a/b/2", TWENTYFIVE, loader.get(A_B_2_f).get("age"));
   
   
  @@ -261,19 +235,10 @@
   
         cache1.attach(A_C_1, bob);
         cache1.attach(A_C_2, jill);
  +      Thread.sleep(200);
   
  -      assertNull("/a/c/1 not transferred per policy", cache2.find(A_C_1));
  -
  -      cache1.getCache().getRegion(Fqn.fromString("/a/c"), true).activate();
  -
  -//     assertEquals("Correct name from loader for /a/b/1", joe.getLastElementAsString(), loader.get(A_B_1_f).get("name"));
  -//      assertEquals("Correct age from loader for /a/b/1", TWENTY, loader.get(A_B_1_f).get("age"));
  -//      assertEquals("Correct name from loader for /a/b/2", jane.getLastElementAsString(), loader.get(A_B_2_f).get("name"));
  -//      assertEquals("Correct age from loader for /a/b/2", TWENTYFIVE, loader.get(A_B_2_f).get("age"));
  -//      assertEquals("Correct name from loader for /a/c/1", bob.getLastElementAsString(), loader.get(A_C_1_f).get("name"));
  -//      assertEquals("Correct age from loader for /a/c/1", FORTY, loader.get(A_C_1_f).get("age"));
  -//      assertEquals("Correct name from loader for /a/c/2", jill.getLastElementAsString(), loader.get(A_C_2_f).get("name"));
  -//      assertEquals("Correct age from loader for /a/c/2", TWENTYFIVE, loader.get(A_C_2_f).get("age"));
  +      assertNotNull("/a/c/1 transferred per policy", cache2.find(A_C_1));
  +      assertNotNull("/a/c/1 transferred per policy", cache2.find(A_C_2));
   
         Person ac1 = (Person) cache2.find(A_C_1);
         Person ac2 = (Person) cache2.find(A_C_2);
  @@ -285,16 +250,10 @@
   
         cache1.getCache().getRegion(Fqn.fromString("/a"), true).deactivate();
   
  -      cache1.getCache().getRegion(Fqn.fromString("/a/b/1"), true).activate();
  -      cache1.getCache().getRegion(Fqn.fromString("/a/b/2"), true).activate();
  -      cache1.getCache().getRegion(Fqn.fromString("/a/c/1"), true).activate();
  -      cache1.getCache().getRegion(Fqn.fromString("/a/c/2"), true).activate();
  -
         ab1 = (Person) cache1.find(A_B_1);
         assertEquals("Name for /a/b/1 is Joe", joe.getName(), ab1.getName());
         assertEquals("City for /a/b/1 is Anytown", addr1.getCity(), ab1.getAddress().getCity());
         ab2 = (Person) cache1.find(A_B_2);
  -      ;
         assertEquals("Name for /a/b/1 is Jane", jane.getName(), ab2.getName());
         assertEquals("City for /a/b/1 is Anytown", addr1.getCity(), ab2.getAddress().getCity());
         assertTrue("Address for Joe and Jane is the same object", ab1.getAddress() == ab2.getAddress());
  @@ -768,6 +727,10 @@
         Set keys = caches.keySet();
         String[] cacheIDs = new String[keys.size()];
         cacheIDs = (String[]) keys.toArray(cacheIDs);
  +      PojoCache cache = (PojoCache)caches.get(cacheIDs[0]);
  +      cache.getCache().removeNode(new Fqn("/"));
  +      Thread.sleep(200);
  +
         for (int i = 0; i < cacheIDs.length; i++)
         {
            stopCache((PojoCache) caches.get(cacheIDs[i]));
  
  
  



More information about the jboss-cvs-commits mailing list