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 03:50:15 UTC
svn commit: r785050 - in /camel/trunk/components/camel-cometd: pom.xml src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java

Author: ningjiang
Date: Tue Jun 16 01:50:15 2009
New Revision: 785050

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

Modified:
    camel/trunk/components/camel-cometd/pom.xml
    camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
    camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java

Modified: camel/trunk/components/camel-cometd/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/pom.xml?rev=785050&r1=785049&r2=785050&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/pom.xml (original)
+++ camel/trunk/components/camel-cometd/pom.xml Tue Jun 16 01:50:15 2009
@@ -46,6 +46,7 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
+            <version>${cometd-bayeux-version}</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
@@ -56,13 +57,13 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-            <type>test-jar</type>
+            <artifactId>camel-test</artifactId>            
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>4.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java?rev=785050&r1=785049&r2=785050&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java Tue Jun 16 01:50:15 2009
@@ -18,19 +18,22 @@
 
 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.After;
+import org.junit.Test;
 
 /**
  * Unit testing for using a CometdProducer and a CometdConsumer
  */
-public class CometdProducerConsumerTest extends ContextTestSupport {
+public class CometdProducerConsumerTest extends CamelTestSupport {
 
     private static final String URI = "cometd://0.0.0.0:8080/service/test?resourceBase=./target/test-classes/webapp&"
             + "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
 
+    @Test
     public void testProducer() throws Exception {
         Person person = new Person("David", "Greco");
         template.requestBody("direct:input", person);
@@ -44,7 +47,8 @@
     }
 
     @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         super.tearDown();
         stopCamelContext();
     }

Modified: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java?rev=785050&r1=785049&r2=785050&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java Tue Jun 16 01:50:15 2009
@@ -19,21 +19,24 @@
 import java.net.URL;
 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.After;
+import org.junit.Test;
 
 /**
  * Unit testing for using a CometdProducer and a CometdConsumer
  */
-public class SslCometdProducerConsumerTest extends ContextTestSupport {
+public class SslCometdProducerConsumerTest extends CamelTestSupport {
 
     private static final String URI = "cometds://127.0.0.1:9080/service/test?resourceBase=./target/test-classes/webapp&"
             + "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
 
     protected String pwd = "changeit";
     
+    @Test
     public void testProducer() throws Exception {
         Person person = new Person("David", "Greco");
         template.requestBody("direct:input", person);
@@ -47,7 +50,8 @@
     }
 
     @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         super.tearDown();
         stopCamelContext();
     }