svn commit: r936164 - in /camel/trunk/components/camel-test/src: main/java/org/apache/camel/test/junit4/TestSupport.java test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java

[da...@apache.org]

Author: davsclaus
Date: Wed Apr 21 06:07:30 2010
New Revision: 936164

URL: http://svn.apache.org/viewvc?rev=936164&view=rev
Log:
Fixed get test name on junit 4.x

Added:
    camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
      - copied, changed from r936153, camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
Modified:
    camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java

Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=936164&r1=936163&r2=936164&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java Wed Apr 21 06:07:30 2010
@@ -475,7 +475,9 @@ public abstract class TestSupport extend
      *
      * @return the method name
      */
-    public static String getTestMethodName() {
+    public String getTestMethodName() {
+        // TODO: When using latest junit we can use @Rule to remember the test name
+        // http://kentbeck.github.com/junit/javadoc/latest/org/junit/rules/TestName.html
         return "";
     }
 

Copied: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java (from r936153, camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java?p2=camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java&p1=camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java&r1=936153&r2=936164&rev=936164&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java Wed Apr 21 06:07:30 2010
@@ -21,15 +21,18 @@ import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+// END SNIPPET: example
 
 /**
  * Tests filtering using Camel Test
- * 
+ *
  * @version $Revision$
  */
 // START SNIPPET: example
-public class FilterTest extends CamelTestSupport {
+public class FilterJUnit4Test extends CamelTestSupport {
 
     @EndpointInject(uri = "mock:result")
     protected MockEndpoint resultEndpoint;
@@ -37,6 +40,7 @@ public class FilterTest extends CamelTes
     @Produce(uri = "direct:start")
     protected ProducerTemplate template;
 
+    @Test
     public void testSendMatchingMessage() throws Exception {
         String expectedBody = "<matched/>";
 
@@ -47,6 +51,7 @@ public class FilterTest extends CamelTes
         resultEndpoint.assertIsSatisfied();
     }
 
+    @Test
     public void testSendNotMatchingMessage() throws Exception {
         resultEndpoint.expectedMessageCount(0);
 
@@ -63,5 +68,4 @@ public class FilterTest extends CamelTes
             }
         };
     }
-}
-// END SNIPPET: example
+}
\ No newline at end of file