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/14 07:53:14 UTC
[camel] 02/02: Fixed tests
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.git
commit 094b8eb68850c1881ea3b6435c99b40a996bf319
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Mar 14 08:36:05 2020 +0100
Fixed tests
---
.../directvm/AbstractDirectVmTestSupport.java | 8 ++++----
.../directvm/DirectVmConsumerExpressionTest.java | 23 +++++++++-------------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/AbstractDirectVmTestSupport.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/AbstractDirectVmTestSupport.java
index 35a7c6e..ac87c7b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/AbstractDirectVmTestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/AbstractDirectVmTestSupport.java
@@ -21,7 +21,6 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.service.ServiceHelper;
import org.junit.After;
import org.junit.Before;
@@ -40,9 +39,9 @@ public abstract class AbstractDirectVmTestSupport extends ContextTestSupport {
doPostSetup();
context2 = new DefaultCamelContext();
+ context2.start();
template2 = context2.createProducerTemplate();
-
- ServiceHelper.startService(template2, context2);
+ template2.start();
// add routes after CamelContext has been started
RouteBuilder routeBuilder = createRouteBuilderForSecondContext();
@@ -58,7 +57,8 @@ public abstract class AbstractDirectVmTestSupport extends ContextTestSupport {
@Override
@After
public void tearDown() throws Exception {
- ServiceHelper.stopService(context2, template2);
+ template2.stop();
+ context2.stop();
super.tearDown();
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmConsumerExpressionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmConsumerExpressionTest.java
index 95e1cbf..a50d696 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmConsumerExpressionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmConsumerExpressionTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.service.ServiceHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -44,31 +43,27 @@ public class DirectVmConsumerExpressionTest extends ContextTestSupport {
context3 = new DefaultCamelContext();
context4 = new DefaultCamelContext();
- ServiceHelper.startService(context2);
- ServiceHelper.startService(context3);
- ServiceHelper.startService(context4);
+ context2.start();
+ context3.start();
+ context4.start();
// add routes after CamelContext has been started
RouteBuilder routeBuilder = createRouteBuilderCamelContext2();
- if (routeBuilder != null) {
- context2.addRoutes(routeBuilder);
- }
+ context2.addRoutes(routeBuilder);
routeBuilder = createRouteBuilderCamelContext3();
- if (routeBuilder != null) {
- context3.addRoutes(routeBuilder);
- }
+ context3.addRoutes(routeBuilder);
routeBuilder = createRouteBuilderCamelContext4();
- if (routeBuilder != null) {
- context4.addRoutes(routeBuilder);
- }
+ context4.addRoutes(routeBuilder);
}
@Override
@After
public void tearDown() throws Exception {
- ServiceHelper.stopService(context2, context3, context4);
+ context2.stop();
+ context3.stop();
+ context4.stop();
super.tearDown();
}