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/11 14:48:35 UTC
svn commit: r1407986 - in /camel/branches/camel-2.10.x: ./
components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/
Author: davsclaus
Date: Sun Nov 11 13:48:35 2012
New Revision: 1407986
URL: http://svn.apache.org/viewvc?rev=1407986&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:r1407985
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=1407986&r1=1407985&r2=1407986&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 Sun Nov 11 13:48:35 2012
@@ -51,8 +51,12 @@ public class JaxbDataFormatMultipleNames
assertMockEndpointsSatisfied();
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("<order:order xmlns:address=\"http://www.camel.apache.org/jaxb/example/address/1\" xmlns:order=\"http://www.camel.apache.org/jaxb/example/order/1\">"));
+ 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>"));
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=1407986&r1=1407985&r2=1407986&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 Sun Nov 11 13:48:35 2012
@@ -46,7 +46,9 @@ 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 xmlns:address=\"http://www.camel.apache.org/jaxb/example/address/1\" xmlns:order=\"http://www.camel.apache.org/jaxb/example/order/1\">"));
+ 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>"));