You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/11/12 09:34:46 UTC

svn commit: r1408186 - in /camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb: JaxbDataFormatMultipleNamespacesTest.java JaxbDataFormatPartClassTest.java

Author: davsclaus
Date: Mon Nov 12 08:34:46 2012
New Revision: 1408186

URL: http://svn.apache.org/viewvc?rev=1408186&view=rev
Log:
Fixed test

Modified:
    camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
    camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java

Modified: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java?rev=1408186&r1=1408185&r2=1408186&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java (original)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java Mon Nov 12 08:34:46 2012
@@ -55,8 +55,6 @@ public class JaxbDataFormatMultipleNames
 
         assertTrue(payload.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"));
         assertTrue(payload.contains("<order:order"));
-        assertTrue(payload.contains("xmlns:address=\"http://www.camel.apache.org/jaxb/example/address/1\""));
-        assertTrue(payload.contains("xmlns:order=\"http://www.camel.apache.org/jaxb/example/order/1\">"));
         assertTrue(payload.contains("<order:id>1</order:id>"));
         assertTrue(payload.contains("<address:address>"));
         assertTrue(payload.contains("<address:street>Main Street</address:street>"));
@@ -65,6 +63,10 @@ public class JaxbDataFormatMultipleNames
         assertTrue(payload.contains("<address:city>Sulzbach</address:city>"));
         assertTrue(payload.contains("</address:address>"));
         assertTrue(payload.contains("</order:order>"));
+
+        // the namespaces
+        assertTrue(payload.contains("http://www.camel.apache.org/jaxb/example/address/1"));
+        assertTrue(payload.contains("http://www.camel.apache.org/jaxb/example/order/1"));
     }
 
     @Test

Modified: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java?rev=1408186&r1=1408185&r2=1408186&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java (original)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java Mon Nov 12 08:34:46 2012
@@ -45,15 +45,18 @@ public class JaxbDataFormatPartClassTest
 
         String payload = mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
         log.info(payload);
+
         assertTrue(payload.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"));
         assertTrue(payload.contains("<address:address"));
-        assertTrue(payload.contains("xmlns:address=\"http://www.camel.apache.org/jaxb/example/address/1\""));
-        assertTrue(payload.contains("xmlns:order=\"http://www.camel.apache.org/jaxb/example/order/1\">"));
         assertTrue(payload.contains("<address:street>Main Street</address:street>"));
         assertTrue(payload.contains("<address:streetNumber>3a</address:streetNumber>"));
         assertTrue(payload.contains("<address:zip>65843</address:zip>"));
         assertTrue(payload.contains("<address:city>Sulzbach</address:city>"));
         assertTrue(payload.contains("</address:address>"));
+
+        // the namespaces
+        assertTrue(payload.contains("http://www.camel.apache.org/jaxb/example/address/1"));
+        assertTrue(payload.contains("http://www.camel.apache.org/jaxb/example/order/1"));
     }
 
     @Override