You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/18 09:12:02 UTC

svn commit: r785936 - in /camel/trunk/components/camel-xmlbeans: ./ src/test/java/org/apache/camel/converter/xmlbeans/

Author: ningjiang
Date: Thu Jun 18 07:12:01 2009
New Revision: 785936

URL: http://svn.apache.org/viewvc?rev=785936&view=rev
Log:
CAMEL-1712 Upgraded the camel-xmlbeans to JUnit4

Modified:
    camel/trunk/components/camel-xmlbeans/pom.xml
    camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalTest.java
    camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalThenMarshalTest.java
    camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java
    camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConverterTest.java

Modified: camel/trunk/components/camel-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlbeans/pom.xml?rev=785936&r1=785935&r2=785936&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlbeans/pom.xml (original)
+++ camel/trunk/components/camel-xmlbeans/pom.xml Thu Jun 18 07:12:01 2009
@@ -53,8 +53,7 @@
     <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-      <type>test-jar</type>
+      <artifactId>camel-test</artifactId>
       <scope>test</scope>
     </dependency>
 

Modified: camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalTest.java?rev=785936&r1=785935&r2=785936&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalTest.java (original)
+++ camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalTest.java Thu Jun 18 07:12:01 2009
@@ -18,17 +18,19 @@
 
 import java.util.List;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class UnmarshalTest extends ContextTestSupport {
+public class UnmarshalTest extends CamelTestSupport {
 
+    @Test
     public void testSendXmlAndUnmarshal() throws Exception {
 
         MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);

Modified: camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalThenMarshalTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalThenMarshalTest.java?rev=785936&r1=785935&r2=785936&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalThenMarshalTest.java (original)
+++ camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/UnmarshalThenMarshalTest.java Thu Jun 18 07:12:01 2009
@@ -18,15 +18,17 @@
 
 import java.util.List;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class UnmarshalThenMarshalTest extends ContextTestSupport {
+public class UnmarshalThenMarshalTest extends CamelTestSupport {
+    @Test
     public void testSendXmlAndUnmarshal() throws Exception {
 
         MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);

Modified: camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java?rev=785936&r1=785935&r2=785936&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java (original)
+++ camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java Thu Jun 18 07:12:01 2009
@@ -20,18 +20,21 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class XmlBeansConcurrencyTest extends ContextTestSupport {
+public class XmlBeansConcurrencyTest extends CamelTestSupport {
 
+    @Test
     public void testNoConcurrentProducers() throws Exception {
         doSendMessages(1, 1);
     }
 
+    @Test
     public void testConcurrentProducers() throws Exception {
         doSendMessages(10, 5);
     }

Modified: camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConverterTest.java?rev=785936&r1=785935&r2=785936&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConverterTest.java (original)
+++ camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConverterTest.java Thu Jun 18 07:12:01 2009
@@ -16,15 +16,17 @@
  */
 package org.apache.camel.converter.xmlbeans;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class XmlBeansConverterTest extends ContextTestSupport {
+public class XmlBeansConverterTest extends CamelTestSupport {
+    @Test
     public void testConvertToXmlObject() throws Exception {
         Exchange exchange = createExchangeWithBody("<hello>world!</hello>");
         Message in = exchange.getIn();