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/16 09:27:43 UTC

svn commit: r785100 - in /camel/trunk/components/camel-csv: pom.xml src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java

Author: ningjiang
Date: Tue Jun 16 07:27:43 2009
New Revision: 785100

URL: http://svn.apache.org/viewvc?rev=785100&view=rev
Log:
CAMEL-1712 Upgraded the camel-csv JUnit version to 4.6

Modified:
    camel/trunk/components/camel-csv/pom.xml
    camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java

Modified: camel/trunk/components/camel-csv/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/pom.xml?rev=785100&r1=785099&r2=785100&view=diff
==============================================================================
--- camel/trunk/components/camel-csv/pom.xml (original)
+++ camel/trunk/components/camel-csv/pom.xml Tue Jun 16 07:27:43 2009
@@ -57,8 +57,7 @@
     <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-      <type>test-jar</type>
+      <artifactId>camel-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java?rev=785100&r1=785099&r2=785100&view=diff
==============================================================================
--- camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java (original)
+++ camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java Tue Jun 16 07:27:43 2009
@@ -37,22 +37,24 @@
 import java.util.Map;
 
 import java.util.regex.Pattern;
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.commons.csv.writer.CSVConfig;
 import org.apache.commons.csv.writer.CSVField;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class CsvRouteTest extends ContextTestSupport {
+public class CsvRouteTest extends CamelTestSupport {
     private static final transient Log LOG = LogFactory.getLog(CsvRouteTest.class);
 
+    @Test
     public void testSendMessage() throws Exception {
         MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
         resultEndpoint.expectedMessageCount(1);
@@ -80,6 +82,7 @@
         }
     }
 
+    @Test
     public void testMultipleMessages() throws Exception {
         MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMulti",
                                                                MockEndpoint.class);
@@ -120,6 +123,7 @@
         }
     }
 
+    @Test
     public void testPresetConfig() throws Exception {
         MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMultiCustom",
                                                                MockEndpoint.class);
@@ -154,6 +158,7 @@
 
     }
 
+    @Test
     public void testUnMarshal() throws Exception {
         MockEndpoint endpoint = getMockEndpoint("mock:daltons");
         endpoint.expectedMessageCount(1);