svn commit: r1337265 - in /camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel: converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java example/RouteWithErrorHandlerTest.java example/package-info.java

[cm...@apache.org]

Author: cmueller
Date: Fri May 11 16:30:18 2012
New Revision: 1337265

URL: http://svn.apache.org/viewvc?rev=1337265&view=rev
Log:
added test based on user forum issue

Added:
    camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java
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/example/RouteWithErrorHandlerTest.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=1337265&r1=1337264&r2=1337265&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 Fri May 11 16:30:18 2012
@@ -33,7 +33,7 @@ public class JaxbDataFormatMultipleNames
 
     @EndpointInject(uri = "mock:unmarshall")
     private MockEndpoint mockUnmarshall;
-
+    
     @Test
     public void testMarshallMultipleNamespaces() throws Exception {
         mockMarshall.expectedMessageCount(1);
@@ -52,12 +52,15 @@ public class JaxbDataFormatMultipleNames
 
         String payload = mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
         assertTrue(payload.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"));
-        assertTrue(payload.contains("id>1</"));
-        assertTrue(payload.contains("street>Main Street</"));
-        assertTrue(payload.contains("streetNumber>3a</"));
-        assertTrue(payload.contains("zip>65843</"));
-        assertTrue(payload.contains("city>Sulzbach</"));
-        assertTrue(payload.contains("order>"));
+        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:id>1</order:id>"));
+        assertTrue(payload.contains("<address:address>"));
+        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>"));
+        assertTrue(payload.contains("</order:order>"));
     }
 
     @Test

Modified: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java?rev=1337265&r1=1337264&r2=1337265&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java (original)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java Fri May 11 16:30:18 2012
@@ -47,12 +47,12 @@ public class RouteWithErrorHandlerTest e
     public void testUnmarshalError() throws Exception {
         MockEndpoint error = getMockEndpoint("mock:error");
         error.expectedMessageCount(1);
-        error.message(0).body(String.class).contains("<foo/>");
+        error.message(0).body(String.class).contains("<foo");
         getMockEndpoint("mock:invalid").expectedMessageCount(0);
         getMockEndpoint("mock:result").expectedMessageCount(0);
 
         template.sendBody("direct:start", "<foo/>");
-
+        
         assertMockEndpointsSatisfied();
     }
 

Added: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java?rev=1337265&view=auto
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java (added)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java Fri May 11 16:30:18 2012
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@XmlSchema(
+    xmlns = { 
+        @XmlNs(prefix = "order", namespaceURI = "http://www.camel.apache.org/jaxb/example/order/1"),
+        @XmlNs(prefix = "address", namespaceURI = "http://www.camel.apache.org/jaxb/example/address/1")
+        }
+)
+package org.apache.camel.example;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlSchema;