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

[Manik Surtani]

  User: msurtani
  Date: 06/11/30 11:10:34

  Modified:    tests/functional/org/jboss/cache/replicated   Tag:
                        Branch_JBossCache_1_3_0 SyncReplTxTest.java
                        SyncCacheListenerTest.java
  Log:
  wc
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.5   +6 -2      JBossCache/tests/functional/org/jboss/cache/replicated/SyncReplTxTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SyncReplTxTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/replicated/SyncReplTxTest.java,v
  retrieving revision 1.7.2.4
  retrieving revision 1.7.2.5
  diff -u -b -r1.7.2.4 -r1.7.2.5
  --- SyncReplTxTest.java	26 Nov 2006 11:52:05 -0000	1.7.2.4
  +++ SyncReplTxTest.java	30 Nov 2006 16:10:34 -0000	1.7.2.5
  @@ -37,7 +37,7 @@
    * Note: we use DummyTransactionManager for Tx purpose instead of relying on
    * jta.
    *
  - * @version $Revision: 1.7.2.4 $
  + * @version $Revision: 1.7.2.5 $
    */
   public class SyncReplTxTest extends TestCase {
       private static Log log = LogFactory.getLog(SyncReplTxTest.class);
  @@ -186,6 +186,10 @@
         try {
            initCaches(TreeCache.REPL_SYNC);
   
  +         // create "roots" to prevent concurrency problem on Fqn.ROOT
  +         cache1.put("/one", null);
  +         cache1.put("/eins", null);         
  +
            cache1.setSyncCommitPhase(true);
            cache2.setSyncCommitPhase(true);
   
  
  
  
  1.5.2.1   +5 -1      JBossCache/tests/functional/org/jboss/cache/replicated/SyncCacheListenerTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SyncCacheListenerTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/replicated/SyncCacheListenerTest.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -b -r1.5 -r1.5.2.1
  --- SyncCacheListenerTest.java	15 Dec 2005 11:44:57 -0000	1.5
  +++ SyncCacheListenerTest.java	30 Nov 2006 16:10:34 -0000	1.5.2.1
  @@ -32,7 +32,7 @@
   /**
    * Test out the TreeCacheListener
    *
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.5.2.1 $
    */
   public class SyncCacheListenerTest extends TestCase {
      TreeCache cache1, cache2;
  @@ -133,7 +133,9 @@
            Listener lis = new Listener();
            cache1.addTreeCacheListener(lis);
            lis.put("/a/b/c", "age", new Integer(38));
  +         cache1.getTransactionManager().suspend();
            assertNull("age on cache2 must be null as the TX has not yet been committed", cache2.get("/a/b/c", "age"));
  +         cache1.getTransactionManager().resume(tx);
            tx.commit();
   
            // value on cache2 must be 38
  @@ -199,7 +201,9 @@
            map.put("age", new Integer(38));
            map.put("name", "Ben");
            lis.put("/a/b/c", map);
  +         cache1.getTransactionManager().suspend();
            assertNull("age on cache2 must be null as the TX has not yet been committed", cache2.get("/a/b/c", "age"));
  +         cache1.getTransactionManager().resume(tx);
            tx.commit();
   
            // value on cache2 must be 38