Author: bvahdat
Date: Sat Oct 27 19:57:07 2012
New Revision: 1402859

URL: http://svn.apache.org/viewvc?rev=1402859&view=rev
Log:
Fixed the new test "testUnmarshalMap" being broken.

Modified:
    
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
    
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java

Modified: 
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java?rev=1402859&r1=1402858&r2=1402859&view=diff
==============================================================================
--- 
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
 (original)
+++ 
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonJsonDataFormatTest.java
 Sat Oct 27 19:57:07 2012
@@ -16,11 +16,23 @@
  */
 package org.apache.camel.component.gson;
 
+import java.util.Map;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.dataformat.JsonLibrary;
 
+import org.junit.Test;
+
 public class GsonJsonDataFormatTest extends GsonMarshalTest {
 
+    @Test
+    public void testUnmarshalMap() throws Exception {
+        Map<?, ?> unmarshalled = template.requestBody("direct:json", 
"{\"pointsOfSale\":{\"pointOfSale\":{\"prodcut\":\"newpad\"}}}", Map.class);
+        Map<?, ?> map1 = (Map<?, ?>) unmarshalled.get("pointsOfSale");
+        Map<?, ?> map2 = (Map<?, ?>) map1.get("pointOfSale");
+        assertEquals("Don't get the right value", "newpad", 
map2.get("prodcut"));
+    }
+
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
@@ -31,6 +43,8 @@ public class GsonJsonDataFormatTest exte
 
                 from("direct:inPojo").marshal().json(JsonLibrary.Gson);
                 from("direct:backPojo").unmarshal().json(JsonLibrary.Gson, 
TestPojo.class).to("mock:reversePojo");
+                
+                from("direct:json").unmarshal().json(JsonLibrary.Gson, 
Map.class);
             }
         };
     }

Modified: 
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java?rev=1402859&r1=1402858&r2=1402859&view=diff
==============================================================================
--- 
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
 (original)
+++ 
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java
 Sat Oct 27 19:57:07 2012
@@ -21,7 +21,6 @@ import java.util.Map;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.model.dataformat.JsonLibrary;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -45,17 +44,6 @@ public class GsonMarshalTest extends Cam
 
         mock.assertIsSatisfied();
     }
-    
-   
-    @Test
-    @SuppressWarnings("rawtypes")
-    public void testUnmarshalMap() throws Exception {
-        Map unmarshalled = 
-            template.requestBody("direct:json", 
"{\"pointsOfSale\":{\"pointOfSale\":{\"prodcut\":\"newpad\"}}}", Map.class);
-        Map map1 = (Map)unmarshalled.get("pointsOfSale");
-        Map map2 = (Map) map1.get("pointOfSale");
-        assertEquals("Don't get the right value", "newpad", 
map2.get("prodcut"));
-    }
 
     @Test
     public void testMarshalAndUnmarshalPojo() throws Exception {
@@ -90,8 +78,6 @@ public class GsonMarshalTest extends Cam
 
                 from("direct:inPojo").marshal(formatPojo);
                 
from("direct:backPojo").unmarshal(formatPojo).to("mock:reversePojo");
-                
-                from("direct:json").unmarshal().json(JsonLibrary.Gson, 
Map.class);
             }
         };
     }


Reply via email to