This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 38d7d47b6574b6927b54dce30ac02f001eef67f0 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jul 15 16:42:37 2020 +0200 [CAMEL-11807] Upgrade camel-micrometer to junit5 --- components/camel-micrometer/pom.xml | 10 ++++----- .../component/micrometer/CounterEndpointTest.java | 18 ++++++++-------- .../component/micrometer/CounterRouteTest.java | 23 +++++++++----------- .../DistributionSummaryEndpointTest.java | 18 ++++++++-------- .../micrometer/DistributionSummaryRouteTest.java | 23 +++++++++----------- .../micrometer/MetricComponentSpringTest.java | 13 +++++------ .../micrometer/MicrometerComponentRouteTest.java | 4 ++-- .../micrometer/MicrometerComponentTest.java | 20 +++++++++-------- .../micrometer/MicrometerEndpointTest.java | 24 +++++++++++---------- .../component/micrometer/TimerEndpointTest.java | 18 ++++++++-------- .../camel/component/micrometer/TimerRouteTest.java | 25 ++++++++++------------ .../AbstractMicrometerEventNotifierTest.java | 2 +- .../MicrometerExchangeEventNotifierTest.java | 4 +++- .../MicrometerRouteEventNotifierTest.java | 3 ++- ...ExceptionRouteMicrometerMessageHistoryTest.java | 12 +++++++++-- .../messagehistory/ManagedMessageHistoryTest.java | 12 +++++++++-- .../MicrometerMessageHistoryTest.java | 11 ++++++++-- .../SpringMicrometerMessageHistoryTest.java | 11 ++++++++-- .../AbstractMicrometerRoutePolicyTest.java | 5 ++++- .../ManagedMicrometerRoutePolicyTest.java | 8 +++++-- .../MicrometerRoutePolicyExchangeStatusTest.java | 8 +++++-- ...MicrometerRoutePolicyMulticastSubRouteTest.java | 14 +++++++----- .../MicrometerRoutePolicySubRouteTest.java | 5 ++++- .../routepolicy/MicrometerRoutePolicyTest.java | 4 +++- .../spi/InstrumentedThreadPoolFactoryTest.java | 18 ++++++++-------- 25 files changed, 179 insertions(+), 134 deletions(-) diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml index 2e4eca5..e242cc5 100644 --- a/components/camel-micrometer/pom.xml +++ b/components/camel-micrometer/pom.xml @@ -59,7 +59,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -79,18 +79,18 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> <exclusions> <exclusion> diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterEndpointTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterEndpointTest.java index b6b631b..0f3632d 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterEndpointTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterEndpointTest.java @@ -20,22 +20,22 @@ import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; import org.apache.camel.Producer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CounterEndpointTest { private static final String METRICS_NAME = "metrics.name"; @@ -48,13 +48,13 @@ public class CounterEndpointTest { private InOrder inOrder; - @Before + @BeforeEach public void setUp() { endpoint = new MicrometerEndpoint(null, null, registry, Meter.Type.COUNTER, METRICS_NAME, Tags.empty()); inOrder = Mockito.inOrder(registry); } - @After + @AfterEach public void tearDown() { inOrder.verifyNoMoreInteractions(); } diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java index 97cae76..9944fc2 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java @@ -25,13 +25,11 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration; -import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader; -import org.apache.camel.test.spring.CamelSpringRunner; -import org.apache.camel.test.spring.MockEndpoints; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit5.MockEndpoints; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; @@ -40,12 +38,11 @@ import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_C import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_COUNTER_INCREMENT; import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_METRIC_NAME; import static org.apache.camel.component.micrometer.MicrometerConstants.METRICS_REGISTRY_NAME; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@RunWith(CamelSpringRunner.class) +@CamelSpringTest @ContextConfiguration( - classes = {CounterRouteTest.TestConfig.class}, - loader = CamelSpringDelegatingTestContextLoader.class) + classes = { CounterRouteTest.TestConfig.class }) @MockEndpoints public class CounterRouteTest { @@ -103,12 +100,12 @@ public class CounterRouteTest { } } - @Before + @BeforeEach public void setup() { registry = endpoint.getCamelContext().getRegistry().lookupByNameAndType(METRICS_REGISTRY_NAME, MeterRegistry.class); } - @After + @AfterEach public void tearDown() { endpoint.reset(); } diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryEndpointTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryEndpointTest.java index 290175d..1b59edd 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryEndpointTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryEndpointTest.java @@ -20,22 +20,22 @@ import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; import org.apache.camel.Producer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DistributionSummaryEndpointTest { private static final String METRICS_NAME = "metrics.name"; @@ -48,13 +48,13 @@ public class DistributionSummaryEndpointTest { private InOrder inOrder; - @Before + @BeforeEach public void setUp() { endpoint = new MicrometerEndpoint(null, null, registry, Meter.Type.DISTRIBUTION_SUMMARY, METRICS_NAME, Tags.empty()); inOrder = Mockito.inOrder(registry); } - @After + @AfterEach public void tearDown() { inOrder.verifyNoMoreInteractions(); } 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 fa66448..b3f8e98 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 @@ -26,13 +26,11 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration; -import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader; -import org.apache.camel.test.spring.CamelSpringRunner; -import org.apache.camel.test.spring.MockEndpoints; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit5.MockEndpoints; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; @@ -40,12 +38,11 @@ import org.springframework.test.context.ContextConfiguration; import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_HISTOGRAM_VALUE; import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_METRIC_NAME; import static org.apache.camel.component.micrometer.MicrometerConstants.METRICS_REGISTRY_NAME; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@RunWith(CamelSpringRunner.class) +@CamelSpringTest @ContextConfiguration( - classes = {DistributionSummaryRouteTest.TestConfig.class}, - loader = CamelSpringDelegatingTestContextLoader.class) + classes = {DistributionSummaryRouteTest.TestConfig.class}) @MockEndpoints public class DistributionSummaryRouteTest { @@ -86,12 +83,12 @@ public class DistributionSummaryRouteTest { } } - @Before + @BeforeEach public void setup() { registry = endpoint.getCamelContext().getRegistry().lookupByNameAndType(METRICS_REGISTRY_NAME, MeterRegistry.class); } - @After + @AfterEach public void tearDown() { endpoint.reset(); } diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MetricComponentSpringTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MetricComponentSpringTest.java index 197174e..9707304 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MetricComponentSpringTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MetricComponentSpringTest.java @@ -24,11 +24,9 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration; -import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader; -import org.apache.camel.test.spring.CamelSpringRunner; -import org.apache.camel.test.spring.MockEndpoints; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit5.MockEndpoints; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; @@ -40,10 +38,9 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; -@RunWith(CamelSpringRunner.class) +@CamelSpringTest @ContextConfiguration( - classes = { MetricComponentSpringTest.TestConfig.class }, - loader = CamelSpringDelegatingTestContextLoader.class) + classes = { MetricComponentSpringTest.TestConfig.class }) @MockEndpoints public class MetricComponentSpringTest { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java index 18d6cc0..d959a11 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java @@ -24,8 +24,8 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; public class MicrometerComponentRouteTest extends CamelTestSupport { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java index 6cbe6fa..1f4967c 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java @@ -28,23 +28,24 @@ import org.apache.camel.Endpoint; import org.apache.camel.RuntimeCamelException; import org.apache.camel.TypeConverter; import org.apache.camel.spi.Registry; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class MicrometerComponentTest { @Mock @@ -63,7 +64,7 @@ public class MicrometerComponentTest { private MicrometerComponent component; - @Before + @BeforeEach public void setUp() { component = new MicrometerComponent(); inOrder = Mockito.inOrder(camelContext, camelRegistry, metricRegistry, typeConverter); @@ -126,9 +127,10 @@ public class MicrometerComponentTest { assertThat(component.getMetricsType("no-metrics-type"), is(MicrometerComponent.DEFAULT_METER_TYPE)); } - @Test(expected = RuntimeCamelException.class) + @Test public void testGetMetricsTypeNotFound() { - component.getMetricsType("unknown-metrics:metrics-name"); + assertThrows(RuntimeCamelException.class, + () -> component.getMetricsType("unknown-metrics:metrics-name")); } @Test diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java index c4436ce..8344ea3 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java @@ -24,19 +24,20 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class MicrometerEndpointTest { private static final String METRICS_NAME = "metrics.name"; @@ -57,7 +58,7 @@ public class MicrometerEndpointTest { private InOrder inOrder; - @Before + @BeforeEach public void setUp() { endpoint = new MicrometerEndpoint(null, null, registry, Meter.Type.COUNTER, METRICS_NAME, Tags.empty()) { @Override @@ -73,7 +74,7 @@ public class MicrometerEndpointTest { inOrder = Mockito.inOrder(registry, processor, exchange, in); } - @After + @AfterEach public void tearDown() { inOrder.verifyNoMoreInteractions(); } @@ -84,9 +85,10 @@ public class MicrometerEndpointTest { assertThat(endpoint.getRegistry(), is(registry)); } - @Test(expected = RuntimeCamelException.class) + @Test public void testCreateConsumer() { - endpoint.createConsumer(processor); + assertThrows(RuntimeCamelException.class, + () -> endpoint.createConsumer(processor)); } @Test diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerEndpointTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerEndpointTest.java index 1420fc2..72fe6e9 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerEndpointTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerEndpointTest.java @@ -20,22 +20,22 @@ import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; import org.apache.camel.Producer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class TimerEndpointTest { private static final String METRICS_NAME = "metrics.name"; @@ -47,13 +47,13 @@ public class TimerEndpointTest { private InOrder inOrder; - @Before + @BeforeEach public void setUp() { endpoint = new MicrometerEndpoint(null, null, registry, Meter.Type.TIMER, METRICS_NAME, Tags.empty()); inOrder = Mockito.inOrder(registry); } - @After + @AfterEach public void tearDown() { inOrder.verifyNoMoreInteractions(); } diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java index 67771d6..6542afc 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java @@ -27,13 +27,11 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration; -import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader; -import org.apache.camel.test.spring.CamelSpringRunner; -import org.apache.camel.test.spring.MockEndpoints; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.camel.test.spring.junit5.CamelSpringTest; +import org.apache.camel.test.spring.junit5.MockEndpoints; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; @@ -41,13 +39,12 @@ import org.springframework.test.context.ContextConfiguration; import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_METRIC_NAME; import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_TIMER_ACTION; import static org.apache.camel.component.micrometer.MicrometerConstants.METRICS_REGISTRY_NAME; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(CamelSpringRunner.class) +@CamelSpringTest @ContextConfiguration( - classes = {TimerRouteTest.TestConfig.class}, - loader = CamelSpringDelegatingTestContextLoader.class) + classes = {TimerRouteTest.TestConfig.class}) @MockEndpoints public class TimerRouteTest { @@ -108,12 +105,12 @@ public class TimerRouteTest { } } - @Before + @BeforeEach public void setup() { registry = endpoint.getCamelContext().getRegistry().lookupByNameAndType(METRICS_REGISTRY_NAME, MeterRegistry.class); } - @After + @AfterEach public void tearDown() { endpoint.reset(); } diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java index e7a6b0a..1aa3f6f 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java @@ -26,7 +26,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.micrometer.CamelJmxConfig; import org.apache.camel.component.micrometer.MicrometerConstants; import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java index e56d481..5b03521 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java @@ -26,10 +26,12 @@ import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEve import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifier; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.ExpressionAdapter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTES_EXCHANGES_INFLIGHT; import static org.apache.camel.component.micrometer.MicrometerConstants.ROUTE_ID_TAG; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicrometerExchangeEventNotifierTest extends AbstractMicrometerEventNotifierTest { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java index b25a88e..786e2e3 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java @@ -20,10 +20,11 @@ import io.micrometer.core.instrument.Gauge; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTES_ADDED; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTES_RUNNING; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Christian Ohr diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java index 281e286..0a18f66 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ExceptionRouteMicrometerMessageHistoryTest.java @@ -20,11 +20,19 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ExceptionRouteMicrometerMessageHistoryTest extends CamelTestSupport { + protected final Logger log = LoggerFactory.getLogger(getClass()); + private MeterRegistry registry = new SimpleMeterRegistry(); @Override 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 b8262a2..5d3a4b3 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 @@ -31,11 +31,19 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.micrometer.CamelJmxConfig; import org.apache.camel.component.micrometer.MicrometerConstants; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ManagedMessageHistoryTest extends CamelTestSupport { + protected final Logger log = LoggerFactory.getLogger(getClass()); + @BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME) private CompositeMeterRegistry meterRegistry; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryTest.java index 35019c7..d6a2422 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistoryTest.java @@ -21,14 +21,21 @@ import io.micrometer.core.instrument.Timer; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_MESSAGE_HISTORY_METER_NAME; import static org.apache.camel.component.micrometer.MicrometerConstants.NODE_ID_TAG; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicrometerMessageHistoryTest extends CamelTestSupport { + protected final Logger log = LoggerFactory.getLogger(getClass()); + private MeterRegistry registry = new SimpleMeterRegistry(); @Override diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/SpringMicrometerMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/SpringMicrometerMessageHistoryTest.java index 0447666..2bd8c12 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/SpringMicrometerMessageHistoryTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/SpringMicrometerMessageHistoryTest.java @@ -18,16 +18,23 @@ package org.apache.camel.component.micrometer.messagehistory; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Timer; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_MESSAGE_HISTORY_METER_NAME; import static org.apache.camel.component.micrometer.MicrometerConstants.NODE_ID_TAG; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SpringMicrometerMessageHistoryTest extends CamelSpringTestSupport { + protected final Logger log = LoggerFactory.getLogger(getClass()); + @Override protected AbstractApplicationContext createApplicationContext() { return new ClassPathXmlApplicationContext("org/apache/camel/component/micrometer/messagehistory/SpringMetricsMessageHistoryTest.xml"); 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 62c2164..2bb55f6 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 @@ -25,10 +25,13 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.CamelContext; import org.apache.camel.component.micrometer.CamelJmxConfig; import org.apache.camel.component.micrometer.MicrometerConstants; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AbstractMicrometerRoutePolicyTest extends CamelTestSupport { + protected final Logger log = LoggerFactory.getLogger(getClass()); protected CompositeMeterRegistry meterRegistry; @Override diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/ManagedMicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/ManagedMicrometerRoutePolicyTest.java index 63c4a83..40c7428 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/ManagedMicrometerRoutePolicyTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/ManagedMicrometerRoutePolicyTest.java @@ -24,10 +24,14 @@ import javax.management.ObjectName; import io.micrometer.core.instrument.Meter; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ManagedMicrometerRoutePolicyTest extends AbstractMicrometerRoutePolicyTest { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +public class ManagedMicrometerRoutePolicyTest extends AbstractMicrometerRoutePolicyTest { protected MBeanServer getMBeanServer() { return context.getManagementStrategy().getManagementAgent().getMBeanServer(); diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyExchangeStatusTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyExchangeStatusTest.java index 7f2e94d..f8f1e5d 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyExchangeStatusTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyExchangeStatusTest.java @@ -19,9 +19,13 @@ package org.apache.camel.component.micrometer.routepolicy; import io.micrometer.core.instrument.Counter; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.apache.camel.component.micrometer.MicrometerConstants.*; +import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_EXCHANGES_FAILED_METER_NAME; +import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_EXCHANGES_SUCCEEDED_METER_NAME; +import static org.apache.camel.component.micrometer.MicrometerConstants.ROUTE_ID_TAG; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class MicrometerRoutePolicyExchangeStatusTest extends AbstractMicrometerRoutePolicyTest { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyMulticastSubRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyMulticastSubRouteTest.java index acdba8e..8f33434 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyMulticastSubRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyMulticastSubRouteTest.java @@ -22,9 +22,13 @@ import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Timer; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.apache.camel.component.micrometer.MicrometerConstants.*; +import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_EXCHANGES_FAILED_METER_NAME; +import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_EXCHANGES_SUCCEEDED_METER_NAME; +import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_METER_NAME; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * CAMEL-9226 - check metrics are counted correctly in multicast sub-routes @@ -54,16 +58,16 @@ public class MicrometerRoutePolicyMulticastSubRouteTest extends AbstractMicromet switch (meterName) { case DEFAULT_CAMEL_ROUTE_POLICY_METER_NAME: Timer timer = (Timer) meter; - assertEquals("Timer " + timer.getId() + " should have count of " + count, count, timer.count()); + assertEquals(count, timer.count(), "Timer " + timer.getId() + " should have count of " + count); break; case DEFAULT_CAMEL_ROUTE_POLICY_EXCHANGES_SUCCEEDED_METER_NAME: { Counter counter = (Counter) meter; - assertEquals("Counter " + counter.getId() + " should have count of " + count, count, counter.count(), 0.01D); + assertEquals(count, counter.count(), 0.01D, "Counter " + counter.getId() + " should have count of " + count); break; } case DEFAULT_CAMEL_ROUTE_POLICY_EXCHANGES_FAILED_METER_NAME: { Counter counter = (Counter) meter; - assertEquals("Counter " + counter.getId() + " should have count of " + 0, 0, counter.count(), 0.01D); + assertEquals(0, counter.count(), 0.01D, "Counter " + counter.getId() + " should have count of " + 0); break; } default: { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicySubRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicySubRouteTest.java index b424d12..18e8a6f 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicySubRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicySubRouteTest.java @@ -22,7 +22,10 @@ import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Timer; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicrometerRoutePolicySubRouteTest extends AbstractMicrometerRoutePolicyTest { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyTest.java index 9d691e6..a2337fa 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyTest.java @@ -21,10 +21,12 @@ import java.util.concurrent.TimeUnit; import io.micrometer.core.instrument.Timer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_METER_NAME; import static org.apache.camel.component.micrometer.MicrometerConstants.ROUTE_ID_TAG; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicrometerRoutePolicyTest extends AbstractMicrometerRoutePolicyTest { diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/spi/InstrumentedThreadPoolFactoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/spi/InstrumentedThreadPoolFactoryTest.java index 7cc9c33..4c321ea 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/spi/InstrumentedThreadPoolFactoryTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/spi/InstrumentedThreadPoolFactoryTest.java @@ -27,22 +27,22 @@ import io.micrometer.core.instrument.internal.TimedExecutorService; import org.apache.camel.spi.ThreadPoolFactory; import org.apache.camel.spi.ThreadPoolProfile; import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; import static org.mockito.Mockito.times; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class InstrumentedThreadPoolFactoryTest { private static final String METRICS_NAME = "metrics.name."; @@ -62,7 +62,7 @@ public class InstrumentedThreadPoolFactoryTest { private InOrder inOrder; - @Before + @BeforeEach public void setUp() { profile = new ThreadPoolProfile(METRICS_NAME); profile.setDefaultProfile(false); @@ -78,7 +78,7 @@ public class InstrumentedThreadPoolFactoryTest { inOrder = Mockito.inOrder(registry); } - @After + @AfterEach public void tearDown() { instrumentedThreadPoolFactory.reset(); }
