svn commit: r785884 - in /camel/trunk/components/camel-ruby: pom.xml src/test/java/org/apache/camel/ruby/RouteUsingNestedScopesTest.java src/test/java/org/apache/camel/ruby/RubyTest.java

[ni...@apache.org]

Author: ningjiang
Date: Thu Jun 18 03:29:50 2009
New Revision: 785884

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

Modified:
    camel/trunk/components/camel-ruby/pom.xml
    camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RouteUsingNestedScopesTest.java
    camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java

Modified: camel/trunk/components/camel-ruby/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/pom.xml?rev=785884&r1=785883&r2=785884&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/pom.xml (original)
+++ camel/trunk/components/camel-ruby/pom.xml Thu Jun 18 03:29:50 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-ruby/src/test/java/org/apache/camel/ruby/RouteUsingNestedScopesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RouteUsingNestedScopesTest.java?rev=785884&r1=785883&r2=785884&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RouteUsingNestedScopesTest.java (original)
+++ camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RouteUsingNestedScopesTest.java Thu Jun 18 03:29:50 2009
@@ -16,12 +16,15 @@
  */
 package org.apache.camel.ruby;
 
+import org.junit.Before;
+
 /**
  * @version $Revision$
  */
 public class RouteUsingNestedScopesTest extends RubyTest {
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         scriptName = "src/test/java/org/apache/camel/ruby/scopes.rb";
         super.setUp();
     }

Modified: camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java?rev=785884&r1=785883&r2=785884&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java (original)
+++ camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java Thu Jun 18 03:29:50 2009
@@ -19,18 +19,20 @@
 import java.util.List;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.jruby.Main;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class RubyTest extends ContextTestSupport {
+public class RubyTest extends CamelTestSupport {
     protected String expected = "<hello>world!</hello>";
     protected String scriptName = "src/test/java/org/apache/camel/ruby/example.rb";
 
+    @Test
     public void testSendMatchingMessage() throws Exception {
         MockEndpoint resultEndpoint = getMockEndpoint("mock:results");
         resultEndpoint.expectedBodiesReceived(expected);
@@ -40,6 +42,7 @@
         assertMockEndpointsSatisfied();
     }
 
+    @Test
     public void testSendNotMatchingMessage() throws Exception {
         MockEndpoint resultEndpoint = getMockEndpoint("mock:results");
         resultEndpoint.expectedMessageCount(0);