You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/16 12:58:04 UTC
[camel-spring-boot] 01/03: Fixed test after recent changes in
camel-core
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit aed028204d0ceeca06c7df76793e1baf9d6793f9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 16 13:35:29 2020 +0100
Fixed test after recent changes in camel-core
---
.../camel/spring/boot/CamelSpringBootTemplateShutdownTest.java | 4 ++--
.../org/apache/camel/spring/boot/StartupShutdownOrderTest.java | 6 +++---
.../camel/spring/boot/SupervisingRouteControllerRestartTest.java | 8 ++++----
.../apache/camel/spring/boot/SupervisingRouteControllerTest.java | 8 ++++----
.../apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java
index 3ec20e1..90e2ea1 100644
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java
+++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java
@@ -60,7 +60,7 @@ public class CamelSpringBootTemplateShutdownTest {
camelContext.stop();
- assertTrue(((ServiceSupport) camelContext).isStopped());
+ assertTrue(camelContext.isStopped());
assertTrue(((ServiceSupport) consumerTemplate).isStopped());
assertTrue(((ServiceSupport) producerTemplate).isStopped());
assertTrue(((ServiceSupport) fluentProducerTemplate).isStopped());
@@ -75,7 +75,7 @@ public class CamelSpringBootTemplateShutdownTest {
applicationContext.close();
assertFalse(applicationContext.isActive());
- assertTrue(((ServiceSupport) camelContext).isStopped());
+ assertTrue(camelContext.isStopped());
assertTrue(((ServiceSupport) consumerTemplate).isStopped());
assertTrue(((ServiceSupport) producerTemplate).isStopped());
assertTrue(((ServiceSupport) fluentProducerTemplate).isStopped());
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java
index d705ec6..1a2bcad 100644
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java
+++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java
@@ -213,7 +213,7 @@ public class StartupShutdownOrderTest {
final ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(
CamelAutoConfiguration.class, Beans.class);
- final ServiceSupport camelContext = (ServiceSupport) context.getBean(CamelContext.class);
+ final CamelContext camelContext = context.getBean(CamelContext.class);
final Map<String, TestState> testStates = context.getBeansOfType(TestState.class);
assertThat(camelContext.isStarted()).as("Camel context should be started").isTrue();
@@ -224,8 +224,8 @@ public class StartupShutdownOrderTest {
testStates.values().stream().forEach(TestState::assertValid);
}
- static ServiceSupport camel(final ApplicationContext context) {
- return (ServiceSupport) context.getBean(CamelContext.class);
+ static CamelContext camel(final ApplicationContext context) {
+ return context.getBean(CamelContext.class);
}
static boolean camelIsStarted(final ApplicationContext context) {
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
index a4257c4..d620de9 100644
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
+++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
@@ -118,18 +118,18 @@ public class SupervisingRouteControllerRestartTest {
public void configure() throws Exception {
getContext().addComponent("dummy", new DummyComponent());
- from("timer:foo?period=5s")
+ from("timer:foo?period=5000")
.id("foo")
.startupOrder(2)
.to("mock:foo");
- from("timer:bar?period=5s")
+ from("timer:bar?period=5000")
.id("bar")
.startupOrder(1)
.to("mock:bar");
- from("scheduler:unmanaged?initialDelay=5s")
+ from("scheduler:unmanaged?initialDelay=5000")
.id("scheduler-unmanaged")
.to("mock:scheduler-unmanaged");
- from("timer:no-autostartup?period=5s")
+ from("timer:no-autostartup?period=5000")
.id("timer-no-autostartup")
.autoStartup(false)
.to("mock:timer-no-autostartup");
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
index ca366de..8c8dc37 100644
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
+++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
@@ -114,18 +114,18 @@ public class SupervisingRouteControllerTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:foo?period=5s")
+ from("timer:foo?period=5000")
.id("foo")
.startupOrder(2)
.to("mock:foo");
- from("timer:bar?period=5s")
+ from("timer:bar?period=5000")
.id("bar")
.startupOrder(1)
.to("mock:bar");
- from("scheduler:unmanaged?initialDelay=5s")
+ from("scheduler:unmanaged?initialDelay=5000")
.id("scheduler-unmanaged")
.to("mock:scheduler-unmanaged");
- from("timer:no-autostartup?period=5s")
+ from("timer:no-autostartup?period=5000")
.id("timer-no-autostartup")
.autoStartup(false)
.to("mock:timer-no-autostartup");
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java
index 54be1c4..06239ad 100644
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java
+++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java
@@ -52,7 +52,7 @@ public class MixedJavaDslAndXmlTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:project?period=1s").id("java").setBody().constant("Hello World from Java Route")
+ from("timer:project?period=1000").id("java").setBody().constant("Hello World from Java Route")
.log(">>> ${body}");
}
};