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

Manik Surtani msurtani at jboss.com
Thu Oct 12 19:03:57 EDT 2006


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

  Modified:    tests/functional/org/jboss/cache/marshall      
                        ActiveInactiveTest.java
                        VersionAwareMarshallerTest.java
                        RegionManagerTest.java
                        TreeCacheMarshaller200Test.java
                        TreeCacheMarshallerTestBase.java
  Removed:     tests/functional/org/jboss/cache/marshall      
                        TreeCacheMarshaller140Test.java
  Log:
  a LOT of changes around Regions, in an attempt to unify eviction and marshalling regions
  
  Revision  Changes    Path
  1.9       +56 -63    JBossCache/tests/functional/org/jboss/cache/marshall/ActiveInactiveTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActiveInactiveTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/marshall/ActiveInactiveTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- ActiveInactiveTest.java	30 Aug 2006 17:08:19 -0000	1.8
  +++ ActiveInactiveTest.java	12 Oct 2006 23:03:57 -0000	1.9
  @@ -9,6 +9,7 @@
   
   import junit.framework.TestCase;
   import org.jboss.cache.Fqn;
  +import org.jboss.cache.RegionManager;
   import org.jboss.cache.Version;
   
   import java.lang.reflect.Method;
  @@ -24,121 +25,104 @@
   
      public void testDefaultActive() throws Exception
      {
  -      VersionAwareMarshaller testee = new VersionAwareMarshaller(new RegionManager(), false, true, Version.getVersionString(Version.getVersionShort()));
  +      RegionManager rman = new RegionManager();
  +      rman.setDefaultInactive(false);
  +      VersionAwareMarshaller testee = new VersionAwareMarshaller(rman, false, true, Version.getVersionString(Version.getVersionShort()));
         assertFalse("Root is not active", testee.isInactive("/"));
   
  -      testee.inactivate("/a");
  +      rman.inactivate("/a");
         assertFalse("Root is not active after inactivating subtree",
                 testee.isInactive("/"));
   
  -      testee.activate("/a");
  +      rman.activate("/a");
         assertFalse("Root is not active after activating subtree",
                 testee.isInactive("/"));
   
  -      RegionNameConflictException ex = null;
  -      try
  -      {
  -         testee.activate("/a/b");
  -      }
  -      catch (RegionNameConflictException e)
  -      {
  -         ex = e;
  -      }
  -      assertNull("No RegionNameConflictException against default region", ex);
  -
  -      testee.inactivate("/");
  -      assertTrue("Root is inactive", testee.isInactive("/"));
  +      rman.activate("/a/b");
   
  -      try
  -      {
  -         testee.activate("/a");
  -         fail("Did not throw RegionNameConflictException when overriding '/'");
  -      }
  -      catch (RegionNameConflictException e)
  -      {
  -         // good
  -      }
  +      rman.inactivate("/");
  +      assertTrue("Root is active", testee.isInactive("/"));
      }
   
      public void testDefaultInactive() throws Exception
      {
  -      VersionAwareMarshaller testee = new VersionAwareMarshaller(new RegionManager(), true, true, Version.getVersionString(Version.getVersionShort()));
  +      RegionManager rman = new RegionManager();
  +      rman.setDefaultInactive(true);
  +      VersionAwareMarshaller testee = new VersionAwareMarshaller(rman, true, true, Version.getVersionString(Version.getVersionShort()));
         assertTrue("Root is not inactive", testee.isInactive("/"));
   
  -      testee.activate("/a");
  +      rman.activate("/a");
         assertTrue("Root is not inactive after activating subtree",
                 testee.isInactive("/"));
   
  -      testee.inactivate("/a");
  +      rman.inactivate("/a");
         assertTrue("Root is not inactive after inactivating subtree",
                 testee.isInactive("/"));
   
  -      RegionNameConflictException ex = null;
  -      try
  -      {
  -         testee.inactivate("/a/b");
  -      }
  -      catch (RegionNameConflictException e)
  -      {
  -         ex = e;
  -      }
  -      assertNull("Caught RegionNameConflictException against default region", ex);
  +      rman.inactivate("/a/b");
   
  -      testee.activate("/");
  +      rman.activate("/");
         assertFalse("Root is not active", testee.isInactive("/"));
      }
   
      public void testActivate() throws Exception
      {
  -      VersionAwareMarshaller defaultActive = new VersionAwareMarshaller(new RegionManager(), false, true, Version.getVersionString(Version.getVersionShort()));
  +      RegionManager rman = new RegionManager();
  +      rman.setDefaultInactive(false);
  +      VersionAwareMarshaller defaultActive = new VersionAwareMarshaller(rman, false, true, Version.getVersionString(Version.getVersionShort()));
   
  -      defaultActive.activate("/a");
  +      rman.activate("/a");
         assertFalse("/a is not active after activating",
                 defaultActive.isInactive("/a"));
   
  -      defaultActive.inactivate("/a");
  -      defaultActive.activate("/a");
  +      rman.inactivate("/a");
  +      rman.activate("/a");
         assertFalse("/a is not active after reactivating",
                 defaultActive.isInactive("/a"));
   
  -      VersionAwareMarshaller defaultInactive = new VersionAwareMarshaller(new RegionManager(), true, true, Version.getVersionString(Version.getVersionShort()));
  +      rman = new RegionManager();
  +      rman.setDefaultInactive(true);
  +      VersionAwareMarshaller defaultInactive = new VersionAwareMarshaller(rman, true, true, Version.getVersionString(Version.getVersionShort()));
   
  -      defaultInactive.activate("/i");
  +      rman.activate("/i");
         assertFalse("/i is not active after activating",
                 defaultInactive.isInactive("/i"));
         assertFalse("/i/k is not active after activating /i",
                 defaultInactive.isInactive("/i/k"));
   
  -      defaultInactive.inactivate("/i");
  -      defaultInactive.activate("/i");
  +      rman.inactivate("/i");
  +      rman.activate("/i");
         assertFalse("/i is not active after reactivating",
                 defaultInactive.isInactive("/i"));
      }
   
      public void testInactivate() throws Exception
      {
  +      RegionManager rman = new RegionManager();
  +      rman.setDefaultInactive(true);
  +      VersionAwareMarshaller defaultInactive = new VersionAwareMarshaller(rman, true, true, Version.getVersionString(Version.getVersionShort()));
   
  -      VersionAwareMarshaller defaultInactive = new VersionAwareMarshaller(new RegionManager(), true, true, Version.getVersionString(Version.getVersionShort()));
  -
  -      defaultInactive.inactivate("/i");
  +      rman.inactivate("/i");
         assertTrue("/i is not inactive after inactivating",
                 defaultInactive.isInactive("/i"));
   
  -      defaultInactive.activate("/i");
  -      defaultInactive.inactivate("/i");
  +      rman.activate("/i");
  +      rman.inactivate("/i");
         assertTrue("/i is not inactive after re-inactivating",
                 defaultInactive.isInactive("/i"));
   
  -      VersionAwareMarshaller defaultActive = new VersionAwareMarshaller(new RegionManager(), false, true, Version.getVersionString(Version.getVersionShort()));
  +      RegionManager rman2 = new RegionManager();
  +      rman.setDefaultInactive(false);
  +      VersionAwareMarshaller defaultActive = new VersionAwareMarshaller(rman2, false, true, Version.getVersionString(Version.getVersionShort()));
   
  -      defaultActive.inactivate("/a");
  +      rman2.inactivate("/a");
         assertTrue("/a is not inactive after inactivating",
                 defaultInactive.isInactive("/a"));
         assertTrue("/a/b is not inactive after inactivating /a",
                 defaultInactive.isInactive("/a/b"));
   
  -      defaultActive.activate("/a");
  -      defaultActive.inactivate("/a");
  +      rman2.activate("/a");
  +      rman2.inactivate("/a");
         assertTrue("/a is not inactive after re-inactivating",
                 defaultInactive.isInactive("/a"));
      }
  @@ -150,17 +134,26 @@
   
         MethodCall replicate = MethodCallFactory.create(MethodDeclarations.replicateMethod, put);
   
  -      VersionAwareMarshaller testee = new VersionAwareMarshaller(new RegionManager(), true, true, Version.getVersionString(Version.getVersionShort()));
  +      RegionManager rman = new RegionManager();
  +      rman.setDefaultInactive(true);
  +      VersionAwareMarshaller testee = new VersionAwareMarshaller(rman, true, true, Version.getVersionString(Version.getVersionShort()));
         byte[] callBytes = testee.objectToByteBuffer(replicate);
   
  +      try
  +      {
  +         testee.objectFromByteBuffer(callBytes);
  +         fail("Expected to fail since region is inactive");
  +      }
  +      catch (Exception e)
  +      {
  +         // expected to fail since region is inactive
  +      }
  +
  +      rman.activate("/a");
  +      assertTrue(rman.hasRegion(Fqn.fromString("/a")));
  +
         MethodCall result = (MethodCall) testee.objectFromByteBuffer(callBytes);
         Method method = result.getMethod();
  -      assertEquals("Did not get notifyCallOnInactive method when passing" +
  -              " call for inactive node", MethodDeclarations.notifyCallOnInactiveMethod, method);
  -
  -      testee.activate("/a");
  -      result = (MethodCall) testee.objectFromByteBuffer(callBytes);
  -      method = result.getMethod();
         assertEquals("Did not get replicate method when passing" +
                 " call for active node", MethodDeclarations.replicateMethod, method);
      }
  
  
  
  1.6       +8 -39     JBossCache/tests/functional/org/jboss/cache/marshall/VersionAwareMarshallerTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: VersionAwareMarshallerTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/marshall/VersionAwareMarshallerTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- VersionAwareMarshallerTest.java	30 Aug 2006 11:23:55 -0000	1.5
  +++ VersionAwareMarshallerTest.java	12 Oct 2006 23:03:57 -0000	1.6
  @@ -7,10 +7,9 @@
   package org.jboss.cache.marshall;
   
   import junit.framework.TestCase;
  +import org.jboss.cache.RegionManager;
   import org.jboss.cache.Version;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.IOException;
   import java.io.ObjectInputStream;
   
   /**
  @@ -22,30 +21,29 @@
   {
      public void testMarshallerSelection()
      {
  -
         VersionAwareMarshaller marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "2.0.0.GA");
         assertEquals(TreeCacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
   
         marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.4.0.GA");
  -      assertEquals(TreeCacheMarshaller140.class, marshaller.defaultMarshaller.getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
   
         marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.5.0.GA");
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.defaultMarshaller.getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
   
         marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.3.0.GA");
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.defaultMarshaller.getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
   
         marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.3.0.SP2");
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.defaultMarshaller.getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
   
         marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.3.1.GA");
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.defaultMarshaller.getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
   
         marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.2.4.SP2");
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.defaultMarshaller.getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
   
         marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.2.3");
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.defaultMarshaller.getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
      }
   
      public void testVersionHeaderDefaultCurrent() throws Exception
  @@ -68,33 +66,4 @@
         assertEquals("Version header short should be '20'", 20, in.readShort());
      }
   
  -
  -   public void testVersionHeader140() throws Exception
  -   {
  -      VersionAwareMarshaller marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.4.0.GA");
  -      byte[] bytes = marshaller.objectToByteBuffer("Hello");
  -
  -      // expect that this has been serialized using JBoss Serialization so use this to get an OIS.
  -      ObjectInputStream in = ObjectSerializationFactory.createObjectInputStream(bytes);
  -      assertEquals("Version header short should be '14'", 14, in.readShort());
  -   }
  -
  -   public void testVersionHeaderLegacy() throws Exception
  -   {
  -      VersionAwareMarshaller marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "1.3.0.GA");
  -      byte[] bytes = marshaller.objectToByteBuffer("Hello");
  -
  -      // expect that this has been serialized traditional serialization
  -      ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
  -
  -      try
  -      {
  -         in.readShort();
  -         fail("Version header short should not exist.");
  -      }
  -      catch (IOException e)
  -      {
  -         assertTrue("Expected an exception trying to read the version short", true);
  -      }
  -   }
   }
  
  
  
  1.3       +149 -159  JBossCache/tests/functional/org/jboss/cache/marshall/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/marshall/RegionManagerTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- RegionManagerTest.java	17 Aug 2005 06:22:15 -0000	1.2
  +++ RegionManagerTest.java	12 Oct 2006 23:03:57 -0000	1.3
  @@ -1,11 +1,10 @@
   package org.jboss.cache.marshall;
   
  -import junit.framework.Test;
   import junit.framework.TestCase;
  -import junit.framework.TestSuite;
   
   /**
  - * Test on RegionManager class.
  + * Test on MarshRegionManager class.
  + *
    * @author Ben Wang, Feb 11, 2004
    */
   public class RegionManagerTest extends TestCase
  @@ -27,12 +26,13 @@
         super.tearDown();
      }
   
  +   /*
      public void testCreateRegion() {
         String fqn1 = "/a/b/c";
         String fqn2 = "/a/b";
         String fqn3 = "/aop";
   
  -      RegionManager regionManager = new RegionManager();
  +         MarshRegionManager regionManager = new MarshRegionManager();
         try {
            regionManager.createRegion(DEFAULT_REGION, null);
            regionManager.createRegion(fqn1, null);
  @@ -43,8 +43,8 @@
            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
         }
   
  -      Region[] regions = regionManager.getRegions();
  -      assertEquals("Region size ", 4, regions.length);
  +         MarshRegion[] regions = regionManager.getRegions();
  +         assertEquals("MarshRegion size ", 4, regions.length);
      }
   
      public void testCreateRegion2() {
  @@ -52,7 +52,7 @@
         String fqn2 = "/a/b/";
         String fqn3 = "/_default_";
   
  -      RegionManager regionManager = new RegionManager();
  +         MarshRegionManager regionManager = new MarshRegionManager();
         try {
            regionManager.createRegion(fqn1, null);
            regionManager.createRegion(fqn2, null);
  @@ -62,26 +62,26 @@
            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
         }
   
  -      Region[] regions = regionManager.getRegions();
  -      assertEquals("Region size ", 3, regions.length);
  -      assertEquals("Region 0 ", "/a/b/", regions[1].getFqn());
  -      assertEquals("Region 1 ", "/a/b/c/", regions[2].getFqn());
  -      Region region = regionManager.getRegion("/a/b/c/d");
  -      assertNotNull("Region ", region);
  -      assertEquals("Region ", "/a/b/c/", region.getFqn());
  +         MarshRegion[] regions = regionManager.getRegions();
  +         assertEquals("MarshRegion size ", 3, regions.length);
  +         assertEquals("MarshRegion 0 ", "/a/b/", regions[1].getFqn());
  +         assertEquals("MarshRegion 1 ", "/a/b/c/", regions[2].getFqn());
  +         MarshRegion region = regionManager.getRegion("/a/b/c/d");
  +         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.
  -      assertNull("Region ", region);
  +         assertNull("MarshRegion ", region);
      }
   
      public void testNoDefaultRegion() {
         String fqn1 = "/a/b/c";
         String fqn2 = "/a/b/";
   
  -      RegionManager regionManager = new RegionManager();
  +         MarshRegionManager regionManager = new MarshRegionManager();
         try {
            regionManager.createRegion(fqn1, null);
            regionManager.createRegion(fqn2, null);
  @@ -90,7 +90,7 @@
            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
         }
   
  -      Region region = null;
  +         MarshRegion region = null;
         try {
            region = regionManager.getRegion("/a");
         } catch (Exception e)
  @@ -107,7 +107,7 @@
         String fqn3 = "/aop";
         String fqn4 = "/_default_";
   
  -      RegionManager regionManager = new RegionManager();
  +         MarshRegionManager regionManager = new MarshRegionManager();
         try {
            regionManager.createRegion(DEFAULT_REGION, null);
            regionManager.createRegion(fqn1, null);
  @@ -115,8 +115,8 @@
            regionManager.createRegion(fqn3, null);
            regionManager.createRegion(fqn4, null);
         } catch (RegionNameConflictException e) {
  -         Region[] regions = regionManager.getRegions();
  -         assertEquals("Region size ", 2, regions.length);
  +            MarshRegion[] regions = regionManager.getRegions();
  +            assertEquals("MarshRegion size ", 2, regions.length);
            return;
         }
         fail("testRegionConflict failed");
  @@ -127,14 +127,14 @@
         String fqn2 = "/a/b/c/";
         String fqn3 = "/a/bc";
   
  -      RegionManager regionManager = new RegionManager();
  +         MarshRegionManager regionManager = new MarshRegionManager();
         try {
            regionManager.createRegion(fqn1, null);
            regionManager.createRegion(fqn2, null);
            regionManager.createRegion(fqn3, null);
         } catch (RegionNameConflictException e) {
  -         Region[] regions = regionManager.getRegions();
  -         assertEquals("Region size ", 1, regions.length);
  +            MarshRegion[] regions = regionManager.getRegions();
  +            assertEquals("MarshRegion size ", 1, regions.length);
            return;
         }
         fail("testRegionConflict failed");
  @@ -145,7 +145,7 @@
         String fqn2 = "/a/b";
         String fqn3 = "/_default_";
   
  -      RegionManager regionManager = new RegionManager();
  +         MarshRegionManager regionManager = new MarshRegionManager();
         try {
            regionManager.createRegion(fqn1, null);
            regionManager.createRegion(fqn3, null);
  @@ -153,8 +153,8 @@
            fail("testRegionConflict3 failed " +e);
         }
   
  -      Region region = regionManager.getRegion(fqn2);
  -      assertNull("Region " , region);
  +         MarshRegion region = regionManager.getRegion(fqn2);
  +         assertNull("MarshRegion " , region);
      }
   
      public void testRemoveRegion() {
  @@ -162,7 +162,7 @@
         String fqn2 = "/a/b";
         String fqn3 = "/_default_";
   
  -      RegionManager regionManager = new RegionManager();
  +         MarshRegionManager regionManager = new MarshRegionManager();
         try {
            regionManager.createRegion(fqn1, null);
            regionManager.createRegion(fqn3, null);
  @@ -172,23 +172,13 @@
            fail("testRemoveRegion failed " +e);
         }
   
  -      Region region = regionManager.getRegion(fqn2);
  -      assertNull("Region " , region);
  +         MarshRegion region = regionManager.getRegion(fqn2);
  +         assertNull("MarshRegion " , region);
      }
   
  -   void log(String msg)
  -   {
  -      System.out.println("-- " + msg);
  -   }
  -
  -   public static Test suite()
  -   {
  -      return new TestSuite(RegionManagerTest.class);
  -   }
  -
  -   public static void main(String[] args)
  +   */
  +   public void testDummy()
      {
  -      junit.textui.TestRunner.run(suite());
  +      fail("RE-IMPLEMENT THIS TEST + IMPLEMENT MORE TESTS FOR RegionImpl!");
      }
  -
   }
  
  
  
  1.3       +2 -0      JBossCache/tests/functional/org/jboss/cache/marshall/TreeCacheMarshaller200Test.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheMarshaller200Test.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/marshall/TreeCacheMarshaller200Test.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- TreeCacheMarshaller200Test.java	5 Sep 2006 12:30:26 -0000	1.2
  +++ TreeCacheMarshaller200Test.java	12 Oct 2006 23:03:57 -0000	1.3
  @@ -6,6 +6,8 @@
    */
   package org.jboss.cache.marshall;
   
  +import org.jboss.cache.RegionManager;
  +
   public class TreeCacheMarshaller200Test extends TreeCacheMarshallerTestBase
   {
      public TreeCacheMarshaller200Test()
  
  
  
  1.3       +7 -21     JBossCache/tests/functional/org/jboss/cache/marshall/TreeCacheMarshallerTestBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheMarshallerTestBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/marshall/TreeCacheMarshallerTestBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- TreeCacheMarshallerTestBase.java	5 Sep 2006 13:12:53 -0000	1.2
  +++ TreeCacheMarshallerTestBase.java	12 Oct 2006 23:03:57 -0000	1.3
  @@ -8,9 +8,8 @@
   
   import junit.framework.TestCase;
   import org.jboss.cache.Fqn;
  +import org.jboss.cache.RegionManager;
   
  -import java.io.ByteArrayOutputStream;
  -import java.io.ObjectOutputStream;
   import java.util.ArrayList;
   import java.util.List;
   
  @@ -22,7 +21,7 @@
      protected VersionAwareMarshaller marshaller;
   
   
  -   protected void setUp()
  +   protected void setUp() throws Exception
      {
         marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, currentVersion);
      }
  @@ -84,12 +83,12 @@
         assertEquals("Only one marshaller should be in the map by this stage", 1, marshaller.marshallers.size());
   
         assertEquals(expectedMarshallerClass, marshaller.getMarshaller(currentVersionShort).getClass());
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.getMarshaller(15).getClass());
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.getMarshaller(1).getClass());
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.getMarshaller(-1).getClass());
  -      assertEquals(LegacyTreeCacheMarshaller.class, marshaller.getMarshaller(0).getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.getMarshaller(15).getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.getMarshaller(1).getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.getMarshaller(-1).getClass());
  +      assertEquals(TreeCacheMarshaller200.class, marshaller.getMarshaller(0).getClass());
   
  -      assertEquals("Two marshallers should be in the map by this stage", 2, marshaller.marshallers.size());
  +      assertEquals("One marshaller should be in the map by this stage", 1, marshaller.marshallers.size());
      }
   
      public void testStringBasedFqn() throws Exception
  @@ -231,17 +230,4 @@
         assertMethodCallsEquals(call, (MethodCall) marshaller.objectFromByteBuffer(buf));
      }
   
  -   public void testHandleLegacyStream() throws Exception
  -   {
  -      // create a 'legacy' stream.
  -      ByteArrayOutputStream bout = new ByteArrayOutputStream();
  -      ObjectOutputStream out = new ObjectOutputStream(bout);
  -
  -      out.writeObject("hello");
  -
  -      Object unmarshalled = marshaller.objectFromByteBuffer(bout.toByteArray());
  -
  -      assertEquals("hello", unmarshalled);
  -   }
  -
   }
  
  
  



More information about the jboss-cvs-commits mailing list