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

[Manik Surtani]

  User: msurtani
  Date: 06/08/25 10:10:10

  Modified:    tests/functional/org/jboss/cache/marshall  
                        ActiveInactiveTest.java
                        VersionAwareMarshallerTest.java
  Log:
  More work on JBCACHE-734
  
  Revision  Changes    Path
  1.7       +1 -1      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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ActiveInactiveTest.java	8 Jun 2006 01:09:19 -0000	1.6
  +++ ActiveInactiveTest.java	25 Aug 2006 14:10:10 -0000	1.7
  @@ -10,7 +10,7 @@
   import junit.framework.TestCase;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.Version;
  -import org.jgroups.blocks.MethodCall;
  +import org.jboss.cache.marshall.MethodCall;
   
   import java.lang.reflect.Method;
   
  
  
  
  1.4       +3 -3      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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- VersionAwareMarshallerTest.java	8 Jun 2006 19:09:28 -0000	1.3
  +++ VersionAwareMarshallerTest.java	25 Aug 2006 14:10:10 -0000	1.4
  @@ -9,7 +9,7 @@
   import junit.framework.TestCase;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.Version;
  -import org.jgroups.blocks.MethodCall;
  +import org.jboss.cache.marshall.MethodCall;
   
   import java.util.Arrays;
   import java.util.List;
  @@ -52,7 +52,7 @@
           MethodCall call = MethodCallFactory.create(MethodDeclarations.putKeyValMethodLocal, new Object[]{fqn, "key", "value"});
           byte[] asBytes = marshaller.objectToByteBuffer(call);
           Object o2 = marshaller.objectFromByteBuffer(asBytes);
  -        assertTrue("Unmarshalled object should be a method call", o2 instanceof JBCMethodCall);
  +        assertTrue("Unmarshalled object should be a method call", o2 instanceof MethodCall);
           MethodCall m2 = (MethodCall) o2;
           assertEquals(call.getMethod(), m2.getMethod());
           List l1 = Arrays.asList(call.getArgs());
  @@ -68,7 +68,7 @@
           MethodCall replicateCall = MethodCallFactory.create(MethodDeclarations.replicateMethod, new Object[]{call});
           byte[] asBytes = marshaller.objectToByteBuffer(replicateCall);
           Object o2 = marshaller.objectFromByteBuffer(asBytes);
  -        assertTrue("Unmarshalled object should be a method call", o2 instanceof JBCMethodCall);
  +        assertTrue("Unmarshalled object should be a method call", o2 instanceof MethodCall);
           MethodCall m2 = (MethodCall) o2;
           assertEquals(replicateCall.getMethod(), m2.getMethod());