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

[Manik Surtani]

  User: msurtani
  Date: 06/07/20 07:14:16

  Modified:    tests/functional/org/jboss/cache/aop/collection   
                        CachedListImplAopTest.java
                        CachedMapAopNullTest.java
                        ReplicatedSyncListTest.java
  Log:
  Partially migrated to new configurators
  
  Revision  Changes    Path
  1.3       +2 -3      JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedListImplAopTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CachedListImplAopTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedListImplAopTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- CachedListImplAopTest.java	9 Apr 2006 12:33:49 -0000	1.2
  +++ CachedListImplAopTest.java	20 Jul 2006 11:14:16 -0000	1.3
  @@ -6,7 +6,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.aop.PojoCache;
  -import org.jboss.cache.PropertyConfigurator;
  +import org.jboss.cache.factories.XmlConfigurationParser;
   
   //import org.jboss.test.JBossTestCase;
   
  @@ -32,8 +32,7 @@
         log.info("setUp() ....");
         String configFile = "META-INF/local-service.xml";
         cache_ = new PojoCache();
  -      PropertyConfigurator config = new PropertyConfigurator();
  -      config.configure(cache_, configFile); // read in generic replSync xml
  +      cache_.setConfiguration(new XmlConfigurationParser().parseFile(configFile));
         cache_.start();
      }
   
  
  
  
  1.3       +8 -4      JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedMapAopNullTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CachedMapAopNullTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedMapAopNullTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- CachedMapAopNullTest.java	9 Apr 2006 12:33:49 -0000	1.2
  +++ CachedMapAopNullTest.java	20 Jul 2006 11:14:16 -0000	1.3
  @@ -6,11 +6,16 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.aop.proxy.ClassProxy;
  -import org.jboss.cache.PropertyConfigurator;
   import org.jboss.cache.aop.PojoCache;
   import org.jboss.cache.aop.test.Address;
  +import org.jboss.cache.factories.XmlConfigurationParser;
   
  -import java.util.*;
  +import java.util.Collection;
  +import java.util.HashMap;
  +import java.util.HashSet;
  +import java.util.Iterator;
  +import java.util.Map;
  +import java.util.Set;
   
   //import org.jboss.test.JBossTestCase;
   
  @@ -37,8 +42,7 @@
         log.info("setUp() ....");
         String configFile = "META-INF/local-service.xml";
         cache_ = new PojoCache();
  -      PropertyConfigurator config = new PropertyConfigurator();
  -      config.configure(cache_, configFile); // read in generic replSync xml
  +      cache_.setConfiguration(new XmlConfigurationParser().parseFile(configFile));
         cache_.start();
   
         stage();
  
  
  
  1.5       +5 -4      JBossCache/tests/functional/org/jboss/cache/aop/collection/ReplicatedSyncListTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatedSyncListTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/ReplicatedSyncListTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ReplicatedSyncListTest.java	20 Jul 2006 09:03:52 -0000	1.4
  +++ ReplicatedSyncListTest.java	20 Jul 2006 11:14:16 -0000	1.5
  @@ -8,9 +8,11 @@
   import org.jboss.cache.aop.PojoCache;
   import org.jboss.cache.aop.test.Address;
   import org.jboss.cache.aop.test.Person;
  -import org.jboss.cache.PropertyConfigurator;
  +import org.jboss.cache.factories.XmlConfigurationParser;
   
  -import java.util.*;
  +import java.util.ArrayList;
  +import java.util.List;
  +import java.util.ListIterator;
   
   /**
    * Test object graph handling in aop, e.g., circular reference, multiple reference, link, etc.
  @@ -46,8 +48,7 @@
   
      private PojoCache createCache(String name) throws Exception {
         PojoCache tree=new PojoCache();
  -      PropertyConfigurator config=new PropertyConfigurator();
  -      config.configure(tree, "META-INF/replSync-service.xml"); // read in generic replAsync xml
  +        tree.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-service.xml"));
         tree.getConfiguration().setClusterName(name);
         tree.createService();
         tree.startService();