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

[Manik Surtani]

  User: msurtani
  Date: 06/10/12 19:03:58

  Modified:    tests/functional/org/jboss/cache/eviction 
                        RegionManagerTest.java
  Log:
  a LOT of changes around Regions, in an attempt to unify eviction and marshalling regions
  
  Revision  Changes    Path
  1.12      +47 -47    JBossCache/tests/functional/org/jboss/cache/eviction/RegionManagerTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegionManagerTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/RegionManagerTest.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- RegionManagerTest.java	19 Jul 2006 21:34:45 -0000	1.11
  +++ RegionManagerTest.java	12 Oct 2006 23:03:58 -0000	1.12
  @@ -8,11 +8,11 @@
   import org.w3c.dom.Element;
   
   /**
  - * Region Manager unit tests.
  + * MarshRegion Manager unit tests.
    *
    * @author Ben Wang, Feb 11, 2004
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public class RegionManagerTest extends TestCase
   {
  @@ -59,7 +59,7 @@
         }
   
         Region[] regions = regionManager.getRegions();
  -      assertEquals("Region size ", 4, regions.length);
  +      assertEquals("MarshRegion size ", 4, regions.length);
      }
   
      public void testCreateRegion2()
  @@ -81,19 +81,19 @@
         }
   
         Region[] regions = regionManager.getRegions();
  -      assertEquals("Region size ", 3, regions.length);
  -      assertEquals("Region 0", DEFAULT_REGION, regions[0].getFqn());
  -      assertEquals("Region 1 ", "/a/b/c/", regions[1].getFqn());
  -      assertEquals("Region 2 ", "/a/b/", regions[2].getFqn());
  +      assertEquals("MarshRegion size ", 3, regions.length);
  +      assertEquals("MarshRegion 0", DEFAULT_REGION, regions[0].getFqn());
  +      assertEquals("MarshRegion 1 ", "/a/b/c/", regions[1].getFqn());
  +      assertEquals("MarshRegion 2 ", "/a/b/", regions[2].getFqn());
         Region region = regionManager.getRegion("/a/b/c/d");
  -      assertNotNull("Region ", region);
  -      assertEquals("Region ", "/a/b/c/", region.getFqn());
  +      assertNotNull("MarshRegion ", region);
  +      assertEquals("MarshRegion ", "/a/b/c/", region.getFqn());
         region = regionManager.getRegion("/a/b");
  -      assertNotNull("Region ", region);
  -      assertEquals("Region ", "/a/b/", region.getFqn());
  +      assertNotNull("MarshRegion ", region);
  +      assertEquals("MarshRegion ", "/a/b/", region.getFqn());
         region = regionManager.getRegion("/a");
         // Should be default.
  -      assertNotNull("Region ", region);
  +      assertNotNull("MarshRegion ", region);
      }
   
      public void testNoDefaultRegion()
  @@ -144,7 +144,7 @@
         catch (RegionNameConflictException e)
         {
            Region[] regions = regionManager.getRegions();
  -         assertEquals("Region size ", 2, regions.length);
  +         assertEquals("MarshRegion size ", 2, regions.length);
            return;
         }
         fail("testRegionConflict failed");
  @@ -166,7 +166,7 @@
         catch (RegionNameConflictException e)
         {
            Region[] regions = regionManager.getRegions();
  -         assertEquals("Region size ", 1, regions.length);
  +         assertEquals("MarshRegion size ", 1, regions.length);
            return;
         }
         fail("testRegionConflict failed");
  @@ -191,7 +191,7 @@
         }
   
         Region region = regionManager.getRegion(fqn2);
  -      assertNotSame("Region ", fqn1, region.getFqn());
  +      assertNotSame("MarshRegion ", fqn1, region.getFqn());
      }
   
      public void testConfigureWithXML() throws Exception