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

[Manik Surtani]

  User: msurtani
  Date: 07/03/07 17:46:29

  Modified:    tests/functional/org/jboss/cache/options   Tag:
                        Branch_JBossCache_1_4_0 ExplicitVersionsTest.java
                        ExplicitVersionsReplTest.java
  Log:
  JBCACHE-961 - more sophisticated merging of child maps in workspace nodes backported to 1.4.x
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.4.5   +1 -1      JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExplicitVersionsTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsTest.java,v
  retrieving revision 1.3.4.4
  retrieving revision 1.3.4.5
  diff -u -b -r1.3.4.4 -r1.3.4.5
  --- ExplicitVersionsTest.java	30 Jan 2007 22:23:50 -0000	1.3.4.4
  +++ ExplicitVersionsTest.java	7 Mar 2007 22:46:29 -0000	1.3.4.5
  @@ -122,7 +122,7 @@
   
         cache.put(Fqn.fromString("/org/domain/Entity/EntityInstance#1"), "k", "v", o);
   
  -      assertEquals(2, ((DefaultDataVersion)((OptimisticTreeNode)cache.get("/org/domain/Entity")).getVersion()).getRawVersion());
  +      assertEquals(1, ((DefaultDataVersion)((OptimisticTreeNode)cache.get("/org/domain/Entity")).getVersion()).getRawVersion());
         assertEquals(v, ((OptimisticTreeNode)cache.get("/org/domain/Entity/EntityInstance#1")).getVersion());
      }
   
  
  
  
  1.1.2.8   +2 -2      JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsReplTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExplicitVersionsReplTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsReplTest.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -b -r1.1.2.7 -r1.1.2.8
  --- ExplicitVersionsReplTest.java	6 Mar 2007 20:08:53 -0000	1.1.2.7
  +++ ExplicitVersionsReplTest.java	7 Mar 2007 22:46:29 -0000	1.1.2.8
  @@ -320,9 +320,9 @@
   
         cache[0].put(Fqn.fromString("/org/domain/Entity/EntityInstance#1"), "k", "v", o);
   
  -      assertEquals(2, ((DefaultDataVersion)((OptimisticTreeNode)cache[0].get("/org/domain/Entity")).getVersion()).getRawVersion());
  +      assertEquals(1, ((DefaultDataVersion)((OptimisticTreeNode)cache[0].get("/org/domain/Entity")).getVersion()).getRawVersion());
         assertEquals(v, ((OptimisticTreeNode)cache[0].get("/org/domain/Entity/EntityInstance#1")).getVersion());
  -      assertEquals(2, ((DefaultDataVersion)((OptimisticTreeNode)cache[1].get("/org/domain/Entity")).getVersion()).getRawVersion());
  +      assertEquals(1, ((DefaultDataVersion)((OptimisticTreeNode)cache[1].get("/org/domain/Entity")).getVersion()).getRawVersion());
         assertEquals(v, ((OptimisticTreeNode)cache[1].get("/org/domain/Entity/EntityInstance#1")).getVersion());
   
      }