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 10:14:45 UTC
svn commit: r1408195 - in /camel/branches/camel-2.10.x: ./
components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/
Author: davsclaus
Date: Mon Nov 12 09:14:44 2012
New Revision: 1408195
URL: http://svn.apache.org/viewvc?rev=1408195&view=rev
Log:
Fixed test
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1408186
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java?rev=1408195&r1=1408194&r2=1408195&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java Mon Nov 12 09:14:44 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/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java?rev=1408195&r1=1408194&r2=1408195&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java Mon Nov 12 09:14:44 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