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 783defbe38f338473b532c8970f87a49c2b7260c Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jul 15 17:22:11 2020 +0200 [CAMEL-11807] Upgrade camel-microprofile-metrics to junit5 --- components/camel-microprofile-metrics/pom.xml | 11 +++++++--- .../MicroProfileMetricsConcurrentGaugeTest.java | 3 ++- .../metrics/MicroProfileMetricsCounterTest.java | 3 ++- .../MicroProfileMetricsCustomRegistryTest.java | 6 ++++-- .../metrics/MicroProfileMetricsEndpointTest.java | 14 ++++++------ .../MicroProfileMetricsExchangeRecorderTest.java | 7 +++--- .../metrics/MicroProfileMetricsGaugeTest.java | 3 ++- .../metrics/MicroProfileMetricsHelperTest.java | 25 +++++++++++++--------- .../metrics/MicroProfileMetricsHistogramTest.java | 3 ++- .../metrics/MicroProfileMetricsMetadataTest.java | 3 ++- .../metrics/MicroProfileMetricsMeterTest.java | 3 ++- .../metrics/MicroProfileMetricsTagTest.java | 3 ++- .../metrics/MicroProfileMetricsTestSupport.java | 6 +++++- .../metrics/MicroProfileMetricsTimerTest.java | 5 ++++- ...rofileMetricsCamelContextEventNotifierTest.java | 5 ++++- ...croProfileMetricsExchangeEventNotifierTest.java | 4 +++- .../MicroProfileMetricsRouteEventNotifierTest.java | 3 ++- ...eMetricsExceptionInRouteMessageHistoryTest.java | 6 +++++- .../MicroProfileMetricsMessageHistoryTest.java | 5 ++++- ...ileMetricsRoutePolicyMulticastSubRouteTest.java | 4 +++- ...MicroProfileMetricsRoutePolicySubRouteTest.java | 4 +++- .../policy/MicroProfileMetricsRoutePolicyTest.java | 4 +++- 22 files changed, 88 insertions(+), 42 deletions(-) diff --git a/components/camel-microprofile-metrics/pom.xml b/components/camel-microprofile-metrics/pom.xml index b8b1b04..ce6a148 100644 --- a/components/camel-microprofile-metrics/pom.xml +++ b/components/camel-microprofile-metrics/pom.xml @@ -50,7 +50,12 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> @@ -81,8 +86,8 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsConcurrentGaugeTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsConcurrentGaugeTest.java index c0b7310..ec09742 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsConcurrentGaugeTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsConcurrentGaugeTest.java @@ -19,10 +19,11 @@ package org.apache.camel.component.microprofile.metrics; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.eclipse.microprofile.metrics.ConcurrentGauge; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_GAUGE_DECREMENT; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_GAUGE_INCREMENT; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsConcurrentGaugeTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsCounterTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsCounterTest.java index cbe25b5..773805f 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsCounterTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsCounterTest.java @@ -19,9 +19,10 @@ package org.apache.camel.component.microprofile.metrics; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.eclipse.microprofile.metrics.Counter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_COUNTER_INCREMENT; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsCounterTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsCustomRegistryTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsCustomRegistryTest.java index 6381bd9..e2306aa 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsCustomRegistryTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsCustomRegistryTest.java @@ -22,11 +22,13 @@ import io.smallrye.metrics.MetricsRegistryImpl; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsCustomRegistryTest extends CamelTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointTest.java index e03fe56..9359109 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointTest.java @@ -18,11 +18,12 @@ package org.apache.camel.component.microprofile.metrics; import org.apache.camel.Producer; import org.eclipse.microprofile.metrics.MetricType; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertThrows; public class MicroProfileMetricsEndpointTest { @@ -68,11 +69,10 @@ public class MicroProfileMetricsEndpointTest { assertThat(producer, is(instanceOf(MicroProfileMetricsTimerProducer.class))); } - @Test(expected = IllegalStateException.class) + @Test public void testInvalidMetricType() throws Exception { MicroProfileMetricsEndpoint endpoint = createEndpoint(MetricType.INVALID); - Producer producer = endpoint.createProducer(); - assertThat(producer, is(instanceOf(MicroProfileMetricsCounterProducer.class))); + assertThrows(IllegalStateException.class, () -> endpoint.createProducer()); } private MicroProfileMetricsEndpoint createEndpoint(MetricType metricType) { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsExchangeRecorderTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsExchangeRecorderTest.java index dd82b5c..70fee84 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsExchangeRecorderTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsExchangeRecorderTest.java @@ -21,8 +21,8 @@ import org.apache.camel.builder.ExchangeBuilder; import org.apache.camel.component.microprofile.metrics.gauge.AtomicIntegerGauge; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Tag; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.CAMEL_METRIC_PREFIX; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.EXCHANGES_COMPLETED_METRIC_NAME; @@ -31,13 +31,14 @@ import static org.apache.camel.component.microprofile.metrics.MicroProfileMetric import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.EXCHANGES_FAILURES_HANDLED_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.EXCHANGES_INFLIGHT_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.EXCHANGES_TOTAL_METRIC_NAME; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsExchangeRecorderTest extends MicroProfileMetricsTestSupport { private static final Tag[] TAGS = new Tag[] {new Tag("foo", "bar")}; private MicroProfileMetricsExchangeRecorder recorder; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); recorder = new MicroProfileMetricsExchangeRecorder(metricRegistry, CAMEL_METRIC_PREFIX, TAGS); diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsGaugeTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsGaugeTest.java index 46263b5..20d5be2 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsGaugeTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsGaugeTest.java @@ -19,9 +19,10 @@ package org.apache.camel.component.microprofile.metrics; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.microprofile.metrics.gauge.SimpleGauge; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_GAUGE_VALUE; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsGaugeTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsHelperTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsHelperTest.java index e3b1997..9ca9e49 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsHelperTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsHelperTest.java @@ -21,9 +21,10 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.Registry; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Tag; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class MicroProfileMetricsHelperTest { @@ -34,19 +35,22 @@ public class MicroProfileMetricsHelperTest { assertEquals("bar", tag.getTagValue()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testParseTagForEmptyString() { - MicroProfileMetricsHelper.parseTag(""); + assertThrows(IllegalArgumentException.class, + () -> MicroProfileMetricsHelper.parseTag("")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testParseTagForInvalidString() { - MicroProfileMetricsHelper.parseTag("badtag"); + assertThrows(IllegalArgumentException.class, + () -> MicroProfileMetricsHelper.parseTag("badtag")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testParseTagForStringWithNotEnoughElements() { - MicroProfileMetricsHelper.parseTag("badtag="); + assertThrows(IllegalArgumentException.class, + () -> MicroProfileMetricsHelper.parseTag("badtag=")); } @Test @@ -67,8 +71,9 @@ public class MicroProfileMetricsHelperTest { MicroProfileMetricsHelper.getMetricRegistry(camelContext); } - @Test(expected = IllegalStateException.class) + @Test public void testGetMetricRegistryWhenNoRegistryConfigured() { - MicroProfileMetricsHelper.getMetricRegistry(new DefaultCamelContext()); + assertThrows(IllegalStateException.class, + () -> MicroProfileMetricsHelper.getMetricRegistry(new DefaultCamelContext())); } } diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsHistogramTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsHistogramTest.java index 78ae724..d17ea38 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsHistogramTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsHistogramTest.java @@ -19,9 +19,10 @@ package org.apache.camel.component.microprofile.metrics; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.eclipse.microprofile.metrics.Histogram; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_HISTOGRAM_VALUE; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsHistogramTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMetadataTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMetadataTest.java index da50a18..9c4548d 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMetadataTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMetadataTest.java @@ -22,13 +22,14 @@ import java.util.Map; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.eclipse.microprofile.metrics.Metadata; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_METRIC_DESCRIPTION; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_METRIC_DISPLAY_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_METRIC_UNIT; import static org.eclipse.microprofile.metrics.MetricUnits.KILOBYTES; import static org.eclipse.microprofile.metrics.MetricUnits.MEGABITS; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsMetadataTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMeterTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMeterTest.java index 40134a4..7f098a4 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMeterTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsMeterTest.java @@ -19,9 +19,10 @@ package org.apache.camel.component.microprofile.metrics; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.eclipse.microprofile.metrics.Meter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_METER_MARK; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsMeterTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTagTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTagTest.java index 5d0f57e..962d8ed 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTagTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTagTest.java @@ -21,9 +21,10 @@ import java.util.List; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.eclipse.microprofile.metrics.Tag; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_METRIC_TAGS; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsTagTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTestSupport.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTestSupport.java index 1f5a31e..30b059a 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTestSupport.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTestSupport.java @@ -26,7 +26,7 @@ import io.smallrye.metrics.exporters.JsonExporter; import org.apache.camel.BindToRegistry; import org.apache.camel.component.microprofile.metrics.gauge.AtomicIntegerGauge; import org.apache.camel.component.microprofile.metrics.gauge.SimpleGauge; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.eclipse.microprofile.metrics.ConcurrentGauge; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Histogram; @@ -37,6 +37,8 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.Timer; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsHelper.findMetric; import static org.eclipse.microprofile.metrics.MetricRegistry.Type; @@ -49,12 +51,14 @@ public class MicroProfileMetricsTestSupport extends CamelTestSupport { private MetricRegistries registries = new MetricRegistries(); @Override + @BeforeEach public void setUp() throws Exception { metricRegistry = registries.getApplicationRegistry(); super.setUp(); } @Override + @AfterEach public void tearDown() throws Exception { super.tearDown(); registries.cleanUp(); diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTimerTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTimerTest.java index 433115f..bde511f 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTimerTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsTimerTest.java @@ -19,9 +19,12 @@ package org.apache.camel.component.microprofile.metrics; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.eclipse.microprofile.metrics.Timer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.HEADER_TIMER_ACTION; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicroProfileMetricsTimerTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/context/MicroProfileMetricsCamelContextEventNotifierTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/context/MicroProfileMetricsCamelContextEventNotifierTest.java index 4fe3b24..8144943 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/context/MicroProfileMetricsCamelContextEventNotifierTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/context/MicroProfileMetricsCamelContextEventNotifierTest.java @@ -24,12 +24,15 @@ import org.apache.camel.ServiceStatus; import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsTestSupport; import org.apache.camel.component.microprofile.metrics.gauge.LambdaGauge; import org.eclipse.microprofile.metrics.Tag; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.CAMEL_CONTEXT_STATUS_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.CAMEL_CONTEXT_TAG; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.CAMEL_CONTEXT_UPTIME_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsHelper.findMetric; +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 MicroProfileMetricsCamelContextEventNotifierTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifierTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifierTest.java index e8f0214..d6f8909 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifierTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifierTest.java @@ -28,7 +28,7 @@ import org.apache.camel.support.ExpressionAdapter; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.Timer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.CAMEL_CONTEXT_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.CAMEL_CONTEXT_TAG; @@ -39,6 +39,8 @@ import static org.apache.camel.component.microprofile.metrics.MicroProfileMetric import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.EXCHANGES_INFLIGHT_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.EXCHANGES_TOTAL_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.PROCESSING_METRICS_SUFFIX; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicroProfileMetricsExchangeEventNotifierTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/route/MicroProfileMetricsRouteEventNotifierTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/route/MicroProfileMetricsRouteEventNotifierTest.java index b38760a..8159cf5 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/route/MicroProfileMetricsRouteEventNotifierTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/route/MicroProfileMetricsRouteEventNotifierTest.java @@ -21,11 +21,12 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsTestSupport; import org.eclipse.microprofile.metrics.Gauge; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.DEFAULT_CAMEL_ROUTES_ADDED_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.DEFAULT_CAMEL_ROUTES_RUNNING_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsHelper.findMetric; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsRouteEventNotifierTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java index d36a66f..39c4dcc 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java @@ -25,7 +25,11 @@ import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsTestSu import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry.Type; import org.eclipse.microprofile.metrics.Timer; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicroProfileMetricsExceptionInRouteMessageHistoryTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java index bb53744..20a8e16 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java @@ -29,9 +29,12 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry.Type; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.Timer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.DEFAULT_CAMEL_MESSAGE_HISTORY_METRIC_NAME; +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 MicroProfileMetricsMessageHistoryTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyMulticastSubRouteTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyMulticastSubRouteTest.java index 29e2055..b67baf6 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyMulticastSubRouteTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyMulticastSubRouteTest.java @@ -23,7 +23,9 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsTestSupport; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.Timer; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsRoutePolicyMulticastSubRouteTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicySubRouteTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicySubRouteTest.java index 56e06c2..394e932 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicySubRouteTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicySubRouteTest.java @@ -23,7 +23,9 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsTestSupport; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.Timer; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class MicroProfileMetricsRoutePolicySubRouteTest extends MicroProfileMetricsTestSupport { diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyTest.java index b201914..692fbba 100644 --- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyTest.java +++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyTest.java @@ -29,7 +29,7 @@ import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Snapshot; import org.eclipse.microprofile.metrics.Tag; import org.eclipse.microprofile.metrics.Timer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.CAMEL_CONTEXT_TAG; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.DEFAULT_CAMEL_ROUTE_POLICY_METRIC_NAME; @@ -41,6 +41,8 @@ import static org.apache.camel.component.microprofile.metrics.MicroProfileMetric import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.EXCHANGES_INFLIGHT_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.EXCHANGES_TOTAL_METRIC_NAME; import static org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConstants.ROUTE_ID_TAG; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicroProfileMetricsRoutePolicyTest extends MicroProfileMetricsTestSupport {
