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

[Manik Surtani]

  User: msurtani
  Date: 06/09/22 12:27:56

  Modified:    tests/functional/org/jboss/cache/passivation 
                        PassivationTestsBase.java
  Log:
  - Modification types to Enums.
  - Abstracted put(List)
  
  Revision  Changes    Path
  1.17      +30 -22    JBossCache/tests/functional/org/jboss/cache/passivation/PassivationTestsBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PassivationTestsBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/PassivationTestsBase.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- PassivationTestsBase.java	6 Sep 2006 15:31:00 -0000	1.16
  +++ PassivationTestsBase.java	22 Sep 2006 16:27:56 -0000	1.17
  @@ -36,7 +36,7 @@
    * Base tests for passivation using any of the cache loaders
    *
    * @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
  - * @version $Id: PassivationTestsBase.java,v 1.16 2006/09/06 15:31:00 msurtani Exp $
  + * @version $Id: PassivationTestsBase.java,v 1.17 2006/09/22 16:27:56 msurtani Exp $
    */
   abstract public class PassivationTestsBase extends TestCase
   {
  @@ -227,7 +227,9 @@
         {
            Map m = new HashMap();
            for (int i = 0; i < 10; i++)
  +         {
               m.put("key" + i, "val" + i);
  +         }
            cache.put("/a/b/c", m);
            cache.load("/1/2/3/4/5");
            cache.put("/1/2/3/4/5", null);
  @@ -413,7 +415,9 @@
         try
         {
            if (!cache.exists("/a/b/c"))
  +         {
               cache.put("/a/b/c", null);
  +         }
            Set children = cache.getChildrenNames((Fqn) null); // get "null* node children names
            assertNull(children);
         }
  @@ -1383,7 +1387,7 @@
         /* REMOVE_KEY_VALUE */
         list = new ArrayList();
         Modification mod = new Modification();
  -      mod.setType(Modification.REMOVE_KEY_VALUE);
  +      mod.setType(Modification.ModificationType.REMOVE_KEY_VALUE);
         mod.setFqn(FQN);
         mod.setKey("one");
         list.add(mod);
  @@ -1394,7 +1398,7 @@
         /* REMOVE_NODE */
         list = new ArrayList();
         mod = new Modification();
  -      mod.setType(Modification.REMOVE_NODE);
  +      mod.setType(Modification.ModificationType.REMOVE_NODE);
         mod.setFqn(FQN);
         list.add(mod);
         loader.put(list);
  @@ -1406,7 +1410,7 @@
         loader.put(FQN, "one", "two");
         list = new ArrayList();
         mod = new Modification();
  -      mod.setType(Modification.REMOVE_DATA);
  +      mod.setType(Modification.ModificationType.REMOVE_DATA);
         mod.setFqn(FQN);
         list.add(mod);
         loader.put(list);
  @@ -1481,14 +1485,14 @@
         List list = new ArrayList();
   
         Modification mod = new Modification();
  -      mod.setType(Modification.PUT_KEY_VALUE);
  +      mod.setType(Modification.ModificationType.PUT_KEY_VALUE);
         mod.setFqn(FQN);
         mod.setKey("one");
         mod.setValue("two");
         list.add(mod);
   
         mod = new Modification();
  -      mod.setType(Modification.PUT_KEY_VALUE);
  +      mod.setType(Modification.ModificationType.PUT_KEY_VALUE);
         mod.setFqn(FQN);
         mod.setKey("three");
         mod.setValue("four");
  @@ -1498,7 +1502,7 @@
         map.put("five", "six");
         map.put("seven", "eight");
         mod = new Modification();
  -      mod.setType(Modification.PUT_DATA);
  +      mod.setType(Modification.ModificationType.PUT_DATA);
         mod.setFqn(FQN);
         mod.setData(map);
         list.add(mod);
  @@ -1519,10 +1523,10 @@
            Fqn fqn = mod.getFqn();
            switch (mod.getType())
            {
  -            case Modification.PUT_KEY_VALUE:
  +            case PUT_KEY_VALUE:
                  assertEquals(mod.getValue(), loader.get(fqn).get(mod.getKey()));
                  break;
  -            case Modification.PUT_DATA:
  +            case PUT_DATA:
                  Map map = mod.getData();
                  for (Iterator iter = map.keySet().iterator(); iter.hasNext();)
                  {
  @@ -1530,15 +1534,15 @@
                     assertEquals(map.get(key), loader.get(fqn).get(key));
                  }
                  break;
  -            case Modification.REMOVE_KEY_VALUE:
  +            case REMOVE_KEY_VALUE:
                  assertEquals(null, loader.get(fqn).get(mod.getKey()));
                  break;
  -            case Modification.REMOVE_DATA:
  +            case REMOVE_DATA:
                  map = loader.get(fqn);
                  assertNotNull(map);
                  assertTrue(map.isEmpty());
                  break;
  -            case Modification.REMOVE_NODE:
  +            case REMOVE_NODE:
                  assertEquals(null, loader.get(fqn));
                  break;
               default:
  @@ -1702,11 +1706,15 @@
         public int hashCode()
         {
            if (nested == null)
  +         {
               return super.hashCode();
  +         }
            else
  +         {
               return 13 + nested.hashCode();
         }
      }
  +   }
   
   
      public static Test suite()