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 2024/03/14 10:27:15 UTC
(camel) branch main updated: CAMEL-20522: Fix tests to ensure they stop camel
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 baecbcd86a6 CAMEL-20522: Fix tests to ensure they stop camel
baecbcd86a6 is described below
commit baecbcd86a6dd8da7640dda232a4012af8bc9921
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 14 11:27:01 2024 +0100
CAMEL-20522: Fix tests to ensure they stop camel
---
.../micrometer/DistributionSummaryRouteTest.java | 2 +-
.../messagehistory/ManagedMessageHistoryTest.java | 6 +++---
.../routepolicy/AbstractMicrometerRoutePolicyTest.java | 18 +++---------------
3 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java
index fea95615e66..a8ffd130e96 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java
@@ -75,7 +75,7 @@ public class DistributionSummaryRouteTest extends CamelSpringTestSupport {
}
@AfterEach
- public void tearDown() {
+ public void resetEndpoint() {
endpoint.reset();
}
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
index 030b6a6cd08..a1b7a5d7de8 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
@@ -33,6 +33,7 @@ import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,9 +64,8 @@ public class ManagedMessageHistoryTest extends CamelTestSupport {
meterRegistry.add(new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, HierarchicalNameMapper.DEFAULT));
}
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
+ @AfterEach
+ protected void cleanupMeterRegistry() {
if (meterRegistry != null) {
meterRegistry.clear();
meterRegistry.close();
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
index a144ce2b24a..287a19c19c8 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
@@ -20,8 +20,8 @@ import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.MicrometerConstants;
-import org.apache.camel.support.LifecycleStrategySupport;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,9 +36,8 @@ public abstract class AbstractMicrometerRoutePolicyTest extends CamelTestSupport
return factory;
}
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
+ @AfterEach
+ protected void cleanupMeterRegistry() {
if (meterRegistry != null) {
meterRegistry.clear();
meterRegistry.close();
@@ -60,17 +59,6 @@ public abstract class AbstractMicrometerRoutePolicyTest extends CamelTestSupport
context.addRoutePolicyFactory(factory);
context.getRegistry().bind(MicrometerConstants.METRICS_REGISTRY_NAME, meterRegistry);
context.addService(factory);
- // TODO: CAMEL-20522
- context.addLifecycleStrategy(new LifecycleStrategySupport() {
- @Override
- public void onContextStopped(CamelContext context) {
- if (meterRegistry != null) {
- meterRegistry.clear();
- meterRegistry.close();
- meterRegistry = null;
- }
- }
- });
return context;
}