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

[Manik Surtani]

  User: msurtani
  Date: 07/01/10 15:55:25

  Modified:    tests/functional/org/jboss/cache/aop/loader   Tag:
                        Branch_JBossCache_1_4_0 BdbjeCacheLoaderTest.java
                        CacheLoaderTestsBase.java
  Log:
  Fixed broken UTs
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.1   +2 -4      JBossCache/tests/functional/org/jboss/cache/aop/loader/Attic/BdbjeCacheLoaderTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BdbjeCacheLoaderTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/loader/Attic/BdbjeCacheLoaderTest.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -b -r1.1 -r1.1.4.1
  --- BdbjeCacheLoaderTest.java	1 Mar 2006 04:15:26 -0000	1.1
  +++ BdbjeCacheLoaderTest.java	10 Jan 2007 20:55:25 -0000	1.1.4.1
  @@ -6,18 +6,16 @@
   import java.io.File;
   import java.io.FileFilter;
   
  -import org.jboss.cache.loader.*;
  -
   /**
    * Runs the same tests as {@link org.jboss.cache.loader.FileCacheLoaderTest}, but with Berkeley DB instead of a file-based CacheLoader
    * @author Bela Ban
  - * @version $Id: BdbjeCacheLoaderTest.java,v 1.1 2006/03/01 04:15:26 bwang Exp $
  + * @version $Id: BdbjeCacheLoaderTest.java,v 1.1.4.1 2007/01/10 20:55:25 msurtani Exp $
    */
   public class BdbjeCacheLoaderTest extends CacheLoaderTestsBase {
   
       private int counter = 0;
       private String tmp_location = System.getProperty("java.io.tmpdir", "c:\\tmp");
  -    private File dir = new File(tmp_location);
  +    private File dir = new File(tmp_location + File.separator + "JBossCache_AOP_BDBJECacheLoaderTest");
   
       public BdbjeCacheLoaderTest()
       {
  
  
  
  1.9.2.3   +7 -5      JBossCache/tests/functional/org/jboss/cache/aop/loader/Attic/CacheLoaderTestsBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoaderTestsBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/loader/Attic/CacheLoaderTestsBase.java,v
  retrieving revision 1.9.2.2
  retrieving revision 1.9.2.3
  diff -u -b -r1.9.2.2 -r1.9.2.3
  --- CacheLoaderTestsBase.java	2 Jan 2007 07:16:51 -0000	1.9.2.2
  +++ CacheLoaderTestsBase.java	10 Jan 2007 20:55:25 -0000	1.9.2.3
  @@ -3,25 +3,25 @@
   import junit.framework.Test;
   import junit.framework.TestSuite;
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.transaction.DummyTransactionManager;
   import org.jboss.cache.aop.PojoCache;
   import org.jboss.cache.aop.test.Person;
   import org.jboss.cache.loader.CacheLoader;
  +import org.jboss.cache.transaction.DummyTransactionManager;
   
   import javax.transaction.Transaction;
   import java.util.ArrayList;
  -import java.util.Map;
   import java.util.HashMap;
  -import java.util.List;
  -import java.util.Set;
   import java.util.HashSet;
   import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.Set;
   
   /**
    * Commons tests for all CacheLoaders. Aop version.
    *
    * @author bwang
  - * @version $Id: CacheLoaderTestsBase.java,v 1.9.2.2 2007/01/02 07:16:51 bwang Exp $
  + * @version $Id: CacheLoaderTestsBase.java,v 1.9.2.3 2007/01/10 20:55:25 msurtani Exp $
    */
   abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase {
      PojoCache cache;
  @@ -123,8 +123,10 @@
         test.setName("Ben");
         test.setAge(10);
         cache.putObject("/first/second/third", test);   // stored in cache loader
  +      assertNotNull(loader.get(Fqn.fromString("/first/second/third")));
         stopCache();
         startCache();
  +      assertNotNull(loader.get(Fqn.fromString("/first/second/third")));
         assertFalse(cache.exists("/first/second/third"));
         Person val = (Person) cache.getObject("/first/second/third"); // should be loaded from cache loader
         assertNotNull(val);