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

Brian Stansberry brian.stansberry at jboss.com
Wed Oct 11 23:37:49 EDT 2006


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

  Modified:    tests/functional/org/jboss/cache/interceptors 
                        EvictionInterceptorTest.java
  Log:
  [JBCACHE-801] Use enum for node event types
  
  Revision  Changes    Path
  1.11      +26 -25    JBossCache/tests/functional/org/jboss/cache/interceptors/EvictionInterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EvictionInterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/interceptors/EvictionInterceptorTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- EvictionInterceptorTest.java	6 Sep 2006 15:30:57 -0000	1.10
  +++ EvictionInterceptorTest.java	12 Oct 2006 03:37:49 -0000	1.11
  @@ -13,6 +13,7 @@
   import org.jboss.cache.eviction.DummyEvictionPolicy;
   import org.jboss.cache.eviction.EvictedEventNode;
   import org.jboss.cache.eviction.LRUConfiguration;
  +import org.jboss.cache.eviction.NodeEventType;
   import org.jboss.cache.eviction.Region;
   import org.jboss.cache.eviction.RegionManager;
   import org.jboss.cache.lock.IsolationLevel;
  @@ -132,7 +133,7 @@
   
         regionABC = regionManager.getRegion(fqn1);
         EvictedEventNode event = regionABC.takeLastEventNode();
  -      assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
         assertEquals(fqn1, event.getFqn().toString());
         assertNull(regionABC.takeLastEventNode());
   
  @@ -142,7 +143,7 @@
   
         Region regionAB = regionManager.getRegion(fqn2);
         event = regionAB.takeLastEventNode();
  -      assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
         assertEquals(fqn2, event.getFqn().toString());
         assertNull(regionAB.takeLastEventNode());
   
  @@ -150,7 +151,7 @@
         interceptor.invoke(mc);
         Region regionABD = regionManager.getRegion(fqn3);
         event = regionABD.takeLastEventNode();
  -      assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
         assertEquals(fqn3, event.getFqn().toString());
         assertNull(regionABD.takeLastEventNode());
   
  @@ -165,7 +166,7 @@
         {
            Region region = regionManager.getRegion(fqn3);
            event = region.takeLastEventNode();
  -         assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +         assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
            assertEquals(fqn3, event.getFqn().toString());
         }
   
  @@ -200,7 +201,7 @@
         interceptor.invoke(mc);
         EvictedEventNode event = region.takeLastEventNode();
         assertEquals(fqn, event.getFqn());
  -      assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
   
         assertNull(region.takeLastEventNode());
   
  @@ -213,7 +214,7 @@
         region = regionManager.getRegion(fqn.toString());
         event = region.takeLastEventNode();
   
  -      assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
   
         assertNull(region.takeLastEventNode());
  @@ -234,7 +235,7 @@
         {
            event = region.takeLastEventNode();
            assertEquals(fqn, event.getFqn());
  -         assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +         assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
         }
   
         cache.put("/a/b/c", key, "");
  @@ -246,7 +247,7 @@
         event = region.takeLastEventNode();
   
         assertNull(region.takeLastEventNode());
  -      assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
   
         for (int i = 0; i < 1000; i++)
  @@ -262,7 +263,7 @@
         for (int i = 0; i < 1000; i++)
         {
            event = region.takeLastEventNode();
  -         assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +         assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
            assertEquals(fqn, event.getFqn());
         }
   
  @@ -299,7 +300,7 @@
         Region region = regionManager.getRegion(fqn.toString());
         EvictedEventNode event = region.takeLastEventNode();
   
  -      assertEquals(EvictedEventNode.ADD_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertEquals(100, event.getElementDifference());
   
  @@ -326,7 +327,7 @@
            event = region.takeLastEventNode();
            assertNotNull(event);
            assertEquals(fqn, event.getFqn());
  -         assertEquals(EvictedEventNode.ADD_ELEMENT_EVENT, event.getEvent());
  +         assertEquals(NodeEventType.ADD_ELEMENT_EVENT, event.getEventType());
         }
   
         assertNull(region.takeLastEventNode());
  @@ -336,7 +337,7 @@
         interceptor.invoke(mc);
         event = regionManager.getRegion(fqn.toString()).takeLastEventNode();
         assertFalse(event.isResetElementCount());
  -      assertEquals(EvictedEventNode.ADD_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertEquals(100, event.getElementDifference());
         assertNull(regionManager.getRegion(fqn.toString()).takeLastEventNode());
  @@ -354,7 +355,7 @@
         mc = MethodCallFactory.create(MethodDeclarations.putDataEraseMethodLocal, null, fqn, data, false, true);
         interceptor.invoke(mc);
         event = regionManager.getRegion(fqn.toString()).takeLastEventNode();
  -      assertEquals(EvictedEventNode.ADD_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertEquals(100, event.getElementDifference());
         assertTrue(event.isResetElementCount());
  @@ -385,7 +386,7 @@
         interceptor.invoke(mc);
         assertEquals("value", cache.get(fqn, key));
         EvictedEventNode event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.ADD_ELEMENT_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.ADD_ELEMENT_EVENT, event.getEventType());
         assertEquals(1, event.getElementDifference());
         assertEquals(fqn, event.getFqn());
         assertEquals("value", cache.get(fqn, key));
  @@ -396,7 +397,7 @@
         interceptor.invoke(mc);
         assertEquals("value", cache.get(fqn, key));
         event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.ADD_ELEMENT_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.ADD_ELEMENT_EVENT, event.getEventType());
         assertEquals(1, event.getElementDifference());
         assertEquals(fqn, event.getFqn());
         assertEquals("value", cache.get(fqn, key));
  @@ -416,7 +417,7 @@
         assertEquals(0, cache.get(fqn).numAttributes());
         Region region = regionManager.getRegion(fqn.toString());
         EvictedEventNode event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.REMOVE_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.REMOVE_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertNull(region.takeLastEventNode());
   
  @@ -425,7 +426,7 @@
   
         assertNull(cache.get(fqn));
         event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.REMOVE_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.REMOVE_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertNull(region.takeLastEventNode());
      }
  @@ -443,7 +444,7 @@
         assertNull(cache.get(fqn, "a"));
         Region region = regionManager.getRegion(fqn.toString());
         EvictedEventNode event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.REMOVE_ELEMENT_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.REMOVE_ELEMENT_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertEquals(1, event.getElementDifference());
         assertNull(region.takeLastEventNode());
  @@ -454,7 +455,7 @@
   
         assertNull(cache.get(fqn, "b"));
         event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.REMOVE_ELEMENT_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.REMOVE_ELEMENT_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertEquals(1, event.getElementDifference());
         assertNull(region.takeLastEventNode());
  @@ -484,7 +485,7 @@
         Region region = regionManager.getRegion(fqn.toString());
         EvictedEventNode event = region.takeLastEventNode();
   
  -      assertEquals(EvictedEventNode.ADD_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertEquals(100, event.getElementDifference());
         assertNull(region.takeLastEventNode());
  @@ -493,7 +494,7 @@
                 fqn);
         interceptor.invoke(mc);
         event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertNull(region.takeLastEventNode());
   
  @@ -501,7 +502,7 @@
         interceptor.invoke(mc);
         assertNull(cache.get(fqn));
         event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.REMOVE_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.REMOVE_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertNull(region.takeLastEventNode());
   
  @@ -512,7 +513,7 @@
         interceptor.invoke(mc);
         assertEquals("value", cache.get(fqn, key));
         event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.ADD_ELEMENT_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.ADD_ELEMENT_EVENT, event.getEventType());
         assertEquals(1, event.getElementDifference());
         assertEquals(fqn, event.getFqn());
         assertEquals("value", cache.get(fqn, key));
  @@ -522,7 +523,7 @@
         interceptor.invoke(mc);
         region = regionManager.getRegion(fqn.toString());
         event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.VISIT_NODE_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertNull(region.takeLastEventNode());
   
  @@ -532,7 +533,7 @@
   
         assertNull(cache.get(fqn, key));
         event = region.takeLastEventNode();
  -      assertEquals(EvictedEventNode.REMOVE_ELEMENT_EVENT, event.getEvent());
  +      assertEquals(NodeEventType.REMOVE_ELEMENT_EVENT, event.getEventType());
         assertEquals(fqn, event.getFqn());
         assertEquals(1, event.getElementDifference());
         assertNull(region.takeLastEventNode());
  
  
  



More information about the jboss-cvs-commits mailing list