[jbosscache-commits] JBoss Cache SVN: r4861 - core/branches/1.4.X/tests/functional/org/jboss/cache/aop/loader.

[jbosscache-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2007-12-14 08:20:22 -0500 (Fri, 14 Dec 2007)
New Revision: 4861

Modified:
   core/branches/1.4.X/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderAopCollectionsTest.java
Log:
[PCACHE-58] Tidy up and addition of Map test. In memory Collection load test has been commented as it was only used for comparison between the in memory loaded Collection and the CacheLoader loaded Collection case.

Modified: core/branches/1.4.X/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderAopCollectionsTest.java
===================================================================
--- core/branches/1.4.X/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderAopCollectionsTest.java	2007-12-14 04:58:12 UTC (rev 4860)
+++ core/branches/1.4.X/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderAopCollectionsTest.java	2007-12-14 13:20:22 UTC (rev 4861)
@@ -15,8 +15,14 @@
 
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 
 /**
+ * Test case for testing Collection manipulation where Pojos are loaded/stored in a CacheLoader.
+ *
+ * @author ?
+ * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  */
 public class FileCacheLoaderAopCollectionsTest extends CacheLoaderTestsBase
 {
@@ -70,75 +76,116 @@
    {
    }
 
-   public void testPojoCollectionRemove() throws Exception
+   public void testPojoListLoadAndRemoveAfterRestart() throws Exception
    {
       String fqn = "/list";
 
-      Person brian = new Person(); // instantiate a Person object named joe
-      brian.setName("Brian");
+      Person brian = createPerson("Brian");
+      Person manik = createPerson("Manik");
 
-      Person manik = new Person(); // instantiate a Person object named joe
-      manik.setName("Manik");
-
-      List list = new ArrayList();
+      List<Person> list = new ArrayList<Person>();
       list.add(brian);
       list.add(manik);
 
       cache.putObject(fqn, list);
 
-      List proxyList = (List) cache.getObject(fqn);
+      List<Person> proxyList = (List<Person>) cache.getObject(fqn);
 
-      brian = (Person)proxyList.get(0);
+      brian = proxyList.get(0);
       assertEquals("Brian", brian.getName());
-      manik = (Person)proxyList.get(1);
+      manik = proxyList.get(1);
       assertEquals("Manik", manik.getName());
 
-      proxyList.remove(0);
+      stopCache();
 
-      manik = (Person)proxyList.get(0);
+      startCache();
+
+      proxyList = (List) cache.getObject(fqn);
+
+      brian = proxyList.get(0);
+      assertEquals("Brian", brian.getName());
+      manik = proxyList.get(1);
       assertEquals("Manik", manik.getName());
+
+      brian = proxyList.remove(0);
+      assertEquals("Brian", brian.getName());
+
+      manik = proxyList.get(0);
+      assertEquals("Manik", manik.getName());
    }
 
-   public void testPojoCollectionLoadAndRemoveAfterRestart() throws Exception
+   public void testPojoMapLoadAndRemoveAfterRestart() throws Exception
    {
-      String fqn = "/list";
+      String fqn = "/map";
 
-      Person brian = new Person(); // instantiate a Person object named joe
-      brian.setName("Brian");
+      Person brian = createPerson("Brian");
+      Person manik = createPerson("Manik");
 
-      Person manik = new Person(); // instantiate a Person object named joe
-      manik.setName("Manik");
+      Map<String, Person> map = new HashMap<String, Person>();
+      map.put("key-brian", brian);
+      map.put("key-manik", manik);
 
-      Person bela = new Person(); // instantiate a Person object named joe
-      bela.setName("Bela");
+      cache.putObject(fqn, map);
 
-      List list = new ArrayList();
-      list.add(brian);
-      list.add(manik);
+      Map<String, Person> proxyMap = (Map<String, Person>) cache.getObject(fqn);
 
-      cache.putObject(fqn, list);
-
-      List proxyList = (List) cache.getObject(fqn);
-
-      brian = (Person)proxyList.get(0);
+      brian = proxyMap.get("key-brian");
       assertEquals("Brian", brian.getName());
-      manik = (Person)proxyList.get(1);
+      manik = proxyMap.get("key-manik");
       assertEquals("Manik", manik.getName());
 
       stopCache();
 
       startCache();
 
-      proxyList = (List) cache.getObject(fqn);
+      proxyMap = (Map) cache.getObject(fqn);
 
-      brian = (Person)proxyList.get(0);
+      brian = proxyMap.get("key-brian");
       assertEquals("Brian", brian.getName());
-      manik = (Person)proxyList.get(1);
+      manik = proxyMap.get("key-manik");
       assertEquals("Manik", manik.getName());
 
-      proxyList.remove(0);
+      brian = proxyMap.remove("key-brian");
+      assertEquals("Brian", brian.getName());
 
-      manik = (Person)proxyList.get(0);
+      manik = (Person)proxyMap.get("key-manik");
       assertEquals("Manik", manik.getName());
    }
+
+//   /**
+//    * Test for removal of Collection element, where the Collection has been loaded with Pojos created in the test. I
+//    * used this to compare it to the newly added tests where the Collection is loaded from the CacheLoader.
+//    */
+//   public void testPojoCollectionRemove() throws Exception
+//   {
+//      String fqn = "/list";
+//
+//      Person brian = createPerson("Brian");
+//      Person manik = createPerson("Manik");
+//
+//      List<Person> list = new ArrayList<Person>();
+//      list.add(brian);
+//      list.add(manik);
+//
+//      cache.putObject(fqn, list);
+//
+//      List<Person> proxyList = (List<Person>) cache.getObject(fqn);
+//
+//      brian = proxyList.get(0);
+//      assertEquals("Brian", brian.getName());
+//      manik = proxyList.get(1);
+//      assertEquals("Manik", manik.getName());
+//
+//      proxyList.remove(0);
+//
+//      manik = proxyList.get(0);
+//      assertEquals("Manik", manik.getName());
+//   }
+
+   protected Person createPerson(String name)
+   {
+      Person p = new Person(); // instantiate a Person object named joe
+      p.setName(name);
+      return p;
+   }
 }