You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/02/29 15:48:29 UTC
(camel) branch main updated: CAMEL-19553: camel-quartz ensure tests have assertions
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ff76f356799 CAMEL-19553: camel-quartz ensure tests have assertions
ff76f356799 is described below
commit ff76f35679941681b32373c5ec892ad09e46128e
Author: Gaelle Fournier <ga...@gmail.com>
AuthorDate: Wed Feb 28 18:00:13 2024 +0100
CAMEL-19553: camel-quartz ensure tests have assertions
---
.../component/quartz/DelegateEndpointQuartzTest.java | 4 +++-
.../camel/component/quartz/QuartzCronRouteTest.java | 13 ++++++-------
.../quartz/QuartzCronRouteWithSmallCacheTest.java | 10 +++-------
.../quartz/QuartzCronRouteWithStartDateEndDateTest.java | 2 +-
.../component/quartz/QuartzCustomCalendarFireTest.java | 7 ++++---
.../quartz/QuartzCustomCalendarNoFireTest.java | 7 ++++---
.../camel/component/quartz/QuartzInterruptTest.java | 7 ++++++-
.../camel/component/quartz/QuartzNameCollisionTest.java | 17 +++++++++--------
.../quartz/QuartzOneCamelContextSuspendResumeTest.java | 6 ++++--
.../camel/component/quartz/QuartzPropertiesTest.java | 12 +++++-------
.../camel/component/quartz/QuartzSimpleRouteTest.java | 16 +++++++---------
.../component/quartz/QuartzStatefulJobRouteTest.java | 8 ++++----
.../camel/component/quartz/QuartzSuspendRouteTest.java | 6 +++---
.../quartz/QuartzTwoCamelContextRestartTest.java | 6 ++++--
.../quartz/QuartzTwoCamelContextSameNameClashTest.java | 5 +++--
.../quartz/QuartzTwoCamelContextSuspendResumeTest.java | 6 ++++--
.../component/quartz/QuartzTwoCamelContextTest.java | 10 ++++++----
.../quartz/SimpleScheduledRoutePolicyTest.java | 10 ++++++++--
18 files changed, 84 insertions(+), 68 deletions(-)
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 944922adc69..06c2a569773 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
@@ -78,7 +78,9 @@ public class DelegateEndpointQuartzTest extends CamelTestSupport {
childUri = childUri + "?" + URISupport.createQueryString(parameters);
}
// need to clean the parameters to avoid default component verify parameter complain
- parameters.clear();
+ if (parameters != null) {
+ parameters.clear();
+ }
Endpoint childEndpoint = context.getEndpoint(childUri);
return new MyEndpoint(uri, childEndpoint);
}
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 b8492830b52..3487ada7dd0 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
@@ -18,13 +18,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.jupiter.api.Test;
import org.quartz.CronTrigger;
import org.quartz.JobDetail;
import org.quartz.Trigger;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* This test the CronTrigger as a timer endpoint in a route.
@@ -39,14 +39,13 @@ public class QuartzCronRouteTest extends BaseQuartzTest {
MockEndpoint.assertIsSatisfied(context);
Trigger trigger = mock.getReceivedExchanges().get(0).getIn().getHeader("trigger", Trigger.class);
- assertThat(trigger instanceof CronTrigger, CoreMatchers.is(true));
+ assertIsInstanceOf(CronTrigger.class, trigger);
JobDetail detail = mock.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class);
- assertThat(detail.getJobClass().equals(CamelJob.class), CoreMatchers.is(true));
+ assertEquals(CamelJob.class, detail.getJobClass());
- 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));
+ assertEquals("cron", detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_TYPE));
+ assertEquals("0/1 * * * * ?", detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_CRON_EXPRESSION));
}
@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 cd3f65f2c75..530c48d3f2c 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
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
@@ -57,12 +56,9 @@ public class QuartzCronRouteWithSmallCacheTest extends BaseQuartzTest {
public void configure() {
from("direct:foo").to("log:foo");
- from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").process(new Processor() {
- @Override
- public void process(Exchange exchange) {
- latch.countDown();
- template.sendBody("direct:foo", "Quartz triggered");
- }
+ from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").process(exchange -> {
+ latch.countDown();
+ template.sendBody("direct:foo", "Quartz triggered");
});
}
};
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithStartDateEndDateTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithStartDateEndDateTest.java
index daadcb126d5..aee0522abb0 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithStartDateEndDateTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzCronRouteWithStartDateEndDateTest.java
@@ -59,7 +59,7 @@ public class QuartzCronRouteWithStartDateEndDateTest extends BaseQuartzTest {
// triggers every 1th second at precise 00,01,02,03..59 with startAt and endAt exactly 2 second apart.
// configuration will create a maximum of three messages
fromF("quartz://myGroup/myTimerName?cron=0/1 * * * * ?&trigger.startAt=%s&trigger.endAt=%s",
- dateFormat.format(startDate), dateFormat.format(endDate)).to("mock:result");
+ dateFormat.format(startDate), dateFormat.format(endDate)).to("mock:result");
}
};
}
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 7e9e3b94d67..5147f4562c5 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
@@ -26,7 +26,8 @@ import org.quartz.Calendar;
import org.quartz.Scheduler;
import org.quartz.impl.calendar.HolidayCalendar;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This test a timer endpoint in a route with Custom calendar.
@@ -46,8 +47,8 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
java.util.Calendar tomorrow = java.util.Calendar.getInstance();
tomorrow.setTime(now);
tomorrow.add(java.util.Calendar.DAY_OF_MONTH, 1);
- assertEquals(false, c.isTimeIncluded(tomorrow.getTimeInMillis()));
- assertEquals(true, c.isTimeIncluded(now.getTime()));
+ assertFalse(c.isTimeIncluded(tomorrow.getTimeInMillis()));
+ assertTrue(c.isTimeIncluded(now.getTime()));
MockEndpoint.assertIsSatisfied(context);
}
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 9318e1faf7e..cd08198ceca 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
@@ -26,7 +26,8 @@ import org.quartz.Calendar;
import org.quartz.Scheduler;
import org.quartz.impl.calendar.HolidayCalendar;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This test a timer endpoint in a route with Custom calendar.
@@ -46,8 +47,8 @@ public class QuartzCustomCalendarNoFireTest extends BaseQuartzTest {
java.util.Calendar tomorrow = java.util.Calendar.getInstance();
tomorrow.setTime(now);
tomorrow.add(java.util.Calendar.DAY_OF_MONTH, 1);
- assertEquals(true, c.isTimeIncluded(tomorrow.getTimeInMillis()));
- assertEquals(false, c.isTimeIncluded(now.getTime()));
+ assertTrue(c.isTimeIncluded(tomorrow.getTimeInMillis()));
+ assertFalse(c.isTimeIncluded(now.getTime()));
MockEndpoint.assertIsSatisfied(context);
}
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 583ea00b70e..b6710ab27ac 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
@@ -20,6 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class QuartzInterruptTest extends BaseQuartzTest {
protected MockEndpoint resultEndpoint;
@@ -32,7 +35,9 @@ public class QuartzInterruptTest extends BaseQuartzTest {
resultEndpoint.assertIsSatisfied();
QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class);
- quartz.stop();
+ assertDoesNotThrow(quartz::stop);
+ assertTrue(quartz.isStopped());
+
}
@Override
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 813adc39c4a..627fdd385ab 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
@@ -25,6 +25,7 @@ import org.quartz.Scheduler;
import org.quartz.Trigger;
import org.quartz.TriggerKey;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -78,7 +79,7 @@ public class QuartzNameCollisionTest {
from("quartz://myGroup/myTimerName=0/2+*+*+*+*+?").to("log:two", "mock:two");
}
});
- camel2.start();
+ assertDoesNotThrow(() -> camel2.start());
}
/**
@@ -102,8 +103,8 @@ public class QuartzNameCollisionTest {
from("quartz://myGroup/myTimerName?stateful=true").to("log:two", "mock:two");
}
});
- camel2.start();
// if no exception is thrown then this test passed.
+ assertDoesNotThrow(() -> camel2.start());
}
/**
@@ -121,17 +122,17 @@ public class QuartzNameCollisionTest {
});
// traverse a litany of states
- camel.start();
+ assertDoesNotThrow(camel::start, "Start should have not thrown exception");
Thread.sleep(100);
- camel.suspend();
+ assertDoesNotThrow(camel::suspend, "Suspend should not have thrown exception");
Thread.sleep(100);
- camel.resume();
+ assertDoesNotThrow(camel::resume, "Resume should not have thrown exception");
Thread.sleep(100);
- camel.stop();
+ assertDoesNotThrow(camel::stop, "Stop should not have thrown exception");
Thread.sleep(100);
- camel.start();
+ assertDoesNotThrow(camel::start, "Start again should have thrown exception");
Thread.sleep(100);
- camel.stop();
+ assertDoesNotThrow(camel::stop, "Final stop should have thrown exception");
}
/**
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 59659e5547d..6208528af8f 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
@@ -23,6 +23,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
public class QuartzOneCamelContextSuspendResumeTest {
private DefaultCamelContext camel1;
@@ -50,12 +52,12 @@ public class QuartzOneCamelContextSuspendResumeTest {
mock1.expectedMinimumMessageCount(2);
mock1.assertIsSatisfied();
- camel1.suspend();
+ assertDoesNotThrow(() -> camel1.suspend());
// should resume triggers when we start camel 1 again
mock1.reset();
mock1.expectedMinimumMessageCount(2);
- camel1.resume();
+ assertDoesNotThrow(() -> camel1.resume());
mock1.assertIsSatisfied();
}
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 5073fad055f..ee21056a0a8 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
@@ -23,7 +23,7 @@ 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;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class QuartzPropertiesTest extends BaseQuartzTest {
@@ -59,12 +59,10 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
quartz.setPropertiesFile("doesnotexist.properties");
- try {
- quartz.start();
- fail("Should have thrown exception");
- } catch (Exception e) {
- assertEquals("Error loading Quartz properties file: doesnotexist.properties", e.getCause().getMessage());
- }
+ Exception thrown = assertThrows(Exception.class,
+ () -> quartz.start(),
+ "Should have thrown exception");
+ assertEquals("Error loading Quartz properties file: doesnotexist.properties", thrown.getCause().getMessage());
}
@Test
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 d568cc2ffd3..65f45e7c93b 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
@@ -18,13 +18,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.jupiter.api.Test;
import org.quartz.JobDetail;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
/**
* This not only set SimpleTrigger as a timer endpoint in a route, and also test the trigger.XXX properties setter.
@@ -38,16 +38,14 @@ public class QuartzSimpleRouteTest extends BaseQuartzTest {
MockEndpoint.assertIsSatisfied(context);
Trigger trigger = mock.getReceivedExchanges().get(0).getIn().getHeader("trigger", Trigger.class);
- assertThat(trigger instanceof SimpleTrigger, CoreMatchers.is(true));
+ assertInstanceOf(SimpleTrigger.class, trigger, "trigger should be a CronTrigger");
JobDetail detail = mock.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class);
- assertThat(detail.getJobClass().equals(CamelJob.class), CoreMatchers.is(true));
+ assertEquals(CamelJob.class, detail.getJobClass());
- 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("100"),
- CoreMatchers.is(true));
+ assertEquals("simple", detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_TYPE));
+ assertEquals("-1", detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_SIMPLE_REPEAT_COUNTER));
+ assertEquals("100", detail.getJobDataMap().get(QuartzConstants.QUARTZ_TRIGGER_SIMPLE_REPEAT_INTERVAL));
}
@Override
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 216e796e92c..648bba61b0b 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
@@ -18,13 +18,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.jupiter.api.Test;
import org.quartz.CronTrigger;
import org.quartz.JobDetail;
import org.quartz.Trigger;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
/**
* This test the CronTrigger as a timer endpoint in a route.
@@ -39,10 +39,10 @@ public class QuartzStatefulJobRouteTest extends BaseQuartzTest {
MockEndpoint.assertIsSatisfied(context);
Trigger trigger = mock.getReceivedExchanges().get(0).getIn().getHeader("trigger", Trigger.class);
- assertThat(trigger instanceof CronTrigger, CoreMatchers.is(true));
+ assertInstanceOf(CronTrigger.class, trigger, "trigger should be a CronTrigger");
JobDetail detail = mock.getReceivedExchanges().get(0).getIn().getHeader("jobDetail", JobDetail.class);
- assertThat(detail.getJobClass().equals(StatefulCamelJob.class), CoreMatchers.is(true));
+ assertEquals(StatefulCamelJob.class, detail.getJobClass());
}
@Override
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 725183e0d15..d7955b51618 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
@@ -33,14 +33,14 @@ public class QuartzSuspendRouteTest extends BaseQuartzTest {
context.getRouteController().suspendRoute("foo");
- int size = mock.getReceivedCounter();
-
MockEndpoint.resetMocks(context);
mock.expectedMessageCount(0);
mock.assertIsSatisfied(3000);
- assertEquals(size, size, "Should not schedule when suspended");
+ int size = mock.getReceivedCounter();
+
+ assertEquals(0, size, "Should not schedule when suspended");
MockEndpoint.resetMocks(context);
mock.expectedMinimumMessageCount(1);
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 06ffc06385c..1b066405099 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
@@ -23,6 +23,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
public class QuartzTwoCamelContextRestartTest {
private DefaultCamelContext camel1;
@@ -65,13 +67,13 @@ public class QuartzTwoCamelContextRestartTest {
mock2.expectedMinimumMessageCount(6);
mock1.assertIsSatisfied();
- camel1.stop();
+ assertDoesNotThrow(() -> camel1.stop());
mock2.assertIsSatisfied();
// should resume triggers when we start camel 1 again
// fetch mock endpoint again because we have stopped camel context
- camel1.start();
+ assertDoesNotThrow(() -> camel1.start());
mock1 = camel1.getEndpoint("mock:one", MockEndpoint.class);
mock1.expectedMinimumMessageCount(3);
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 1e7b5fe5aae..847511450c9 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
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotSame;
public class QuartzTwoCamelContextSameNameClashTest {
@@ -74,11 +75,11 @@ public class QuartzTwoCamelContextSameNameClashTest {
mock2.expectedMinimumMessageCount(6);
mock1.assertIsSatisfied();
- camel1.stop();
+ assertDoesNotThrow(() -> camel1.stop());
mock2.assertIsSatisfied();
- camel2.stop();
+ assertDoesNotThrow(() -> 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 5399b0460e9..6c145eba484 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
@@ -23,6 +23,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
public class QuartzTwoCamelContextSuspendResumeTest {
private DefaultCamelContext camel1;
@@ -64,14 +66,14 @@ public class QuartzTwoCamelContextSuspendResumeTest {
mock2.expectedMinimumMessageCount(6);
mock1.assertIsSatisfied();
- camel1.suspend();
+ assertDoesNotThrow(() -> camel1.suspend());
mock2.assertIsSatisfied();
// should resume triggers when we start camel 1 again
mock1.reset();
mock1.expectedMinimumMessageCount(2);
- camel1.resume();
+ assertDoesNotThrow(() -> camel1.resume());
mock1.assertIsSatisfied();
}
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 1916908c431..7fef010479e 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
@@ -23,6 +23,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
public class QuartzTwoCamelContextTest {
private DefaultCamelContext camel1;
@@ -64,11 +66,11 @@ public class QuartzTwoCamelContextTest {
mock2.expectedMinimumMessageCount(6);
mock1.assertIsSatisfied();
- camel1.stop();
+ assertDoesNotThrow(() -> camel1.stop());
mock2.assertIsSatisfied();
- camel2.stop();
+ assertDoesNotThrow(() -> camel2.stop());
}
@Test
@@ -84,13 +86,13 @@ public class QuartzTwoCamelContextTest {
from("quartz://myThirdGroup/myThirdTimerName?cron=0/1+*+*+*+*+?").to("mock:three");
}
});
- camel3.start();
+ assertDoesNotThrow(camel3::start);
MockEndpoint mock3 = camel3.getEndpoint("mock:three", MockEndpoint.class);
mock3.expectedMinimumMessageCount(2);
mock3.assertIsSatisfied();
- camel3.stop();
+ assertDoesNotThrow(camel3::stop);
}
}
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 f4806aa62a2..548d790d3cb 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
@@ -103,7 +103,10 @@ public class SimpleScheduledRoutePolicyTest {
assertTrue(ServiceHelper.isStopped(context.getRoute("test").getConsumer()));
});
- assertThrows(CamelExecutionException.class, () -> template.sendBody("direct:start", "Ready or not, Here, I come"));
+ CamelExecutionException thrown = assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:start", "Ready or not, Here, I come"),
+ "Should have thrown an exception");
+ assertTrue(thrown.getCause().getMessage().contains("direct://start"), "Exception should mention missing endpoint");
context.getComponent("quartz", QuartzComponent.class).stop();
}
@@ -137,7 +140,10 @@ public class SimpleScheduledRoutePolicyTest {
assertTrue(ServiceHelper.isSuspended(context.getRoute("test").getConsumer()));
});
- assertThrows(CamelExecutionException.class, () -> template.sendBody("direct:start", "Ready or not, Here, I come"));
+ CamelExecutionException thrown = assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:start", "Ready or not, Here, I come"),
+ "Should have thrown an exception");
+ assertTrue(thrown.getCause().getMessage().contains("direct://start"), "Exception should mention missing endpoint");
context.getComponent("quartz", QuartzComponent.class).stop();
}