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/18 05:02:00 UTC
svn commit: r785879 - in /camel/trunk/components/camel-jackson: ./
src/test/java/org/apache/camel/component/jackson/
Author: ningjiang
Date: Thu Jun 18 03:01:59 2009
New Revision: 785879
URL: http://svn.apache.org/viewvc?rev=785879&view=rev
Log:
CAMEL-1712 Upgraded the camel-jackson to JUnit4
Modified:
camel/trunk/components/camel-jackson/pom.xml
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java
Modified: camel/trunk/components/camel-jackson/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/pom.xml?rev=785879&r1=785878&r2=785879&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/pom.xml (original)
+++ camel/trunk/components/camel-jackson/pom.xml Thu Jun 18 03:01:59 2009
@@ -49,8 +49,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-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java?rev=785879&r1=785878&r2=785879&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java (original)
+++ camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java Thu Jun 18 03:01:59 2009
@@ -20,19 +20,22 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.dataformat.JsonLibrary;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class JacksonConcurrentTest extends ContextTestSupport {
+public class JacksonConcurrentTest extends CamelTestSupport {
+ @Test
public void testNoConcurrentProducers() throws Exception {
doSendMessages(1, 1);
}
+ @Test
public void testConcurrentProducers() throws Exception {
doSendMessages(10, 5);
}
Modified: camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java?rev=785879&r1=785878&r2=785879&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java (original)
+++ camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java Thu Jun 18 03:01:59 2009
@@ -19,12 +19,14 @@
import java.util.HashMap;
import java.util.Map;
-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.junit.Test;
-public class JacksonMarshalTest extends ContextTestSupport {
+public class JacksonMarshalTest extends CamelTestSupport {
+ @Test
public void testMarshalAndUnmarshalMap() throws Exception {
Map<String, Object> in = new HashMap<String, Object>();
@@ -44,6 +46,7 @@
mock.assertIsSatisfied();
}
+ @Test
public void testMarshalAndUnmarshalPojo() throws Exception {
TestPojo in = new TestPojo();
Modified: camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java?rev=785879&r1=785878&r2=785879&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java (original)
+++ camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java Thu Jun 18 03:01:59 2009
@@ -17,7 +17,10 @@
package org.apache.camel.component.jackson;
import org.apache.camel.CamelContext;
-import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+import org.apache.camel.Service;
+import org.apache.camel.spring.SpringCamelContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version $Revision$
@@ -25,7 +28,21 @@
public class SpringJacksonJsonDataFormatTest extends JacksonJsonDataFormatTest {
protected CamelContext createCamelContext() throws Exception {
- return createSpringCamelContext(this, "org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.xml");
+ setUseRouteBuilder(false);
+
+ final AbstractXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.xml");
+ setCamelContextService(new Service() {
+ public void start() throws Exception {
+ applicationContext.start();
+
+ }
+
+ public void stop() throws Exception {
+ applicationContext.stop();
+ }
+ });
+
+ return SpringCamelContext.springCamelContext(applicationContext);
}
}