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

[Manik Surtani]

  User: msurtani
  Date: 07/01/11 20:24:20

  Modified:    tests/functional/org/jboss/cache/marshall  Tag:
                        Branch_JBossCache_1_4_0 CustomCollectionTest.java
  Log:
  More marshalling tests
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +21 -20    JBossCache/tests/functional/org/jboss/cache/marshall/Attic/CustomCollectionTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CustomCollectionTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/marshall/Attic/CustomCollectionTest.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -b -r1.1.2.2 -r1.1.2.3
  --- CustomCollectionTest.java	12 Jan 2007 01:12:49 -0000	1.1.2.2
  +++ CustomCollectionTest.java	12 Jan 2007 01:24:20 -0000	1.1.2.3
  @@ -79,16 +79,15 @@
      private void doMapTest(boolean contextClassLoader) throws Exception
      {
   
  -      ClassLoader customClassloader = getClassLoader();
  -      Class mapClass = customClassloader.loadClass(myMapClass);
  +      ClassLoader customClassLoader = getClassLoader();
  +      Class mapClass = customClassLoader.loadClass(myMapClass);
         Map map = (Map) (contextClassLoader ? mapClass.newInstance() : new MyMap());
   
         map.put("k", "v");
   
         if (contextClassLoader)
         {
  -         cache1.setUseRegionBasedMarshalling(true);
  -         cache1.getRegionManager().createRegion("/a", customClassloader);
  +         enableRegionBasedClassLoading(customClassLoader);
         }
   
         cache1.put("/a", "key", map);
  @@ -110,16 +109,15 @@
      private void doSetTest(boolean contextClassLoader) throws Exception
      {
   
  -      ClassLoader customClassloader = getClassLoader();
  -      Class setClass = customClassloader.loadClass(mySetClass);
  +      ClassLoader customClassLoader = getClassLoader();
  +      Class setClass = customClassLoader.loadClass(mySetClass);
         Set set = (Set) (contextClassLoader ? setClass.newInstance() : new MySet());
   
         set.add("k");
   
         if (contextClassLoader)
         {
  -         cache1.setUseRegionBasedMarshalling(true);
  -         cache1.getRegionManager().createRegion("/a", customClassloader);
  +         enableRegionBasedClassLoading(customClassLoader);
         }
   
         cache1.put("/a", "key", set);
  @@ -141,16 +139,15 @@
      private void doListTest(boolean contextClassLoader) throws Exception
      {
   
  -      ClassLoader customClassloader = getClassLoader();
  -      Class listClass = customClassloader.loadClass(myListClass);
  +      ClassLoader customClassLoader = getClassLoader();
  +      Class listClass = customClassLoader.loadClass(myListClass);
         List list = (List) (contextClassLoader ? listClass.newInstance() : new MyList());
   
         list.add("k");
   
         if (contextClassLoader)
         {
  -         cache1.setUseRegionBasedMarshalling(true);
  -         cache1.getRegionManager().createRegion("/a", customClassloader);
  +         enableRegionBasedClassLoading(customClassLoader);
         }
   
         cache1.put("/a", "key", list);
  @@ -158,15 +155,15 @@
         assertTrue(o instanceof List);
         if (contextClassLoader)
         {
  -         assertNotSame(MyList.class, o.getClass());
            assertSame(listClass, o.getClass());
  +         assertNotSame(MyList.class, o.getClass());
         }
         else
         {
            assertSame(MyList.class, o.getClass());
            assertNotSame(listClass, o.getClass());
         }
  -      assertTrue(((Set) o).contains("k"));
  +      assertTrue(((List) o).contains("k"));
      }
   
   
  @@ -188,15 +185,19 @@
         }
      }
   
  -
  -
  -
  -   public void log(Object o)
  +   private void enableRegionBasedClassLoading(ClassLoader customClassLoader) throws Exception
      {
  -      System.out.println(o);
  +      cache1.setUseRegionBasedMarshalling(true);
  +      cache1.getRegionManager().createRegion("/a", customClassLoader);
  +      cache1.getMarshaller().defaultMarshaller.registerClassLoader("/a", customClassLoader);
  +      cache1.getMarshaller().defaultMarshaller.useRegionBasedMarshalling = true;
  +      cache2.setUseRegionBasedMarshalling(true);
  +      cache2.getRegionManager().createRegion("/a", customClassLoader);
  +      cache2.getMarshaller().defaultMarshaller.registerClassLoader("/a", customClassLoader);
  +      cache2.getMarshaller().defaultMarshaller.useRegionBasedMarshalling = true;
      }
   
  -   protected ClassLoader getClassLoader() throws Exception
  +   private ClassLoader getClassLoader() throws Exception
      {
         String[] includesClasses = { myListClass, mySetClass, myMapClass };
         String [] excludesClasses = {};