Issue 6, MultiMap deserializer fix

Moving the testcases to the right test class

Author: LokeshN

guava/src/test/java/com/fasterxml/jackson/datatype/guava/TestMultimaps.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.guava.pojo.AddOp;
 import com.fasterxml.jackson.datatype.guava.pojo.MathOp;
@@ -309,4 +310,44 @@ public void testPolymorphicValue() throws IOException {
         ImmutableMultimapWrapper output = MAPPER.readValue(json, ImmutableMultimapWrapper.class);
         assertEquals(input, output);        
     }
+    
+    public void testFromSingleValue() throws Exception
+    {
+        ObjectMapper mapper = mapperWithModule()
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        SampleMultiMapTest sampleTest = mapper.readValue("{\"map\":{\"test\":\"value\"}}",
+               new TypeReference<SampleMultiMapTest>() { });
+        
+        assertEquals(1, sampleTest.map.get("test").size());
+    }
+    
+    public void testFromMultiValueWithSingleValueOptionEnabled() throws Exception
+    {
+        ObjectMapper mapper = mapperWithModule()
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        
+        SampleMultiMapTest sampleTest = mapper.readValue("{\"map\":{\"test\":\"val\",\"test1\":[\"val1\",\"val2\"]}}",
+                new TypeReference<SampleMultiMapTest>() { });
+        
+        assertEquals(1, sampleTest.map.get("test").size());
+        assertEquals(2, sampleTest.map.get("test1").size());
+        
+    }
+    
+    public void testFromMultiValueWithNoSingleValueOptionEnabled() throws Exception
+    {
+        ObjectMapper mapper = mapperWithModule();
+        
+        SampleMultiMapTest sampleTest = mapper.readValue("{\"map\":{\"test\":[\"val\"],\"test1\":[\"val1\",\"val2\"]}}",
+                new TypeReference<SampleMultiMapTest>() { });
+        
+        assertEquals(1, sampleTest.map.get("test").size());
+        assertEquals(2, sampleTest.map.get("test1").size());
+        
+    }
+    
+    //Sample class for testing multimaps single value option
+    static class SampleMultiMapTest {
+        public HashMultimap<String, String> map;
+    }
 }

guava/src/test/java/com/fasterxml/jackson/datatype/guava/TestMultisets.java

@@ -125,44 +125,4 @@ public void testFromSingle() throws Exception
         assertEquals(1, set.size());
         assertTrue(set.contains("abc"));
     }
-    
-    public void testFromSingleValue() throws Exception
-    {
-        ObjectMapper mapper = mapperWithModule()
-            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-        SampleMultiMapTest sampleTest = mapper.readValue("{\"map\":{\"test\":\"value\"}}",
-               new TypeReference<SampleMultiMapTest>() { });
-       	
-       	assertEquals(1, sampleTest.map.get("test").size());
-    }
-    
-    public void testFromMultiValueWithSingleValueOptionEnabled() throws Exception
-    {
-        ObjectMapper mapper = mapperWithModule()
-            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-       	
-        SampleMultiMapTest sampleTest = mapper.readValue("{\"map\":{\"test\":\"val\",\"test1\":[\"val1\",\"val2\"]}}",
-                new TypeReference<SampleMultiMapTest>() { });
-       	
-       	assertEquals(1, sampleTest.map.get("test").size());
-       	assertEquals(2, sampleTest.map.get("test1").size());
-       	
-    }
-    
-    public void testFromMultiValueWithNoSingleValueOptionEnabled() throws Exception
-    {
-        ObjectMapper mapper = mapperWithModule();
-       	
-        SampleMultiMapTest sampleTest = mapper.readValue("{\"map\":{\"test\":[\"val\"],\"test1\":[\"val1\",\"val2\"]}}",
-                new TypeReference<SampleMultiMapTest>() { });
-       	
-       	assertEquals(1, sampleTest.map.get("test").size());
-       	assertEquals(2, sampleTest.map.get("test1").size());
-       	
-    }
-    
-    //Sample class for testing multimaps single value option
-    static class SampleMultiMapTest {
-        public HashMultimap<String, String> map;
-    }
 }