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

[Manik Surtani]

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

  Modified:    tests/functional/org/jboss/cache/eviction  
                        OptimisticEvictionTest.java
                        ReplicatedAopLRUPolicyTest.java
  Log:
  Partially migrated to new configurators
  
  Revision  Changes    Path
  1.4       +3 -4      JBossCache/tests/functional/org/jboss/cache/eviction/OptimisticEvictionTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticEvictionTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/OptimisticEvictionTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- OptimisticEvictionTest.java	22 Jun 2006 10:43:56 -0000	1.3
  +++ OptimisticEvictionTest.java	20 Jul 2006 11:14:17 -0000	1.4
  @@ -4,14 +4,14 @@
   import org.jboss.cache.CacheException;
   import org.jboss.cache.DummyTransactionManagerLookup;
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.PropertyConfigurator;
   import org.jboss.cache.TreeCache;
  +import org.jboss.cache.factories.XmlConfigurationParser;
   import org.jboss.cache.interceptors.EvictionInterceptor;
   import org.jboss.cache.misc.TestingUtil;
   
   import javax.transaction.TransactionManager;
  -import java.util.List;
   import java.util.Iterator;
  +import java.util.List;
   
   /**
    * Tests the eviction and the possible lack of locking nodes.
  @@ -39,8 +39,7 @@
   
           txManager = new DummyTransactionManagerLookup().getTransactionManager();
           cache = new TreeCache();
  -        PropertyConfigurator config = new PropertyConfigurator();
  -        config.configure(this.cache, "META-INF/optimistic-eviction.xml");
  +        cache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/optimistic-eviction.xml")); 
           cache.startService();
       }
   
  
  
  
  1.8       +5 -6      JBossCache/tests/functional/org/jboss/cache/eviction/ReplicatedAopLRUPolicyTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatedAopLRUPolicyTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ReplicatedAopLRUPolicyTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ReplicatedAopLRUPolicyTest.java	20 Jul 2006 09:03:53 -0000	1.7
  +++ ReplicatedAopLRUPolicyTest.java	20 Jul 2006 11:14:17 -0000	1.8
  @@ -4,11 +4,11 @@
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.PropertyConfigurator;
   import org.jboss.cache.TreeCache;
  -import org.jboss.cache.misc.TestingUtil;
   import org.jboss.cache.aop.AOPInstance;
   import org.jboss.cache.aop.InternalDelegate;
  +import org.jboss.cache.factories.XmlConfigurationParser;
  +import org.jboss.cache.misc.TestingUtil;
   
   /**
    * @author Ben Wang, Feb 11, 2004
  @@ -35,8 +35,8 @@
   //      cache1_.startService();
         // cache2 doesn't have eviction policy
         cache2_ = new TreeCache();
  -      PropertyConfigurator config = new PropertyConfigurator();
  -      config.configure(cache2_, "META-INF/replSync-service.xml"); // read in generic local xml
  +      cache2_.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-service.xml"));
  +
         cache2_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
         cache2_.startService();
   
  @@ -48,8 +48,7 @@
   
      void initCaches(TreeCache cache) throws Exception
      {
  -      PropertyConfigurator config = new PropertyConfigurator();
  -      config.configure(cache, "META-INF/replSync-eviction-service.xml"); // read in generic local xml
  +      cache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-eviction-service.xml"));  
         cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
      }