You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/11/08 15:00:22 UTC
[camel] 08/08: Fix unit tests
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96ecf2d7f586c5e882f4434720dfb7800ef7d417
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Nov 8 15:01:11 2018 +0100
Fix unit tests
---
.../java/org/apache/camel/impl/AbstractCamelContext.java | 13 +++++++++----
.../apache/camel/impl/MultipleLifecycleStrategyTest.java | 4 ++--
.../ManagedProducerRouteAddRemoveRegisterAlwaysTest.java | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
index 9bd47e2..00aa494 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
@@ -349,6 +349,10 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
}
public void doInit() {
+ // setup management strategy first since end users may use it to add event notifiers
+ // using the management strategy before the CamelContext has been started
+ this.managementStrategy = createManagementStrategy();
+
// Call all registered trackers with this context
// Note, this may use a partially constructed object
CamelContextTracker.notifyContextCreated(this);
@@ -902,7 +906,8 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
@Override
public void setRouteController(RouteController routeController) {
- this.routeController = doAddService(routeController);
+ this.routeController = routeController;
+ doAddService(routeController);
}
@Override
@@ -2467,7 +2472,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
public TypeConverterRegistry getTypeConverterRegistry() {
if (typeConverterRegistry == null) {
synchronized (this) {
- if (typeConverter == null) {
+ if (typeConverterRegistry == null) {
setTypeConverterRegistry(createTypeConverterRegistry());
}
}
@@ -4006,6 +4011,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
getPackageScanClassResolver();
getProducerServicePool();
getPollingConsumerServicePool();
+ getRestRegistry();
if (isTypeConverterStatisticsEnabled() != null) {
getTypeConverterRegistry().getStatistics().setStatisticsEnabled(isTypeConverterStatisticsEnabled());
@@ -4022,7 +4028,6 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
getComponentResolver();
getDataFormatResolver();
getManagementStrategy();
- getRestRegistry();
getHeadersMapFactory();
getClassResolver();
getNodeIdFactory();
@@ -4393,7 +4398,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Mod
if (shutdownStrategy == null) {
synchronized (this) {
if (shutdownStrategy == null) {
- shutdownStrategy = createShutdownStrategy();
+ setShutdownStrategy(createShutdownStrategy());
}
}
}
diff --git a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
index 23896b3..983c580 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
@@ -51,8 +51,8 @@ public class MultipleLifecycleStrategyTest extends TestSupport {
List<String> expectedEvents = Arrays.asList("onContextStart",
"onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd",
- "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd",
- "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop");
+ "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd",
+ "onServiceAdd", "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop");
assertEquals(expectedEvents, dummy1.getEvents());
assertEquals(expectedEvents, dummy2.getEvents());
diff --git a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
index 83350bd..5ba8a51 100644
--- a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
+++ b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementTestSupport {
- private int services = 10;
+ private int services = 11;
@Override
protected CamelContext createCamelContext() throws Exception {