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

[Manik Surtani]

  User: msurtani
  Date: 06/11/14 09:17:11

  Modified:    tests/functional/org/jboss/cache/passivation    
                        BasicPassivationTest.java
                        ConcurrentPassivationTest.java
                        ReplicatedPassivationIntegrationTest.java
                        LocalPassivationIntegrationTest.java
  Log:
  Merged eviction.Region and Region, eviction.RegionManager and RegionManager (lots of changes, now needs v. thorough testing)
  
  Revision  Changes    Path
  1.11      +2 -2      JBossCache/tests/functional/org/jboss/cache/passivation/BasicPassivationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BasicPassivationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/BasicPassivationTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- BasicPassivationTest.java	7 Nov 2006 18:34:19 -0000	1.10
  +++ BasicPassivationTest.java	14 Nov 2006 14:17:11 -0000	1.11
  @@ -19,7 +19,7 @@
   
   /**
    * @author Ben Wang
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class BasicPassivationTest extends TestCase
   {
  @@ -42,7 +42,7 @@
      {
         super.setUp();
         initCaches();
  -      wakeupIntervalMillis_ = cache_.getEvictionThreadWakeupIntervalSeconds() * 1000;
  +      wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
         log("wakeupInterval is " + wakeupIntervalMillis_);
         if (wakeupIntervalMillis_ < 0)
            fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
  
  
  
  1.5       +2 -2      JBossCache/tests/functional/org/jboss/cache/passivation/ConcurrentPassivationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConcurrentPassivationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/ConcurrentPassivationTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ConcurrentPassivationTest.java	8 Nov 2006 17:29:20 -0000	1.4
  +++ ConcurrentPassivationTest.java	14 Nov 2006 14:17:11 -0000	1.5
  @@ -20,7 +20,7 @@
    * Tests cache behavior in the presence of concurrent passivation.
    *
    * @author Brian Stansberry
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class ConcurrentPassivationTest extends TestCase
   {
  @@ -36,7 +36,7 @@
      {
         super.setUp();
         initCaches();
  -      wakeupIntervalMillis_ = cache_.getEvictionThreadWakeupIntervalSeconds() * 1000;
  +      wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
         if (wakeupIntervalMillis_ < 0)
            fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis_);
   
  
  
  
  1.3       +1 -1      JBossCache/tests/functional/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatedPassivationIntegrationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ReplicatedPassivationIntegrationTest.java	29 Sep 2006 01:16:19 -0000	1.2
  +++ ReplicatedPassivationIntegrationTest.java	14 Nov 2006 14:17:11 -0000	1.3
  @@ -66,7 +66,7 @@
         cache1_.getNotifier().addCacheListener(listener_);
         listener_.resetCounter();
   
  -      wakeupIntervalMillis_ = cache1_.getEvictionThreadWakeupIntervalSeconds() * 1000;
  +      wakeupIntervalMillis_ = cache1_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
         log("wakeupInterval is " + wakeupIntervalMillis_);
         if (wakeupIntervalMillis_ <= 0)
         {
  
  
  
  1.10      +1 -1      JBossCache/tests/functional/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocalPassivationIntegrationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- LocalPassivationIntegrationTest.java	31 Oct 2006 07:00:01 -0000	1.9
  +++ LocalPassivationIntegrationTest.java	14 Nov 2006 14:17:11 -0000	1.10
  @@ -46,7 +46,7 @@
         cache_.getNotifier().addCacheListener(listener_);
         listener_.resetCounter();
   
  -      wakeupIntervalMillis_ = cache_.getEvictionThreadWakeupIntervalSeconds() * 1000;
  +      wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
         log("wakeupInterval is " + wakeupIntervalMillis_);
         if (wakeupIntervalMillis_ <= 0)
         {