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

[ningjiang]

Author: ningjiang
Date: Thu Apr 19 09:16:58 2012
New Revision: 1327883

URL: http://svn.apache.org/viewvc?rev=1327883&view=rev
Log:
Fixed the CS errors of camel-jaxb

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/jaxb/SplitterAndExceptionRouteTwistIssueTest.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=1327883&r1=1327882&r2=1327883&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
 Thu Apr 19 09:16:58 2012
@@ -16,21 +16,16 @@
  */
 package org.apache.camel.converter.jaxb;
 
-import org.apache.camel.CamelContext;
+import javax.xml.bind.JAXBContext;
+
 import org.apache.camel.EndpointInject;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.example.Address;
 import org.apache.camel.example.Order;
-import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
 import org.junit.Test;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.stream.XMLStreamException;
-
 public class JaxbDataFormatMultipleNamespacesTest extends CamelTestSupport {
 
     @EndpointInject(uri = "mock:marshall")
@@ -69,7 +64,9 @@ public class JaxbDataFormatMultipleNames
     public void testUnarshallMultipleNamespaces() throws Exception {
         mockUnmarshall.expectedMessageCount(1);
 
-        String payload = "<?xml version=\"1.0\" encoding=\"UTF-8\" 
standalone=\"yes\"?><ns1:order 
xmlns:ns2=\"http://www.camel.apache.org/jaxb/example/address/1\"; 
xmlns:ns1=\"http://www.camel.apache.org/jaxb/example/order/1\";><ns1:id>1</ns1:id><ns2:address><ns2:street>Main
 
Street</ns2:street><ns2:streetNumber>3a</ns2:streetNumber><ns2:zip>65843</ns2:zip><ns2:city>Sulzbach</ns2:city></ns2:address></ns1:order>";
+        String payload = "<?xml version=\"1.0\" encoding=\"UTF-8\" 
standalone=\"yes\"?><ns1:order 
xmlns:ns2=\"http://www.camel.apache.org/jaxb/example/address/1\"";
+                        + " 
xmlns:ns1=\"http://www.camel.apache.org/jaxb/example/order/1\";><ns1:id>1</ns1:id><ns2:address><ns2:street>Main
 Street</ns2:street>"
+                        + 
"<ns2:streetNumber>3a</ns2:streetNumber><ns2:zip>65843</ns2:zip><ns2:city>Sulzbach</ns2:city></ns2:address></ns1:order>";
         template.sendBody("direct:unmarshall", payload);
 
         assertMockEndpointsSatisfied();

Modified: 
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java?rev=1327883&r1=1327882&r2=1327883&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
 (original)
+++ 
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
 Thu Apr 19 09:16:58 2012
@@ -51,7 +51,7 @@ public class SplitterAndExceptionRouteTw
     protected MockEndpoint mockRejectEndpoint;
 
     @EndpointInject(uri = "mock:mock_output")
-    protected MockEndpoint mock_output;
+    protected MockEndpoint mockOutput;
 
     @Test
     public void testErrorHandlingJaxb() throws Exception {
@@ -59,7 +59,7 @@ public class SplitterAndExceptionRouteTw
         String errorExample = "myerror\u0010";
 
         mockRejectEndpoint.expectedMessageCount(1);
-        mock_output.expectedMessageCount(4);
+        mockOutput.expectedMessageCount(4);
 
         templateError.sendBody(correctExample);
         templateError.sendBody(errorExample);
@@ -68,7 +68,7 @@ public class SplitterAndExceptionRouteTw
         templateError.sendBody(correctExample);
 
         mockRejectEndpoint.assertIsSatisfied();
-        mock_output.assertIsSatisfied();
+        mockOutput.assertIsSatisfied();
     }
 
     @Test
@@ -77,7 +77,7 @@ public class SplitterAndExceptionRouteTw
         String errorExample = "myerror\u0010";
 
         mockRejectEndpoint.expectedMessageCount(1);
-        mock_output.expectedMessageCount(4);
+        mockOutput.expectedMessageCount(4);
 
         templateError2.sendBody(correctExample);
         templateError2.sendBody(errorExample);
@@ -86,7 +86,7 @@ public class SplitterAndExceptionRouteTw
         templateError2.sendBody(correctExample);
 
         mockRejectEndpoint.assertIsSatisfied();
-        mock_output.assertIsSatisfied();
+        mockOutput.assertIsSatisfied();
     }
 
     @Override
@@ -123,7 +123,7 @@ public class SplitterAndExceptionRouteTw
                         }
                     })
                     .split().xpath("//twits/twit").streaming()
-                    .to(mock_output);
+                    .to(mockOutput);
 
 
                 from("direct:error2")
@@ -147,7 +147,7 @@ public class SplitterAndExceptionRouteTw
                         }
                     })
                     .split().xpath("//twits/twit").streaming()
-                    .to(mock_output);
+                    .to(mockOutput);
             }
         };
     }