svn commit: r785137 - in /camel/trunk/components/camel-jcr: pom.xml src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java

[ni...@apache.org]

Author: ningjiang
Date: Tue Jun 16 09:55:01 2009
New Revision: 785137

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

Modified:
    camel/trunk/components/camel-jcr/pom.xml
    camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
    camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java

Modified: camel/trunk/components/camel-jcr/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/pom.xml?rev=785137&r1=785136&r2=785137&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/pom.xml (original)
+++ camel/trunk/components/camel-jcr/pom.xml Tue Jun 16 09:55:01 2009
@@ -51,8 +51,7 @@
     <!-- 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>

Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java?rev=785137&r1=785136&r2=785137&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java Tue Jun 16 09:55:01 2009
@@ -31,27 +31,33 @@
 import org.apache.jackrabbit.value.BooleanValue;
 import org.apache.jackrabbit.value.DateValue;
 import org.apache.jackrabbit.value.StringValue;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Tests for JCR type conversions ({@link JcrConverter})
  */
-public class JcrConverterTest extends TestCase {
+public class JcrConverterTest extends Assert {
 
     protected TypeConverter converter = new DefaultTypeConverter(new DefaultPackageScanClassResolver(),
             new ReflectionInjector(), new DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new DefaultClassResolver()));
 
+    @Test
     public void testBooleanValueConverter() throws Exception {
         assertJcrConverterAvailable(BooleanValue.class, Boolean.TRUE);
     }
 
+    @Test
     public void testBinaryValueConverter() throws Exception {
         assertJcrConverterAvailable(BinaryValue.class, new ByteArrayInputStream("test".getBytes()));
     }
 
+    @Test
     public void testDateValueConverter() throws Exception {
         assertJcrConverterAvailable(DateValue.class, Calendar.getInstance());
     }
 
+    @Test
     public void testStringValueConverter() throws Exception {
         assertJcrConverterAvailable(StringValue.class, "plain text");
     }

Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java?rev=785137&r1=785136&r2=785137&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java Tue Jun 16 09:55:01 2009
@@ -25,18 +25,21 @@
 import javax.jcr.SimpleCredentials;
 import javax.naming.Context;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.jackrabbit.core.TransientRepository;
 import org.apache.jackrabbit.core.fs.local.FileUtil;
+import org.junit.Before;
+import org.junit.Test;
 
-public class JcrRouteTest extends ContextTestSupport {
+public class JcrRouteTest extends CamelTestSupport {
 
     private Repository repository;
 
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         clean();
         super.setUp();
     }
@@ -51,6 +54,7 @@
         }
     }
 
+    @Test
     public void testJcrRoute() throws Exception {
         Exchange exchange = createExchangeWithBody("<hello>world!</hello>");
         Exchange out = template.send("direct:a", exchange);