This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit b8a29ee3c361246261934c0c065d020d02766b6a Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jul 15 15:16:17 2020 +0200 [CAMEL-11807] Upgrade camel-quartz to junit5 --- components/camel-quartz/pom.xml | 11 +++- .../camel/component/quartz/BaseQuartzTest.java | 2 +- .../quartz/DelegateEndpointQuartzTest.java | 7 +- .../quartz/QuartUnderscoreTimerNameTest.java | 2 +- .../quartz/QuartzAddDynamicRouteTest.java | 2 +- ...uartzAddRoutesAfterCamelContextStartedTest.java | 4 +- .../component/quartz/QuartzAutoStartTest.java | 6 +- ...omponentCamelContextSchedulerIsolationTest.java | 10 +-- ...tzComponentCamelContextSharedSchedulerTest.java | 19 +++--- .../component/quartz/QuartzComponentTest.java | 4 +- .../component/quartz/QuartzCronRouteTest.java | 13 ++-- .../quartz/QuartzCronRouteWithSmallCacheTest.java | 6 +- .../quartz/QuartzCronTriggerRouteTest.java | 7 +- .../quartz/QuartzCustomCalendarFireTest.java | 4 +- .../quartz/QuartzCustomCalendarNoFireTest.java | 4 +- .../quartz/QuartzEndpointConfigureTest.java | 75 ++++++++++++---------- .../component/quartz/QuartzInterruptTest.java | 2 +- .../quartz/QuartzJobRouteUnderscoreTest.java | 5 +- .../component/quartz/QuartzManagementTest.java | 11 ++-- .../quartz/QuartzManuallyTriggerJobTest.java | 2 +- .../component/quartz/QuartzNameCollisionTest.java | 22 ++++--- .../quartz/QuartzOneCamelContextRestartTest.java | 10 +-- .../QuartzOneCamelContextSuspendResumeTest.java | 10 +-- .../component/quartz/QuartzPropertiesTest.java | 9 ++- .../component/quartz/QuartzRepeatIntervalTest.java | 2 +- .../quartz/QuartzRouteFireNowOnlyOnceTest.java | 2 +- .../component/quartz/QuartzRouteFireNowTest.java | 2 +- .../component/quartz/QuartzRouteRestartTest.java | 2 +- .../camel/component/quartz/QuartzRouteTest.java | 2 +- .../component/quartz/QuartzSimpleRouteTest.java | 15 +++-- .../quartz/QuartzStartDelayedOptionTest.java | 2 +- .../component/quartz/QuartzStartDelayedTest.java | 2 +- .../quartz/QuartzStatefulJobRouteTest.java | 9 +-- .../component/quartz/QuartzStopRouteTest.java | 6 +- .../component/quartz/QuartzSuspendRouteTest.java | 6 +- .../quartz/QuartzTriggerParametersTest.java | 2 +- .../quartz/QuartzTwoCamelContextRestartTest.java | 10 +-- .../QuartzTwoCamelContextSameNameClashTest.java | 15 +++-- .../QuartzTwoCamelContextSuspendResumeTest.java | 10 +-- .../quartz/QuartzTwoCamelContextTest.java | 13 ++-- ...QuartzConsumerTwoAppsClusteredFailoverTest.java | 9 ++- ...QuartzConsumerTwoAppsClusteredRecoveryTest.java | 9 ++- .../quartz/SpringQuartzCronRouteTest.java | 4 +- ...PersistentStoreRestartAppChangeOptionsTest.java | 27 +++++--- .../SpringQuartzPersistentStoreRestartAppTest.java | 11 +++- ...pringQuartzPersistentStoreRestartRouteTest.java | 11 ++-- .../quartz/SpringQuartzPersistentStoreTest.java | 4 +- .../component/quartz/StatefulQuartzRouteTest.java | 7 +- .../quartz/cron/QuartzCronMappingTest.java | 5 +- .../component/quartz/cron/QuartzCronRouteTest.java | 2 +- .../FileConsumerQuartzSchedulerRestartTest.java | 10 +-- .../quartz/FileConsumerQuartzSchedulerTest.java | 10 +-- .../quartz/CronScheduledRoutePolicyTest.java | 12 ++-- .../quartz/MultiplePoliciesOnRouteTest.java | 6 +- .../RouteAutoStopFalseCronScheduledPolicyTest.java | 4 +- .../SimpleScheduledCombinedRoutePolicyTest.java | 6 +- .../quartz/SimpleScheduledRoutePolicyTest.java | 7 +- .../quartz/SpringCronScheduledRoutePolicyTest.java | 6 +- .../quartz/SpringMultiplePoliciesOnRouteTest.java | 4 +- .../SpringQuartzTwoAppsClusteredFailoverTest.java | 9 ++- .../quartz/SpringScheduledRoutePolicyTest.java | 5 +- .../SpringSimpleScheduledRoutePolicyTest.java | 6 +- 62 files changed, 308 insertions(+), 213 deletions(-) diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml index 2423e70..ae73fbf 100644 --- a/components/camel-quartz/pom.xml +++ b/components/camel-quartz/pom.xml @@ -60,8 +60,13 @@ <!-- test dependencies --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> @@ -71,7 +76,7 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java index 07680e6..6468405 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/BaseQuartzTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; public class BaseQuartzTest extends CamelTestSupport { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java index 8815b5f..c8974b0 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/DelegateEndpointQuartzTest.java @@ -28,11 +28,14 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.URISupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.JobDetail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class DelegateEndpointQuartzTest extends CamelTestSupport { @Test diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java index b4b63b2..4519748 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartUnderscoreTimerNameTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartUnderscoreTimerNameTest extends BaseQuartzTest { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddDynamicRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddDynamicRouteTest.java index 916860f..1ad7d74 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddDynamicRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddDynamicRouteTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzAddDynamicRouteTest extends BaseQuartzTest { protected MockEndpoint resultEndpoint; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddRoutesAfterCamelContextStartedTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddRoutesAfterCamelContextStartedTest.java index 2a0ac48..fc167af 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddRoutesAfterCamelContextStartedTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAddRoutesAfterCamelContextStartedTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class QuartzAddRoutesAfterCamelContextStartedTest extends BaseQuartzTest { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java index 79fb532..f29625a 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; public class QuartzAutoStartTest extends BaseQuartzTest { @@ -28,7 +30,7 @@ public class QuartzAutoStartTest extends BaseQuartzTest { mock.expectedMessageCount(0); QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class); - assertFalse("Should not have started scheduler", quartz.getScheduler().isStarted()); + assertFalse(quartz.getScheduler().isStarted(), "Should not have started scheduler"); Thread.sleep(2000); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSchedulerIsolationTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSchedulerIsolationTest.java index 42b60dd..e3ebc5b 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSchedulerIsolationTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSchedulerIsolationTest.java @@ -19,17 +19,17 @@ package org.apache.camel.component.quartz; import org.apache.camel.CamelContext; import org.apache.camel.api.management.JmxSystemPropertyKeys; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.quartz.Scheduler; import org.quartz.SchedulerException; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; public class QuartzComponentCamelContextSchedulerIsolationTest { - @AfterClass + @AfterAll public static void afterTests() { System.clearProperty(JmxSystemPropertyKeys.DISABLED); } diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSharedSchedulerTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSharedSchedulerTest.java index 2a4dd99..99d48a7 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSharedSchedulerTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentCamelContextSharedSchedulerTest.java @@ -19,20 +19,21 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.hamcrest.CoreMatchers; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.quartz.JobDetail; import org.quartz.Scheduler; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + public class QuartzComponentCamelContextSharedSchedulerTest { private DefaultCamelContext camel1; private DefaultCamelContext camel2; - @Before + @BeforeEach public void setUp() throws Exception { camel1 = new DefaultCamelContext(); camel1.setName("camel-1"); @@ -61,7 +62,7 @@ public class QuartzComponentCamelContextSharedSchedulerTest { camel2.start(); } - @After + @AfterEach public void tearDown() throws Exception { camel1.stop(); camel2.stop(); @@ -77,14 +78,14 @@ public class QuartzComponentCamelContextSharedSchedulerTest { mock1.assertIsSatisfied(); JobDetail detail = mock1.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class); - Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION).equals("0/2 * * * * ?"), CoreMatchers.is(true)); + assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION).equals("0/2 * * * * ?"), is(true)); camel1.stop(); mock2.assertIsSatisfied(); detail = mock2.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class); - Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION).equals("0/1 * * * * ?"), CoreMatchers.is(true)); + assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION).equals("0/1 * * * * ?"), is(true)); camel2.stop(); } diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java index 6b662cc..88443a4 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentTest.java @@ -16,11 +16,13 @@ */ package org.apache.camel.component.quartz; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.Scheduler; import org.quartz.SchedulerFactory; import org.quartz.impl.StdSchedulerFactory; +import static org.junit.jupiter.api.Assertions.assertSame; + public class QuartzComponentTest extends BaseQuartzTest { @Test diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java index e71ce9d..4c11c1f 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteTest.java @@ -19,12 +19,13 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.hamcrest.CoreMatchers; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.CronTrigger; import org.quartz.JobDetail; import org.quartz.Trigger; +import static org.hamcrest.MatcherAssert.assertThat; + /** * This test the CronTrigger as a timer endpoint in a route. */ @@ -38,13 +39,13 @@ public class QuartzCronRouteTest extends BaseQuartzTest { assertMockEndpointsSatisfied(); Trigger trigger = mock.getReceivedExchanges().get(0).getIn().getHeader("trigger", Trigger.class); - Assert.assertThat(trigger instanceof CronTrigger, CoreMatchers.is(true)); + assertThat(trigger instanceof CronTrigger, CoreMatchers.is(true)); JobDetail detail = mock.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class); - Assert.assertThat(detail.getJobClass().equals(CamelJob.class), CoreMatchers.is(true)); + assertThat(detail.getJobClass().equals(CamelJob.class), CoreMatchers.is(true)); - Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_TYPE).equals("cron"), CoreMatchers.is(true)); - Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION).equals("0/1 * * * * ?"), CoreMatchers.is(true)); + assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_TYPE).equals("cron"), CoreMatchers.is(true)); + assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION).equals("0/1 * * * * ?"), CoreMatchers.is(true)); } @Override diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java index e31794d..3f57639 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithSmallCacheTest.java @@ -23,7 +23,9 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Endpoints are stored in a LRU list with a default capacity of 1000. If the list is full, @@ -39,7 +41,7 @@ public class QuartzCronRouteWithSmallCacheTest extends BaseQuartzTest { public void testQuartzCronRouteWithSmallCache() throws Exception { boolean wait = latch.await(10, TimeUnit.SECONDS); assertTrue(wait); - assertTrue("Quartz should trigger at least 3 times", latch.getCount() <= 0); + assertTrue(latch.getCount() <= 0, "Quartz should trigger at least 3 times"); } @Override diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java index 87d20ba..5b2c9fb 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronTriggerRouteTest.java @@ -18,10 +18,13 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.quartz.JobDetail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class QuartzCronTriggerRouteTest extends CamelTestSupport { @Test diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarFireTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarFireTest.java index 1d0fd35..c691fb9 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarFireTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarFireTest.java @@ -21,11 +21,13 @@ import java.util.Date; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.Calendar; import org.quartz.Scheduler; import org.quartz.impl.calendar.HolidayCalendar; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * This test a timer endpoint in a route with Custom calendar. */ diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarNoFireTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarNoFireTest.java index e3d39b7..8a97836 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarNoFireTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCustomCalendarNoFireTest.java @@ -21,11 +21,13 @@ import java.util.Date; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.Calendar; import org.quartz.Scheduler; import org.quartz.impl.calendar.HolidayCalendar; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * This test a timer endpoint in a route with Custom calendar. */ diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java index eb8b1ed..2d859ec 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointConfigureTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.Endpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.CronTrigger; import org.quartz.JobDetail; import org.quartz.JobKey; @@ -26,6 +26,11 @@ import org.quartz.SimpleTrigger; import org.quartz.Trigger; import org.quartz.TriggerKey; +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class QuartzEndpointConfigureTest extends BaseQuartzTest { @Test @@ -37,13 +42,13 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest { Trigger trigger = scheduler.getTrigger(triggerKey); JobDetail jobDetail = scheduler.getJobDetail(JobKey.jobKey(triggerKey.getName(), triggerKey.getGroup())); - assertEquals("getName()", "myName", triggerKey.getName()); - assertEquals("getGroup()", "myGroup", triggerKey.getGroup()); - assertEquals("getJobName", "myName", jobDetail.getKey().getName()); - assertEquals("getJobGroup", "myGroup", jobDetail.getKey().getGroup()); + assertEquals("myName", triggerKey.getName(), "getName()"); + assertEquals("myGroup", triggerKey.getGroup(), "getGroup()"); + assertEquals("myName", jobDetail.getKey().getName(), "getJobName"); + assertEquals("myGroup", jobDetail.getKey().getGroup(), "getJobGroup"); SimpleTrigger simpleTrigger = assertIsInstanceOf(SimpleTrigger.class, trigger); - assertEquals("getRepeatCount()", 3, simpleTrigger.getRepeatCount()); + assertEquals(3, simpleTrigger.getRepeatCount(), "getRepeatCount()"); } @Test @@ -54,10 +59,10 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest { TriggerKey triggerKey = endpoint.getTriggerKey(); JobDetail jobDetail = scheduler.getJobDetail(JobKey.jobKey(triggerKey.getName(), triggerKey.getGroup())); - assertEquals("getName()", "myName", triggerKey.getName()); - assertEquals("getGroup()", "Camel_" + context.getManagementName(), triggerKey.getGroup()); - assertEquals("getJobName", "myName", jobDetail.getKey().getName()); - assertEquals("getJobGroup", "Camel_" + context.getManagementName(), jobDetail.getKey().getGroup()); + assertEquals("myName", triggerKey.getName(), "getName()"); + assertEquals("Camel_" + context.getManagementName(), triggerKey.getGroup(), "getGroup()"); + assertEquals("myName", jobDetail.getKey().getName(), "getJobName"); + assertEquals("Camel_" + context.getManagementName(), jobDetail.getKey().getGroup(), "getJobGroup"); } @Test @@ -69,14 +74,14 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest { Trigger trigger = scheduler.getTrigger(triggerKey); JobDetail jobDetail = scheduler.getJobDetail(JobKey.jobKey(triggerKey.getName(), triggerKey.getGroup())); - assertEquals("getName()", "myTimerName", triggerKey.getName()); - assertEquals("getGroup()", "myGroup", triggerKey.getGroup()); - assertEquals("getJobName", "myTimerName", jobDetail.getKey().getName()); - assertEquals("getJobGroup", "myGroup", jobDetail.getKey().getGroup()); + assertEquals("myTimerName", triggerKey.getName(), "getName()"); + assertEquals("myGroup", triggerKey.getGroup(), "getGroup()"); + assertEquals("myTimerName", jobDetail.getKey().getName(), "getJobName"); + assertEquals("myGroup", jobDetail.getKey().getGroup(), "getJobGroup"); assertIsInstanceOf(CronTrigger.class, trigger); CronTrigger cronTrigger = (CronTrigger)trigger; - assertEquals("cron expression", "0 0/5 12-18 ? * MON-FRI", cronTrigger.getCronExpression()); + assertEquals("0 0/5 12-18 ? * MON-FRI", cronTrigger.getCronExpression(), "cron expression"); } @Test @@ -88,14 +93,14 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest { Trigger trigger = scheduler.getTrigger(triggerKey); JobDetail jobDetail = scheduler.getJobDetail(JobKey.jobKey(triggerKey.getName(), triggerKey.getGroup())); - assertEquals("getName()", "myTimerName", triggerKey.getName()); - assertEquals("getGroup()", "myGroup", triggerKey.getGroup()); - assertEquals("getJobName", "myTimerName", jobDetail.getKey().getName()); - assertEquals("getJobGroup", "myGroup", jobDetail.getKey().getGroup()); + assertEquals("myTimerName", triggerKey.getName(), "getName()"); + assertEquals("myGroup", triggerKey.getGroup(), "getGroup()"); + assertEquals("myTimerName", jobDetail.getKey().getName(), "getJobName"); + assertEquals("myGroup", jobDetail.getKey().getGroup(), "getJobGroup"); assertIsInstanceOf(CronTrigger.class, trigger); CronTrigger cronTrigger = (CronTrigger)trigger; - assertEquals("cron expression", "0 0 * * * ?", cronTrigger.getCronExpression()); + assertEquals("0 0 * * * ?", cronTrigger.getCronExpression(), "cron expression"); } @Test @@ -107,10 +112,10 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest { Trigger trigger = scheduler.getTrigger(triggerKey); JobDetail jobDetail = scheduler.getJobDetail(JobKey.jobKey("hadrian", triggerKey.getGroup())); - assertEquals("getName()", "myTimerName", triggerKey.getName()); - assertEquals("getGroup()", "myGroup", triggerKey.getGroup()); - assertEquals("getJobName", "hadrian", jobDetail.getKey().getName()); - assertEquals("getJobGroup", "myGroup", jobDetail.getKey().getGroup()); + assertEquals("myTimerName", triggerKey.getName(), "getName()"); + assertEquals("myGroup", triggerKey.getGroup(), "getGroup()"); + assertEquals("hadrian", jobDetail.getKey().getName(), "getJobName"); + assertEquals("myGroup", jobDetail.getKey().getGroup(), "getJobGroup"); assertIsInstanceOf(CronTrigger.class, trigger); } @@ -120,8 +125,8 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest { QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz:myGroup/myTimerName"); TriggerKey triggerKey = endpoint.getTriggerKey(); - assertEquals("getName()", "myTimerName", triggerKey.getName()); - assertEquals("getGroup()", "myGroup", triggerKey.getGroup()); + assertEquals("myTimerName", triggerKey.getName(), "getName()"); + assertEquals("myGroup", triggerKey.getGroup(), "getGroup()"); } @Test @@ -133,25 +138,25 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest { Trigger trigger = scheduler.getTrigger(triggerKey); JobDetail jobDetail = scheduler.getJobDetail(JobKey.jobKey(triggerKey.getName(), triggerKey.getGroup())); - assertEquals("getName()", "myTimerName", triggerKey.getName()); - assertEquals("getGroup()", "myGroup", triggerKey.getGroup()); - assertEquals("getJobName", "myTimerName", jobDetail.getKey().getName()); - assertEquals("getJobGroup", "myGroup", jobDetail.getKey().getGroup()); + assertEquals("myTimerName", triggerKey.getName(), "getName()"); + assertEquals("myGroup", triggerKey.getGroup(), "getGroup()"); + assertEquals("myTimerName", jobDetail.getKey().getName(), "getJobName"); + assertEquals("myGroup", jobDetail.getKey().getGroup(), "getJobGroup"); assertIsInstanceOf(CronTrigger.class, trigger); CronTrigger cronTrigger = (CronTrigger)trigger; - assertEquals("cron expression", "0 0 * * * ?", cronTrigger.getCronExpression()); + assertEquals("0 0 * * * ?", cronTrigger.getCronExpression(), "cron expression"); } @Test public void testConfigureDeleteJob() throws Exception { QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?"); - assertEquals("cron expression", "0 0 * * * ?", endpoint.getCron()); - assertEquals("deleteJob", true, endpoint.isDeleteJob()); + assertEquals("0 0 * * * ?", endpoint.getCron(), "cron expression"); + assertTrue(endpoint.isDeleteJob(), "deleteJob"); endpoint = resolveMandatoryEndpoint("quartz:myGroup/myTimerName2?cron=1+0+*+*+*+?&deleteJob=false"); - assertEquals("cron expression", "1 0 * * * ?", endpoint.getCron()); - assertEquals("deleteJob", false, endpoint.isDeleteJob()); + assertEquals("1 0 * * * ?", endpoint.getCron(), "cron expression"); + assertFalse(endpoint.isDeleteJob(), "deleteJob"); } @Override diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzInterruptTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzInterruptTest.java index 9ba5f3b..a68c5e8 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzInterruptTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzInterruptTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzInterruptTest extends BaseQuartzTest { protected MockEndpoint resultEndpoint; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java index 5630397..e35aeef 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzJobRouteUnderscoreTest.java @@ -18,9 +18,12 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.JobDetail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class QuartzJobRouteUnderscoreTest extends BaseQuartzTest { @Test diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java index feb79b4..b23c8e1 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManagementTest.java @@ -20,7 +20,12 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.isPlatform; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class QuartzManagementTest extends BaseQuartzTest { @@ -31,9 +36,7 @@ public class QuartzManagementTest extends BaseQuartzTest { @Test public void testQuartzRoute() throws Exception { // JMX tests dont work well on AIX CI servers (hangs them) - if (isPlatform("aix")) { - return; - } + assumeFalse(isPlatform("aix")); getMockEndpoint("mock:result").expectedMessageCount(2); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManuallyTriggerJobTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManuallyTriggerJobTest.java index 3bef831..8cbd7b2 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManuallyTriggerJobTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzManuallyTriggerJobTest.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.JobDataMap; import org.quartz.JobKey; import org.quartz.Scheduler; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzNameCollisionTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzNameCollisionTest.java index d9aa0ea..1f101db 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzNameCollisionTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzNameCollisionTest.java @@ -19,13 +19,17 @@ package org.apache.camel.component.quartz; import org.apache.camel.FailedToCreateRouteException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.quartz.Scheduler; import org.quartz.Trigger; import org.quartz.TriggerKey; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + /** * Check for duplicate name/group collision. */ @@ -52,10 +56,10 @@ public class QuartzNameCollisionTest { from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("log:two", "mock:two"); } }); - Assert.fail("Should have thrown an exception"); + fail("Should have thrown an exception"); } catch (FailedToCreateRouteException e) { String reason = e.getMessage(); - Assert.assertEquals(reason.indexOf("Trigger key myGroup.myTimerName is already in use") >= 0, true); + assertTrue(reason.contains("Trigger key myGroup.myTimerName is already in use")); } } @@ -165,16 +169,16 @@ public class QuartzNameCollisionTest { Scheduler scheduler = component.getScheduler(); TriggerKey triggerKey = TriggerKey.triggerKey("myTimerName", "myGroup"); Trigger trigger = scheduler.getTrigger(triggerKey); - Assert.assertNotNull(trigger); + assertNotNull(trigger); camel1.getRouteController().stopRoute("route-1"); Trigger.TriggerState triggerState = component.getScheduler().getTriggerState(triggerKey); - Assert.assertNotNull(trigger); - Assert.assertEquals(Trigger.TriggerState.PAUSED, triggerState); + assertNotNull(trigger); + assertEquals(Trigger.TriggerState.PAUSED, triggerState); } - @After + @AfterEach public void cleanUp() throws Exception { if (camel1 != null) { camel1.stop(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java index d842ba8..225d421 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java @@ -19,15 +19,15 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class QuartzOneCamelContextRestartTest { private DefaultCamelContext camel1; - @Before + @BeforeEach public void setUp() throws Exception { camel1 = new DefaultCamelContext(); camel1.setName("camel-1"); @@ -40,7 +40,7 @@ public class QuartzOneCamelContextRestartTest { camel1.start(); } - @After + @AfterEach public void tearDown() throws Exception { camel1.stop(); } diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextSuspendResumeTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextSuspendResumeTest.java index 27ff9cd..d3c24c8 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextSuspendResumeTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextSuspendResumeTest.java @@ -19,15 +19,15 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class QuartzOneCamelContextSuspendResumeTest { private DefaultCamelContext camel1; - @Before + @BeforeEach public void setUp() throws Exception { camel1 = new DefaultCamelContext(); camel1.setName("camel-1"); @@ -40,7 +40,7 @@ public class QuartzOneCamelContextSuspendResumeTest { camel1.start(); } - @After + @AfterEach public void tearDown() throws Exception { camel1.stop(); } diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java index cbe802a..7fd739f 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java @@ -19,8 +19,11 @@ package org.apache.camel.component.quartz; import java.io.InputStream; import java.util.Properties; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class QuartzPropertiesTest extends BaseQuartzTest { @@ -32,7 +35,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest { } @Override - @After + @AfterEach public void tearDown() throws Exception { quartz.stop(); super.tearDown(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRepeatIntervalTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRepeatIntervalTest.java index 7707f5c..b8ad60b 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRepeatIntervalTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRepeatIntervalTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzRepeatIntervalTest extends BaseQuartzTest { protected MockEndpoint resultEndpoint; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowOnlyOnceTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowOnlyOnceTest.java index 8ec6df2..d901937 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowOnlyOnceTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowOnlyOnceTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzRouteFireNowOnlyOnceTest extends BaseQuartzTest { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowTest.java index 031f0f4..98236e9 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteFireNowTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzRouteFireNowTest extends BaseQuartzTest { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java index a71a8cf..060b607 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzRouteRestartTest extends BaseQuartzTest { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java index 9c12141..cdd0160 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzRouteTest extends BaseQuartzTest { protected MockEndpoint resultEndpoint; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSimpleRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSimpleRouteTest.java index 8a6017f..b6fbaf3 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSimpleRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSimpleRouteTest.java @@ -19,12 +19,13 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.hamcrest.CoreMatchers; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.JobDetail; import org.quartz.SimpleTrigger; import org.quartz.Trigger; +import static org.hamcrest.MatcherAssert.assertThat; + /** * This not only set SimpleTrigger as a timer endpoint in a route, and also test the trigger.XXX properties setter. */ @@ -37,14 +38,14 @@ public class QuartzSimpleRouteTest extends BaseQuartzTest { assertMockEndpointsSatisfied(); Trigger trigger = mock.getReceivedExchanges().get(0).getIn().getHeader("trigger", Trigger.class); - Assert.assertThat(trigger instanceof SimpleTrigger, CoreMatchers.is(true)); + assertThat(trigger instanceof SimpleTrigger, CoreMatchers.is(true)); JobDetail detail = mock.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class); - Assert.assertThat(detail.getJobClass().equals(CamelJob.class), CoreMatchers.is(true)); + assertThat(detail.getJobClass().equals(CamelJob.class), CoreMatchers.is(true)); - Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_TYPE).equals("simple"), CoreMatchers.is(true)); - Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_SIMPLE_REPEAT_COUNTER).equals(-1), CoreMatchers.is(true)); - Assert.assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_SIMPLE_REPEAT_INTERVAL).equals(2000L), CoreMatchers.is(true)); + assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_TYPE).equals("simple"), CoreMatchers.is(true)); + assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_SIMPLE_REPEAT_COUNTER).equals(-1), CoreMatchers.is(true)); + assertThat(detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_SIMPLE_REPEAT_INTERVAL).equals(2000L), CoreMatchers.is(true)); } @Override diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java index ffa9937..f8a89f8 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzStartDelayedOptionTest extends BaseQuartzTest { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java index 750aa6d..31f3ac9 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzStartDelayedTest extends BaseQuartzTest { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStatefulJobRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStatefulJobRouteTest.java index 21ec377..bf3206f 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStatefulJobRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStatefulJobRouteTest.java @@ -19,12 +19,13 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.hamcrest.CoreMatchers; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.CronTrigger; import org.quartz.JobDetail; import org.quartz.Trigger; +import static org.hamcrest.MatcherAssert.assertThat; + /** * This test the CronTrigger as a timer endpoint in a route. */ @@ -38,10 +39,10 @@ public class QuartzStatefulJobRouteTest extends BaseQuartzTest { assertMockEndpointsSatisfied(); Trigger trigger = mock.getReceivedExchanges().get(0).getIn().getHeader("trigger", Trigger.class); - Assert.assertThat(trigger instanceof CronTrigger, CoreMatchers.is(true)); + assertThat(trigger instanceof CronTrigger, CoreMatchers.is(true)); JobDetail detail = mock.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class); - Assert.assertThat(detail.getJobClass().equals(StatefulCamelJob.class), CoreMatchers.is(true)); + assertThat(detail.getJobClass().equals(StatefulCamelJob.class), CoreMatchers.is(true)); } @Override diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java index ef7a265..f769c5c 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStopRouteTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class QuartzStopRouteTest extends BaseQuartzTest { @@ -38,7 +40,7 @@ public class QuartzStopRouteTest extends BaseQuartzTest { mock.expectedMessageCount(0); mock.assertIsSatisfied(3000); - assertEquals("Should not schedule when stopped", size, size); + assertEquals(size, size, "Should not schedule when stopped"); resetMocks(); mock.expectedMinimumMessageCount(1); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java index 49043f8..e87fc28 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzSuspendRouteTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class QuartzSuspendRouteTest extends BaseQuartzTest { @@ -38,7 +40,7 @@ public class QuartzSuspendRouteTest extends BaseQuartzTest { mock.expectedMessageCount(0); mock.assertIsSatisfied(3000); - assertEquals("Should not schedule when suspended", size, size); + assertEquals(size, size, "Should not schedule when suspended"); resetMocks(); mock.expectedMinimumMessageCount(1); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTriggerParametersTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTriggerParametersTest.java index 9d474c1..4d18fce 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTriggerParametersTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTriggerParametersTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzTriggerParametersTest extends BaseQuartzTest { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java index df4264f..58318d7 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java @@ -19,16 +19,16 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class QuartzTwoCamelContextRestartTest { private DefaultCamelContext camel1; private DefaultCamelContext camel2; - @Before + @BeforeEach public void setUp() throws Exception { camel1 = new DefaultCamelContext(); camel1.setName("camel-1"); @@ -51,7 +51,7 @@ public class QuartzTwoCamelContextRestartTest { camel2.start(); } - @After + @AfterEach public void tearDown() throws Exception { camel1.stop(); camel2.stop(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java index 78f359a..22dfe7c 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java @@ -19,17 +19,18 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -public class QuartzTwoCamelContextSameNameClashTest extends Assert { +import static org.junit.jupiter.api.Assertions.assertNotSame; + +public class QuartzTwoCamelContextSameNameClashTest { private DefaultCamelContext camel1; private DefaultCamelContext camel2; - @Before + @BeforeEach public void setUp() throws Exception { camel1 = new DefaultCamelContext(); camel1.setName("myCamel"); @@ -56,7 +57,7 @@ public class QuartzTwoCamelContextSameNameClashTest extends Assert { camel2.start(); } - @After + @AfterEach public void tearDown() throws Exception { camel1.stop(); camel2.stop(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSuspendResumeTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSuspendResumeTest.java index 4cd712e..4088ac3 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSuspendResumeTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSuspendResumeTest.java @@ -19,16 +19,16 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class QuartzTwoCamelContextSuspendResumeTest { private DefaultCamelContext camel1; private DefaultCamelContext camel2; - @Before + @BeforeEach public void setUp() throws Exception { camel1 = new DefaultCamelContext(); camel1.setName("camel-1"); @@ -51,7 +51,7 @@ public class QuartzTwoCamelContextSuspendResumeTest { camel2.start(); } - @After + @AfterEach public void tearDown() throws Exception { camel1.stop(); camel2.stop(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java index 0196894..998344e 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java @@ -19,17 +19,16 @@ package org.apache.camel.component.quartz; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -public class QuartzTwoCamelContextTest extends Assert { +public class QuartzTwoCamelContextTest { private DefaultCamelContext camel1; private DefaultCamelContext camel2; - @Before + @BeforeEach public void setUp() throws Exception { camel1 = new DefaultCamelContext(); camel1.setName("camel-1"); @@ -52,7 +51,7 @@ public class QuartzTwoCamelContextTest extends Assert { camel2.start(); } - @After + @AfterEach public void tearDown() throws Exception { camel1.stop(); camel2.stop(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java index 96944e7..62b469c 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java @@ -20,16 +20,19 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Predicate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.TestSupport; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** * Tests a Quartz based cluster setup of two Camel Apps being triggered through {@link QuartzConsumer}. */ -public class SpringQuartzConsumerTwoAppsClusteredFailoverTest extends TestSupport { +public class SpringQuartzConsumerTwoAppsClusteredFailoverTest { + + protected final Logger log = LoggerFactory.getLogger(getClass()); @Test public void testQuartzPersistentStoreClusteredApp() throws Exception { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java index 9594909..8c39a8c 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java @@ -21,9 +21,10 @@ import org.apache.camel.Exchange; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.TestSupport; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -33,7 +34,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; /** * Tests a Quartz based cluster setup of two Camel Apps being triggered through with recoverableJob option is true {@link QuartzConsumer}. */ -public class SpringQuartzConsumerTwoAppsClusteredRecoveryTest extends TestSupport { +public class SpringQuartzConsumerTwoAppsClusteredRecoveryTest { + + protected final Logger log = LoggerFactory.getLogger(getClass()); @Test public void testQuartzPersistentStoreClusteredApp() throws Exception { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java index 0786270..e2aeb07 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzCronRouteTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.quartz; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java index 9419586..e31386c 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java @@ -17,41 +17,50 @@ package org.apache.camel.component.quartz; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit4.TestSupport; import org.apache.camel.util.IOHelper; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.quartz.CronTrigger; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.SimpleTrigger; import org.quartz.Trigger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest extends TestSupport { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class SpringQuartzPersistentStoreRestartAppChangeOptionsTest { private static AbstractXmlApplicationContext db; + + protected final Logger log = LoggerFactory.getLogger(getClass()); + private AbstractXmlApplicationContext app; private AbstractXmlApplicationContext app2; private AbstractXmlApplicationContext app3; - @BeforeClass + @BeforeAll public static void prepareDB() { // boot up the database the two invocations are going to share inside a clustered quartz setup db = new ClassPathXmlApplicationContext("org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppDatabase.xml"); db.start(); } - @AfterClass + @AfterAll public static void shutdownDB() { db.close(); } - @After + @AfterEach public void closeApps() { // we're done so let's properly close the application contexts, but close // the second app before the first one so that the quartz scheduler running diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java index 18aefc7..b73c8bb 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java @@ -18,13 +18,18 @@ package org.apache.camel.component.quartz; import org.apache.camel.CamelContext; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.TestSupport; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -public class SpringQuartzPersistentStoreRestartAppTest extends TestSupport { +import static org.junit.jupiter.api.Assertions.assertNotNull; + +public class SpringQuartzPersistentStoreRestartAppTest { + + protected final Logger log = LoggerFactory.getLogger(getClass()); @Test public void testQuartzPersistentStoreRestart() throws Exception { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java index d0a1031..36831a4 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java @@ -17,11 +17,14 @@ package org.apache.camel.component.quartz; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.apache.camel.test.junit5.TestSupport.isPlatform; +import static org.junit.jupiter.api.Assumptions.assumeFalse; + public class SpringQuartzPersistentStoreRestartRouteTest extends CamelSpringTestSupport { @Override @@ -32,9 +35,7 @@ public class SpringQuartzPersistentStoreRestartRouteTest extends CamelSpringTest @Test public void testQuartzPersistentStore() throws Exception { // skip testing on aix - if (isPlatform("aix")) { - return; - } + assumeFalse(isPlatform("aix")); MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMinimumMessageCount(2); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java index b5e16ad..996a946 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.quartz; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java index 7fb5874..7089816 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java @@ -22,9 +22,14 @@ 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.junit.Test; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class StatefulQuartzRouteTest extends BaseQuartzTest { + + protected final Logger log = LoggerFactory.getLogger(getClass()); + protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronMappingTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronMappingTest.java index d4d586f..73c31f7 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronMappingTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronMappingTest.java @@ -23,7 +23,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.quartz.BaseQuartzTest; import org.apache.camel.component.quartz.QuartzEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class QuartzCronMappingTest extends BaseQuartzTest { protected MockEndpoint resultEndpoint; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronRouteTest.java index 00e11d5..910cea6 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/cron/QuartzCronRouteTest.java @@ -19,7 +19,7 @@ package org.apache.camel.component.quartz.cron; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.quartz.BaseQuartzTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuartzCronRouteTest extends BaseQuartzTest { protected MockEndpoint resultEndpoint; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java index e1e0677..dfe55d0 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerRestartTest.java @@ -18,14 +18,16 @@ package org.apache.camel.pollconsumer.quartz; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; public class FileConsumerQuartzSchedulerRestartTest extends CamelTestSupport { @Override - @Before + @BeforeEach public void setUp() throws Exception { deleteDirectory("target/file/quartz"); super.setUp(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java index d995f55..57f3281 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz/FileConsumerQuartzSchedulerTest.java @@ -18,14 +18,16 @@ package org.apache.camel.pollconsumer.quartz; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; public class FileConsumerQuartzSchedulerTest extends CamelTestSupport { @Override - @Before + @BeforeEach public void setUp() throws Exception { deleteDirectory("target/file/quartz"); super.setUp(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java index ee045ea..2772639 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java @@ -28,8 +28,10 @@ import org.apache.camel.component.direct.DirectComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.quartz.QuartzComponent; import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class CronScheduledRoutePolicyTest extends CamelTestSupport { @@ -240,8 +242,8 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { Thread.sleep(5000); assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Stopped); - assertTrue("Should have called onStart", myPolicy.isStart()); - assertTrue("Should have called onStop", myPolicy.isStop()); + assertTrue(myPolicy.isStart(), "Should have called onStart"); + assertTrue(myPolicy.isStop(), "Should have called onStop"); } @Test @@ -267,7 +269,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport { // there is a ticket to improve this Consumer consumer = context.getRoute("test").getConsumer(); SuspendableService ss = (SuspendableService) consumer; - assertTrue("Consumer should be suspended", ss.isSuspended()); + assertTrue(ss.isSuspended(), "Consumer should be suspended"); } @Test diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java index 6463391..b58552e 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java @@ -24,9 +24,11 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.quartz.QuartzComponent; import org.apache.camel.spi.Registry; import org.apache.camel.spi.RoutePolicy; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.throttling.ThrottlingInflightRoutePolicy; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class MultiplePoliciesOnRouteTest extends CamelTestSupport { private String url = "seda:foo?concurrentConsumers=20"; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java index e7d980c..b3859ca 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/RouteAutoStopFalseCronScheduledPolicyTest.java @@ -17,8 +17,8 @@ package org.apache.camel.routepolicy.quartz; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; /** * Test CronScheduledRoutePolicy also works if the route has been configured diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java index 8d7f85b..4812ee0 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java @@ -23,8 +23,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.direct.DirectComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.quartz.QuartzComponent; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class SimpleScheduledCombinedRoutePolicyTest extends CamelTestSupport { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java index 569ca97..3cd78fe 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java @@ -26,11 +26,14 @@ import org.apache.camel.component.direct.DirectComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.quartz.QuartzComponent; import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class SimpleScheduledRoutePolicyTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(SimpleScheduledRoutePolicyTest.class); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java index 2a8ab15..841d990 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringCronScheduledRoutePolicyTest.java @@ -16,13 +16,13 @@ */ package org.apache.camel.routepolicy.quartz; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; public class SpringCronScheduledRoutePolicyTest extends SpringScheduledRoutePolicyTest { - @Before + @BeforeEach public void setUp() { setApplicationContext(new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz/CronPolicies.xml")); setTestType(TestType.CRON); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java index bf74baa..7ee3b47 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java @@ -16,8 +16,8 @@ */ package org.apache.camel.routepolicy.quartz; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java index cb78915..3c42386 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java @@ -19,17 +19,20 @@ package org.apache.camel.routepolicy.quartz; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.TestSupport; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.quartz.Scheduler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** * Tests a Quartz based cluster setup of two Camel Apps being triggered through {@link CronScheduledRoutePolicy}. */ -public class SpringQuartzTwoAppsClusteredFailoverTest extends TestSupport { +public class SpringQuartzTwoAppsClusteredFailoverTest { + + protected final Logger log = LoggerFactory.getLogger(getClass()); @Test public void testQuartzPersistentStoreClusteredApp() throws Exception { diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java index 8f97cd0..3e33f37 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java @@ -28,10 +28,11 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.RouteDefinition; import org.apache.camel.spi.RoutePolicy; import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.test.junit4.TestSupport; import org.springframework.context.support.ClassPathXmlApplicationContext; -public abstract class SpringScheduledRoutePolicyTest extends TestSupport { +import static org.junit.jupiter.api.Assertions.assertTrue; + +public abstract class SpringScheduledRoutePolicyTest { protected enum TestType { SIMPLE, CRON } diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java index c691a6a..c7d713d 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringSimpleScheduledRoutePolicyTest.java @@ -16,13 +16,13 @@ */ package org.apache.camel.routepolicy.quartz; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; public class SpringSimpleScheduledRoutePolicyTest extends SpringScheduledRoutePolicyTest { - @Before + @BeforeEach public void setUp() { setApplicationContext(new ClassPathXmlApplicationContext("org/apache/camel/routepolicy/quartz/SimplePolicies.xml")); setTestType(TestType.SIMPLE);
