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

Manik Surtani msurtani at jboss.com
Wed Jan 17 12:21:37 EST 2007


  User: msurtani
  Date: 07/01/17 12:21:37

  Modified:    tests/functional/org/jboss/cache/marshall 
                        ActiveInactiveTest.java
  Log:
  Removed unused Marshaller methods
  
  Revision  Changes    Path
  1.14      +19 -25    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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- ActiveInactiveTest.java	11 Jan 2007 13:49:05 -0000	1.13
  +++ ActiveInactiveTest.java	17 Jan 2007 17:21:37 -0000	1.14
  @@ -50,101 +50,95 @@
      public void testDefaultActive() throws Exception
      {
         rman.setDefaultInactive(false);
  -      VersionAwareMarshaller testee = new VersionAwareMarshaller(rman, false, true, Version.getVersionString(Version.getVersionShort()));
  -      assertFalse("Root is not active", testee.isInactive("/"));
  +      assertFalse("Root is not active", rman.isInactive("/"));
   
         rman.deactivate("/a");
         assertFalse("Root is not active after inactivating subtree",
  -              testee.isInactive("/"));
  +              rman.isInactive("/"));
   
         rman.activate("/a");
         assertFalse("Root is not active after activating subtree",
  -              testee.isInactive("/"));
  +              rman.isInactive("/"));
   
         rman.activate("/a/b");
   
         rman.deactivate("/");
  -      assertTrue("Root is active", testee.isInactive("/"));
  +      assertTrue("Root is active", rman.isInactive("/"));
      }
   
      public void testDefaultInactive() throws Exception
      {
         rman.setDefaultInactive(true);
  -      VersionAwareMarshaller testee = new VersionAwareMarshaller(rman, true, true, Version.getVersionString(Version.getVersionShort()));
  -      assertTrue("Root is not inactive", testee.isInactive("/"));
  +
  +      assertTrue("Root is not inactive", rman.isInactive("/"));
   
         rman.activate("/a");
         assertTrue("Root is not inactive after activating subtree",
  -              testee.isInactive("/"));
  +              rman.isInactive("/"));
   
         rman.deactivate("/a");
         assertTrue("Root is not inactive after inactivating subtree",
  -              testee.isInactive("/"));
  +              rman.isInactive("/"));
   
         rman.deactivate("/a/b");
   
         rman.activate("/");
  -      assertFalse("Root is not active", testee.isInactive("/"));
  +      assertFalse("Root is not active", rman.isInactive("/"));
      }
   
      public void testActivate() throws Exception
      {
         rman.setDefaultInactive(false);
  -      VersionAwareMarshaller defaultActive = new VersionAwareMarshaller(rman, false, true, Version.getVersionString(Version.getVersionShort()));
  -
         rman.activate("/a");
         assertFalse("/a is not active after activating",
  -              defaultActive.isInactive("/a"));
  +              rman.isInactive("/a"));
   
         rman.deactivate("/a");
         rman.activate("/a");
         assertFalse("/a is not active after reactivating",
  -              defaultActive.isInactive("/a"));
  +              rman.isInactive("/a"));
   
         rman.reset();
         rman.setDefaultInactive(true);
  -      VersionAwareMarshaller defaultInactive = new VersionAwareMarshaller(rman, true, true, Version.getVersionString(Version.getVersionShort()));
   
         rman.activate("/i");
         assertFalse("/i is not active after activating",
  -              defaultInactive.isInactive("/i"));
  +              rman.isInactive("/i"));
         assertFalse("/i/k is not active after activating /i",
  -              defaultInactive.isInactive("/i/k"));
  +              rman.isInactive("/i/k"));
   
         rman.deactivate("/i");
         rman.activate("/i");
         assertFalse("/i is not active after reactivating",
  -              defaultInactive.isInactive("/i"));
  +              rman.isInactive("/i"));
      }
   
      public void testInactivate() throws Exception
      {
         rman.setDefaultInactive(true);
  -      VersionAwareMarshaller defaultInactive = new VersionAwareMarshaller(rman, true, true, Version.getVersionString(Version.getVersionShort()));
   
         rman.deactivate("/i");
         assertTrue("/i is not inactive after inactivating",
  -              defaultInactive.isInactive("/i"));
  +              rman.isInactive("/i"));
   
         rman.activate("/i");
         rman.deactivate("/i");
         assertTrue("/i is not inactive after re-inactivating",
  -              defaultInactive.isInactive("/i"));
  +              rman.isInactive("/i"));
   
         rman.reset();
         rman.setDefaultInactive(false);
  -      VersionAwareMarshaller defaultActive = new VersionAwareMarshaller(rman, false, true, Version.getVersionString(Version.getVersionShort()));
   
         rman.deactivate("/a");
         assertTrue("/a is not inactive after inactivating",
  -              defaultInactive.isInactive("/a"));
  +              rman.isInactive("/a"));
         assertTrue("/a/b is not inactive after inactivating /a",
  -              defaultInactive.isInactive("/a/b"));
  +              rman.isInactive("/a/b"));
   
         rman.activate("/a");
         rman.deactivate("/a");
         assertTrue("/a is not inactive after re-inactivating",
  -              defaultInactive.isInactive("/a"));
  +              rman.isInactive("/a"));
      }
   
      public void testObjectFromByteBuffer() throws Exception
  
  
  



More information about the jboss-cvs-commits mailing list