[jbosscache-commits] JBoss Cache SVN: r7374 - core/trunk/src/test/java/org/jboss/cache/util.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-01-05 11:44:21 -0500 (Mon, 05 Jan 2009)
New Revision: 7374

Added:
   core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapTest.java
Removed:
   core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapSerialTest.java
Log:
Test FCHM

Deleted: core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapSerialTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapSerialTest.java	2009-01-05 16:05:58 UTC (rev 7373)
+++ core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapSerialTest.java	2009-01-05 16:44:21 UTC (rev 7374)
@@ -1,34 +0,0 @@
-package org.jboss.cache.util;
-
-import org.testng.annotations.Test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Map;
-
- at Test(groups = "functional")
-public class FastCopyHashMapSerialTest
-{
-   public void testSerialization() throws Exception
-   {
-      Map map = new FastCopyHashMap();
-      map.put("k1", "v1");
-      map.put("k2", "v2");
-
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      ObjectOutputStream oos = new ObjectOutputStream(baos);
-      oos.writeObject(map);
-      oos.close();
-      baos.close();
-
-      ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
-      Map map2 = (Map) ois.readObject();
-      ois.close();
-
-      assert map2 instanceof FastCopyHashMap;
-      assert map2.size() == map.size();
-      for (Object key : map.keySet()) assert map2.containsKey(key);
-   }
-}

Copied: core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapTest.java (from rev 7373, core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapSerialTest.java)
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/util/FastCopyHashMapTest.java	2009-01-05 16:44:21 UTC (rev 7374)
@@ -0,0 +1,58 @@
+package org.jboss.cache.util;
+
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Map;
+
+ at Test(groups = "unit")
+public class FastCopyHashMapTest
+{
+   public void testSerialization() throws Exception
+   {
+      Map map = new FastCopyHashMap();
+      map.put("k1", "v1");
+      map.put("k2", "v2");
+
+      Map map2 = serializeAndDeserialize(map);
+
+      assert map2 instanceof FastCopyHashMap;
+      assert map2.size() == map.size();
+      for (Object key : map.keySet()) assert map2.containsKey(key);
+   }
+
+   public void testNonexistentKey() throws Exception
+   {
+      Map map = new FastCopyHashMap();
+      map.put("k1", "v1");
+      map.put("k2", "v2");
+
+      assert map.get("dont exist") == null;
+   }
+
+   public void testNonexistentKeyDeserialized() throws Exception
+   {
+      Map map = new FastCopyHashMap();
+      map.put("k1", "v1");
+      map.put("k2", "v2");
+      Map map2 = serializeAndDeserialize(map);
+      assert map2.get("dont exist") == null;
+   }
+
+   private <T> T serializeAndDeserialize(T object) throws Exception
+   {
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      ObjectOutputStream oos = new ObjectOutputStream(baos);
+      oos.writeObject(object);
+      oos.close();
+      baos.close();
+
+      ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+      Object retval = ois.readObject();
+      ois.close();
+      return (T) retval;
+   }
+}