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

[Manik Surtani]

  User: msurtani
  Date: 07/03/05 08:59:08

  Modified:    tests/functional/org/jboss/cache/loader  
                        ClusteredCacheLoaderTest.java
  Added:       tests/functional/org/jboss/cache/loader  
                        ClusteredCacheLoaderRegionBasedTest.java
  Log:
  JBCACHE-997
  
  Revision  Changes    Path
  1.14      +13 -0     JBossCache/tests/functional/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClusteredCacheLoaderTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/ClusteredCacheLoaderTest.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- ClusteredCacheLoaderTest.java	11 Jan 2007 13:49:06 -0000	1.13
  +++ ClusteredCacheLoaderTest.java	5 Mar 2007 13:59:08 -0000	1.14
  @@ -12,6 +12,7 @@
   import org.jboss.cache.CacheImpl;
   import org.jboss.cache.DefaultCacheFactory;
   import org.jboss.cache.Fqn;
  +import org.jboss.cache.Region;
   import org.jboss.cache.config.Configuration;
   
   import java.util.Map;
  @@ -30,6 +31,9 @@
      private Fqn fqn = Fqn.fromString("/a");
      private String key = "key";
   
  +   protected boolean useRegionBasedMarshalling = false;
  +
  +
      protected void setUp() throws Exception
      {
         if (cache1 != null || cache2 != null) tearDown();
  @@ -46,6 +50,15 @@
         cache1.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.ClusteredCacheLoader", "timeout=500", false, false, false));
         cache2.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.ClusteredCacheLoader", "timeout=500", false, false, false));
   
  +      cache1.getConfiguration().setUseRegionBasedMarshalling(useRegionBasedMarshalling);
  +      cache2.getConfiguration().setUseRegionBasedMarshalling(useRegionBasedMarshalling);
  +
  +      if (useRegionBasedMarshalling)
  +      {
  +         cache1.getRegionManager().getRegion(fqn, Region.Type.MARSHALLING, true).registerContextClassLoader(this.getClass().getClassLoader());
  +         cache2.getRegionManager().getRegion(fqn, Region.Type.MARSHALLING, true).registerContextClassLoader(this.getClass().getClassLoader());
  +      }
  +
         cache1.start();
         cache2.start();
   
  
  
  
  1.2       +9 -0      JBossCache/tests/functional/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClusteredCacheLoaderRegionBasedTest.java
  ===================================================================
  RCS file: ClusteredCacheLoaderRegionBasedTest.java
  diff -N ClusteredCacheLoaderRegionBasedTest.java
  --- /dev/null	1 Jan 1970 00:00:00 -0000
  +++ ClusteredCacheLoaderRegionBasedTest.java	5 Mar 2007 13:59:08 -0000	1.2
  @@ -0,0 +1,9 @@
  +package org.jboss.cache.loader;
  +
  +public class ClusteredCacheLoaderRegionBasedTest extends ClusteredCacheLoaderTest
  +{
  +   public ClusteredCacheLoaderRegionBasedTest()
  +   {
  +      useRegionBasedMarshalling = true;
  +   }
  +}