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

[Brian Stansberry]

  User: bstansberry
  Date: 06/10/11 23:37:17

  Modified:    tests/functional/org/jboss/cache/eviction   RegionTest.java
                        ElementSizeAlgorithmTest.java
  Log:
  [JBCACHE-801] Use enum for node event types
  
  Revision  Changes    Path
  1.6       +2 -2      JBossCache/tests/functional/org/jboss/cache/eviction/RegionTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegionTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/RegionTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- RegionTest.java	25 Aug 2006 14:56:21 -0000	1.5
  +++ RegionTest.java	12 Oct 2006 03:37:17 -0000	1.6
  @@ -67,8 +67,8 @@
         region.setVisitedNode(fqn3);
   
         assertEquals("RemovedNode queue size ", 3, region.nodeEventQueueSize());
  -      int event = region.takeLastEventNode().getEvent();
  -      assertEquals("DataNode retrieved should be: ", EvictedEventNode.REMOVE_NODE_EVENT, event);
  +      NodeEventType event = region.takeLastEventNode().getEventType();
  +      assertEquals("DataNode retrieved should be: ", NodeEventType.REMOVE_NODE_EVENT, event);
         Fqn fqn = region.takeLastEventNode().getFqn();
         fqn = region.takeLastEventNode().getFqn();
         EvictedEventNode node = region.takeLastEventNode();
  
  
  
  1.2       +5 -5      JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ElementSizeAlgorithmTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ElementSizeAlgorithmTest.java	7 May 2006 03:34:39 -0000	1.1
  +++ ElementSizeAlgorithmTest.java	12 Oct 2006 03:37:17 -0000	1.2
  @@ -13,7 +13,7 @@
   
   /**
    * @author Daniel Huang
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class ElementSizeAlgorithmTest extends TestCase
   {
  @@ -56,7 +56,7 @@
            {
               for (int k = 0; k < i; k++)
               {
  -               region.putNodeEvent(fqn, EvictedEventNode.ADD_ELEMENT_EVENT);
  +               region.putNodeEvent(fqn, NodeEventType.ADD_ELEMENT_EVENT);
               }
            }
         }
  @@ -87,8 +87,8 @@
   
         for (int i = 0; i < 7; i++)
         {
  -         region.putNodeEvent(Fqn.fromString("/a/b/9"), EvictedEventNode.ADD_ELEMENT_EVENT);
  -         region.putNodeEvent(Fqn.fromString("/a/b/7"), EvictedEventNode.ADD_ELEMENT_EVENT);
  +         region.putNodeEvent(Fqn.fromString("/a/b/9"), NodeEventType.ADD_ELEMENT_EVENT);
  +         region.putNodeEvent(Fqn.fromString("/a/b/7"), NodeEventType.ADD_ELEMENT_EVENT);
         }
   
         algo.process(region);
  @@ -109,7 +109,7 @@
            region.setAddedNode(fqn);
            for (int k = 0; k < i; k++)
            {
  -            region.putNodeEvent(fqn, EvictedEventNode.ADD_ELEMENT_EVENT);
  +            region.putNodeEvent(fqn, NodeEventType.ADD_ELEMENT_EVENT);
            }
         }