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/15 15:51:43 UTC
svn commit: r784782 - in /camel/trunk/components/camel-bam: ./
src/test/java/org/apache/camel/bam/
Author: ningjiang
Date: Mon Jun 15 13:51:43 2009
New Revision: 784782
URL: http://svn.apache.org/viewvc?rev=784782&view=rev
Log:
CAMEL-1712 upgrade the camel-bam JUnit version to 4.6
Modified:
camel/trunk/components/camel-bam/pom.xml
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java
Modified: camel/trunk/components/camel-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=784782&r1=784781&r2=784782&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/pom.xml (original)
+++ camel/trunk/components/camel-bam/pom.xml Mon Jun 15 13:51:43 2009
@@ -60,16 +60,9 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-juel</artifactId>
@@ -85,25 +78,10 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- <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-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java?rev=784782&r1=784781&r2=784782&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java (original)
+++ camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java Mon Jun 15 13:51:43 2009
@@ -20,7 +20,10 @@
import org.apache.camel.bam.model.ActivityState;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
+
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.orm.jpa.JpaTemplate;
@@ -32,10 +35,11 @@
/**
* @version $Revision$
*/
-public class BamRouteTest extends SpringTestSupport {
+public class BamRouteTest extends CamelSpringTestSupport {
protected MockEndpoint overdueEndpoint;
protected int errorTimeout = 2;
+ @Test
public void testBam() throws Exception {
overdueEndpoint.expectedMessageCount(1);
@@ -54,8 +58,8 @@
return new ClassPathXmlApplicationContext("org/apache/camel/bam/spring.xml");
}
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
overdueEndpoint = getMockEndpoint("mock:overdue");
Modified: camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java?rev=784782&r1=784781&r2=784782&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java (original)
+++ camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java Mon Jun 15 13:51:43 2009
@@ -17,6 +17,9 @@
package org.apache.camel.bam;
import java.util.concurrent.CountDownLatch;
+
+import org.junit.Before;
+import org.junit.Test;
import static org.apache.camel.language.juel.JuelExpression.el;
/**
@@ -25,6 +28,7 @@
public class MultipleActivitiesConcurrentlyTest extends MultipleProcessesTest {
@Override
+ @Test
public void testBam() throws Exception {
// TODO fixme
//overdueEndpoint.expectedMessageCount(1);
@@ -53,7 +57,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
errorTimeout = 5;
super.setUp();
Modified: camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java?rev=784782&r1=784781&r2=784782&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java (original)
+++ camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java Mon Jun 15 13:51:43 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.bam;
+import org.junit.Test;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;
@@ -24,7 +25,9 @@
* @version $Revision$
*/
public class MultipleProcessesTest extends BamRouteTest {
+
@Override
+ @Test
public void testBam() throws Exception {
// TODO fixme
//overdueEndpoint.expectedMessageCount(1);