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:09:27 UTC
svn commit: r785880 - in /camel/trunk/components/camel-quartz: ./
src/test/java/org/apache/camel/component/quartz/
Author: ningjiang
Date: Thu Jun 18 03:09:27 2009
New Revision: 785880
URL: http://svn.apache.org/viewvc?rev=785880&view=rev
Log:
CAMEL-1712 Upgraded the camel-quartz to JUnit4
Modified:
camel/trunk/components/camel-quartz/pom.xml
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronUsingPlusAsSpaceRouteTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
Modified: camel/trunk/components/camel-quartz/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/pom.xml?rev=785880&r1=785879&r2=785880&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/pom.xml (original)
+++ camel/trunk/components/camel-quartz/pom.xml Thu Jun 18 03:09:27 2009
@@ -62,8 +62,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-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java?rev=785880&r1=785879&r2=785880&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java Thu Jun 18 03:09:27 2009
@@ -16,15 +16,17 @@
*/
package org.apache.camel.component.quartz;
-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;
/**
* @version $Revision$
*/
-public class QuartzCronRouteTest extends ContextTestSupport {
+public class QuartzCronRouteTest extends CamelTestSupport {
+ @Test
public void testQuartzCronRoute() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(3);
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronUsingPlusAsSpaceRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronUsingPlusAsSpaceRouteTest.java?rev=785880&r1=785879&r2=785880&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronUsingPlusAsSpaceRouteTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronUsingPlusAsSpaceRouteTest.java Thu Jun 18 03:09:27 2009
@@ -16,15 +16,17 @@
*/
package org.apache.camel.component.quartz;
-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;
/**
* @version $Revision$
*/
-public class QuartzCronUsingPlusAsSpaceRouteTest extends ContextTestSupport {
+public class QuartzCronUsingPlusAsSpaceRouteTest extends CamelTestSupport {
+ @Test
public void testQuartzCronUsingPlusRoute() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(3);
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java?rev=785880&r1=785879&r2=785880&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java Thu Jun 18 03:09:27 2009
@@ -16,9 +16,10 @@
*/
package org.apache.camel.component.quartz;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.quartz.CronTrigger;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
@@ -26,8 +27,9 @@
/**
* @version $Revision$
*/
-public class QuartzEndpointConfigureTest extends ContextTestSupport {
+public class QuartzEndpointConfigureTest extends CamelTestSupport {
+ @Test
public void testConfigureGroupAndName() throws Exception {
QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myGroup/myName?trigger.repeatCount=3");
Trigger trigger = endpoint.getTrigger();
@@ -38,6 +40,7 @@
assertEquals("getRepeatCount()", 3, simpleTrigger.getRepeatCount());
}
+ @Test
public void testConfigureName() throws Exception {
QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myName");
Trigger trigger = endpoint.getTrigger();
@@ -45,6 +48,7 @@
assertEquals("getGroup()", "Camel", trigger.getGroup());
}
+ @Test
public void testConfigureCronExpression() throws Exception {
QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI");
CronTrigger trigger = assertIsInstanceOf(CronTrigger.class, endpoint.getTrigger());
@@ -53,6 +57,7 @@
assertEquals("cron expression", "0 0/5 12-18 ? * MON-FRI", trigger.getCronExpression());
}
+ @Test
public void testConfigureAnotherCronExpression() throws Exception {
QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myGroup/myTimerName?cron=0+0+*+*+*+?");
CronTrigger trigger = assertIsInstanceOf(CronTrigger.class, endpoint.getTrigger());
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointTest.java?rev=785880&r1=785879&r2=785880&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointTest.java Thu Jun 18 03:09:27 2009
@@ -17,6 +17,9 @@
package org.apache.camel.component.quartz;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.quartz.Scheduler;
import org.quartz.SimpleTrigger;
import org.quartz.impl.StdSchedulerFactory;
@@ -29,7 +32,8 @@
private Scheduler scheduler;
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
scheduler = StdSchedulerFactory.getDefaultScheduler();
scheduler.start();
super.setUp();
@@ -37,7 +41,8 @@
}
@Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
scheduler.shutdown();
}
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java?rev=785880&r1=785879&r2=785880&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java Thu Jun 18 03:09:27 2009
@@ -18,18 +18,20 @@
import java.util.List;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class QuartzRouteTest extends ContextTestSupport {
+public class QuartzRouteTest extends CamelTestSupport {
protected MockEndpoint resultEndpoint;
+ @Test
public void testQuartzRoute() throws Exception {
resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMessageCount(2);
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java?rev=785880&r1=785879&r2=785880&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java Thu Jun 18 03:09:27 2009
@@ -18,18 +18,20 @@
import java.util.List;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
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 StatefulQuartzRouteTest extends ContextTestSupport {
+public class StatefulQuartzRouteTest extends CamelTestSupport {
protected MockEndpoint resultEndpoint;
+ @Test
public void testQuartz() throws Exception {
resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMessageCount(2);