This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 34f1bb5a4d56bd54be9a337dd8c8efe15584bd94 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Wed Apr 10 11:11:57 2024 +0200 (chores) camel-core: simplify assertions --- .../impl/cloud/CombinedServiceFilterTest.java | 5 +++-- .../impl/cloud/ServiceCallConfigurationTest.java | 22 +++++++++++----------- .../impl/engine/DefaultFactoryFinderTest.java | 2 +- .../health/DefaultHealthCheckRegistryTest.java | 5 +++-- .../impl/health/ReadinessAndLivenessTest.java | 9 +++++---- .../processor/StreamCachingAllowDenyTest.java | 8 ++++---- ...OnExceptionUseOriginalMessageStreamTwoTest.java | 4 ++-- .../apache/camel/reifier/ProcessorReifierTest.java | 2 +- .../reifier/dataformat/DataFormatReifierTest.java | 2 +- .../org/apache/camel/support/CustomizersTest.java | 14 +++++++------- .../java/org/apache/camel/util/IOHelperTest.java | 4 ++-- .../org/apache/camel/main/MainCustomizerTest.java | 4 ++-- .../java/org/apache/camel/main/MainIoCTest.java | 2 +- .../java/org/apache/camel/main/MainSedaTest.java | 4 ++-- .../apache/camel/main/MainSedaWildcardTest.java | 6 +++--- .../main/MainSupervisingRouteControllerTest.java | 4 ++-- .../java/org/apache/camel/main/MainVaultTest.java | 4 ++-- .../ManagedFailoverLoadBalancerTest.java | 5 +++-- .../camel/management/ManagedMulticastTest.java | 3 ++- .../camel/management/ManagedRecipientListTest.java | 3 ++- .../camel/management/ManagedRefProducerTest.java | 4 ++-- .../camel/management/ManagedRegisterRouteTest.java | 5 +++-- .../camel/management/ManagedRouteRestartTest.java | 4 ++-- .../management/ManagedRouteStopAndFailTest.java | 4 ++-- .../camel/management/ManagedRouteStopTest.java | 4 ++-- .../camel/management/ManagedSedaEndpointTest.java | 2 +- ...ManagedSetAndRemoveHeaderAndPropertiesTest.java | 2 +- .../management/ManagedThreadPoolProfileTest.java | 5 +++-- .../camel/management/ManagedThreadPoolTest.java | 8 +++++--- .../management/ManagedThreadPoolWithIdTest.java | 3 ++- .../ManagedThrottlingExceptionRoutePolicyTest.java | 2 +- .../ManagedThrottlingInflightRoutePolicyTest.java | 2 +- .../apache/camel/management/ManagedTimerTest.java | 3 ++- .../management/RemoveRouteDefinitionTest.java | 4 ++-- 34 files changed, 88 insertions(+), 76 deletions(-) diff --git a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java index da44d147187..6abe51c767a 100644 --- a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java +++ b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java @@ -28,6 +28,7 @@ import org.junit.jupiter.api.Test; import static java.util.Optional.ofNullable; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertTrue; public class CombinedServiceFilterTest extends ContextTestSupport { @@ -39,8 +40,8 @@ public class CombinedServiceFilterTest extends ContextTestSupport { CombinedServiceFilter filter = (CombinedServiceFilter) conf.newInstance(context); assertEquals(2, filter.getDelegates().size()); - assertTrue(filter.getDelegates().get(0) instanceof HealthyServiceFilter); - assertTrue(filter.getDelegates().get(1) instanceof PassThroughServiceFilter); + assertInstanceOf(HealthyServiceFilter.class, filter.getDelegates().get(0)); + assertInstanceOf(PassThroughServiceFilter.class, filter.getDelegates().get(1)); } @Test diff --git a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java index d28fba43834..b9a68836d81 100644 --- a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java +++ b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java @@ -36,8 +36,8 @@ import org.apache.camel.support.DefaultExchange; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class ServiceCallConfigurationTest { @@ -74,7 +74,7 @@ public class ServiceCallConfigurationTest { DefaultServiceCallProcessor proc = findServiceCallProcessor(context.getRoute("default")); assertNotNull(proc); - assertTrue(proc.getLoadBalancer() instanceof DefaultServiceLoadBalancer); + assertInstanceOf(DefaultServiceLoadBalancer.class, proc.getLoadBalancer()); DefaultServiceLoadBalancer loadBalancer = (DefaultServiceLoadBalancer) proc.getLoadBalancer(); assertEquals(sd, loadBalancer.getServiceDiscovery()); @@ -120,7 +120,7 @@ public class ServiceCallConfigurationTest { DefaultServiceCallProcessor proc = findServiceCallProcessor(context.getRoute("default")); assertNotNull(proc); - assertTrue(proc.getLoadBalancer() instanceof DefaultServiceLoadBalancer); + assertInstanceOf(DefaultServiceLoadBalancer.class, proc.getLoadBalancer()); DefaultServiceLoadBalancer loadBalancer = (DefaultServiceLoadBalancer) proc.getLoadBalancer(); assertEquals(sd, loadBalancer.getServiceDiscovery()); @@ -162,7 +162,7 @@ public class ServiceCallConfigurationTest { DefaultServiceCallProcessor proc = findServiceCallProcessor(context.getRoute("default")); assertNotNull(proc); - assertTrue(proc.getLoadBalancer() instanceof DefaultServiceLoadBalancer); + assertInstanceOf(DefaultServiceLoadBalancer.class, proc.getLoadBalancer()); DefaultServiceLoadBalancer loadBalancer = (DefaultServiceLoadBalancer) proc.getLoadBalancer(); assertEquals(sd, loadBalancer.getServiceDiscovery()); @@ -204,7 +204,7 @@ public class ServiceCallConfigurationTest { DefaultServiceCallProcessor proc = findServiceCallProcessor(context.getRoute("default")); assertNotNull(proc); - assertTrue(proc.getLoadBalancer() instanceof DefaultServiceLoadBalancer); + assertInstanceOf(DefaultServiceLoadBalancer.class, proc.getLoadBalancer()); DefaultServiceLoadBalancer loadBalancer = (DefaultServiceLoadBalancer) proc.getLoadBalancer(); assertEquals(sd, loadBalancer.getServiceDiscovery()); @@ -284,7 +284,7 @@ public class ServiceCallConfigurationTest { DefaultServiceCallProcessor proc = findServiceCallProcessor(context.getRoute("default")); assertNotNull(proc); - assertTrue(proc.getLoadBalancer() instanceof DefaultServiceLoadBalancer); + assertInstanceOf(DefaultServiceLoadBalancer.class, proc.getLoadBalancer()); DefaultServiceLoadBalancer loadBalancer = (DefaultServiceLoadBalancer) proc.getLoadBalancer(); assertEquals(defaultServiceDiscovery, loadBalancer.getServiceDiscovery()); @@ -296,7 +296,7 @@ public class ServiceCallConfigurationTest { DefaultServiceCallProcessor proc = findServiceCallProcessor(context.getRoute("named")); assertNotNull(proc); - assertTrue(proc.getLoadBalancer() instanceof DefaultServiceLoadBalancer); + assertInstanceOf(DefaultServiceLoadBalancer.class, proc.getLoadBalancer()); DefaultServiceLoadBalancer loadBalancer = (DefaultServiceLoadBalancer) proc.getLoadBalancer(); assertEquals(defaultServiceDiscovery, loadBalancer.getServiceDiscovery()); @@ -308,7 +308,7 @@ public class ServiceCallConfigurationTest { DefaultServiceCallProcessor proc = findServiceCallProcessor(context.getRoute("local")); assertNotNull(proc); - assertTrue(proc.getLoadBalancer() instanceof DefaultServiceLoadBalancer); + assertInstanceOf(DefaultServiceLoadBalancer.class, proc.getLoadBalancer()); DefaultServiceLoadBalancer loadBalancer = (DefaultServiceLoadBalancer) proc.getLoadBalancer(); assertEquals(localServiceDiscovery, loadBalancer.getServiceDiscovery()); @@ -360,19 +360,19 @@ public class ServiceCallConfigurationTest { DefaultServiceCallProcessor proc = findServiceCallProcessor(context.getRoute("default")); assertNotNull(proc); - assertTrue(proc.getLoadBalancer() instanceof DefaultServiceLoadBalancer); + assertInstanceOf(DefaultServiceLoadBalancer.class, proc.getLoadBalancer()); assertEquals("service-name", proc.getName()); assertEquals("file", proc.getScheme()); assertEquals("direct:service-name", proc.getUri()); DefaultServiceLoadBalancer lb = (DefaultServiceLoadBalancer) proc.getLoadBalancer(); - assertTrue(lb.getServiceFilter() instanceof BlacklistServiceFilter); + assertInstanceOf(BlacklistServiceFilter.class, lb.getServiceFilter()); BlacklistServiceFilter filter = (BlacklistServiceFilter) lb.getServiceFilter(); List<ServiceDefinition> blacklist = filter.getBlacklistedServices(); assertEquals(1, blacklist.size()); - assertTrue(lb.getServiceDiscovery() instanceof StaticServiceDiscovery); + assertInstanceOf(StaticServiceDiscovery.class, lb.getServiceDiscovery()); Exchange exchange = new DefaultExchange(context); List<ServiceDefinition> services1 = lb.getServiceDiscovery().getServices("hello-service"); diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultFactoryFinderTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultFactoryFinderTest.java index 3f73e50c170..6283a42c9ab 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultFactoryFinderTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultFactoryFinderTest.java @@ -88,7 +88,7 @@ public class DefaultFactoryFinderTest { factoryFinder.newInstance("TestImplA", TestImplB.class); fail("Exception should have been thrown"); } catch (Exception e) { - assertTrue(e instanceof ClassCastException); + assertInstanceOf(ClassCastException.class, e); } } diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java index a75b58a9448..63bcd5ed35b 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java @@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -125,7 +126,7 @@ public class DefaultHealthCheckRegistryTest { assertNotNull(hc); assertEquals("camel", hc.getGroup()); assertEquals("context", hc.getId()); - assertTrue(hc instanceof ContextHealthCheck); + assertInstanceOf(ContextHealthCheck.class, hc); registry.register(hc); registry.register(new MyHealthCheck("G1", "1")); @@ -157,7 +158,7 @@ public class DefaultHealthCheckRegistryTest { HealthCheckRepository hc = (HealthCheckRepository) registry.resolveById("routes"); assertNotNull(hc); assertEquals("routes", hc.getId()); - assertTrue(hc instanceof RoutesHealthCheckRepository); + assertInstanceOf(RoutesHealthCheckRepository.class, hc); registry.register(hc); context.addRoutes(new RouteBuilder() { diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java index ef6f3828b85..203e078e85d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java @@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertTrue; public class ReadinessAndLivenessTest { @@ -57,7 +58,7 @@ public class ReadinessAndLivenessTest { assertEquals(HealthCheck.State.UP, result.getState()); assertFalse(result.getCheck().isLiveness()); assertTrue(result.getCheck().isReadiness()); - assertTrue(result.getCheck() instanceof MyReadyCheck); + assertInstanceOf(MyReadyCheck.class, result.getCheck()); results = HealthCheckHelper.invokeLiveness(context); assertEquals(1, results.size()); @@ -65,7 +66,7 @@ public class ReadinessAndLivenessTest { assertEquals(HealthCheck.State.DOWN, result.getState()); assertTrue(result.getCheck().isLiveness()); assertFalse(result.getCheck().isReadiness()); - assertTrue(result.getCheck() instanceof MyLiveCheck); + assertInstanceOf(MyLiveCheck.class, result.getCheck()); } @Test @@ -90,7 +91,7 @@ public class ReadinessAndLivenessTest { assertEquals("READINESS", result.getMessage().get()); assertTrue(result.getCheck().isLiveness()); assertTrue(result.getCheck().isReadiness()); - assertTrue(result.getCheck() instanceof MyAllCheck); + assertInstanceOf(MyAllCheck.class, result.getCheck()); results = HealthCheckHelper.invokeLiveness(context); assertEquals(1, results.size()); @@ -99,7 +100,7 @@ public class ReadinessAndLivenessTest { assertTrue(result.getCheck().isLiveness()); assertTrue(result.getCheck().isReadiness()); assertEquals("LIVENESS", result.getMessage().get()); - assertTrue(result.getCheck() instanceof MyAllCheck); + assertInstanceOf(MyAllCheck.class, result.getCheck()); } private static class MyReadyCheck extends AbstractHealthCheck implements CamelContextAware { diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingAllowDenyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingAllowDenyTest.java index 48b9b7a5f39..a8573c2231a 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingAllowDenyTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingAllowDenyTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; public class StreamCachingAllowDenyTest extends ContextTestSupport { @@ -53,7 +53,7 @@ public class StreamCachingAllowDenyTest extends ContextTestSupport { template.sendBody("direct:a", new ByteArrayInputStream("Hello World".getBytes())); assertMockEndpointsSatisfied(); // should be converted - assertTrue(a.getReceivedExchanges().get(0).getMessage().getBody() instanceof StreamCache); + assertInstanceOf(StreamCache.class, a.getReceivedExchanges().get(0).getMessage().getBody()); assertEquals("Hello World", a.assertExchangeReceived(0).getIn().getBody(String.class)); @@ -93,7 +93,7 @@ public class StreamCachingAllowDenyTest extends ContextTestSupport { template.sendBody("direct:a", new StringReader("Bye World")); assertMockEndpointsSatisfied(); // should be converted - assertTrue(a.getReceivedExchanges().get(0).getMessage().getBody() instanceof StreamCache); + assertInstanceOf(StreamCache.class, a.getReceivedExchanges().get(0).getMessage().getBody()); assertEquals("Bye World", a.assertExchangeReceived(0).getIn().getBody(String.class)); } @@ -114,7 +114,7 @@ public class StreamCachingAllowDenyTest extends ContextTestSupport { template.sendBody("direct:a", new ByteArrayInputStream("Hello World".getBytes())); assertMockEndpointsSatisfied(); // should be converted - assertTrue(a.getReceivedExchanges().get(0).getMessage().getBody() instanceof StreamCache); + assertInstanceOf(StreamCache.class, a.getReceivedExchanges().get(0).getMessage().getBody()); assertEquals("Hello World", a.assertExchangeReceived(0).getIn().getBody(String.class)); diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageStreamTwoTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageStreamTwoTest.java index ae62455e39e..d344b64ecb0 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageStreamTwoTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageStreamTwoTest.java @@ -57,7 +57,7 @@ public class OnExceptionUseOriginalMessageStreamTwoTest extends ContextTestSuppo .process(new Processor() { @Override public void process(Exchange exchange) throws Exception { - Assertions.assertTrue(exchange.getMessage().getBody() instanceof StreamCache); + Assertions.assertInstanceOf(StreamCache.class, exchange.getMessage().getBody()); String s = exchange.getMessage().getBody(String.class); list1.add(s); } @@ -65,7 +65,7 @@ public class OnExceptionUseOriginalMessageStreamTwoTest extends ContextTestSuppo .process(new Processor() { @Override public void process(Exchange exchange) throws Exception { - Assertions.assertTrue(exchange.getMessage().getBody() instanceof StreamCache); + Assertions.assertInstanceOf(StreamCache.class, exchange.getMessage().getBody()); String s = exchange.getMessage().getBody(String.class); list2.add(s); } diff --git a/core/camel-core/src/test/java/org/apache/camel/reifier/ProcessorReifierTest.java b/core/camel-core/src/test/java/org/apache/camel/reifier/ProcessorReifierTest.java index 89ce12b6924..c18fc6ee334 100644 --- a/core/camel-core/src/test/java/org/apache/camel/reifier/ProcessorReifierTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/reifier/ProcessorReifierTest.java @@ -28,7 +28,7 @@ public class ProcessorReifierTest { Route ctx = new DefaultRoute(null, null, null, null, null, null); ProcessorReifier.registerReifier(MyProcessorDefinition.class, ProcessReifier::new); ProcessReifier ref = (ProcessReifier) ProcessorReifier.reifier(ctx, new MyProcessorDefinition()); - Assertions.assertTrue(ref.definition instanceof MyProcessorDefinition); + Assertions.assertInstanceOf(MyProcessorDefinition.class, ref.definition); } public static class MyProcessorDefinition extends ProcessDefinition { diff --git a/core/camel-core/src/test/java/org/apache/camel/reifier/dataformat/DataFormatReifierTest.java b/core/camel-core/src/test/java/org/apache/camel/reifier/dataformat/DataFormatReifierTest.java index 3e7f074a555..64059405660 100644 --- a/core/camel-core/src/test/java/org/apache/camel/reifier/dataformat/DataFormatReifierTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/reifier/dataformat/DataFormatReifierTest.java @@ -28,7 +28,7 @@ public class DataFormatReifierTest { DefaultCamelContext context = new DefaultCamelContext(); DataFormatReifier.registerReifier(MyDataFormat.class, CustomDataFormatReifier::new); DataFormatReifier<?> ref = DataFormatReifier.reifier(context, new MyDataFormat()); - Assertions.assertTrue(ref.definition instanceof MyDataFormat); + Assertions.assertInstanceOf(MyDataFormat.class, ref.definition); } public static class MyDataFormat extends CustomDataFormat { diff --git a/core/camel-core/src/test/java/org/apache/camel/support/CustomizersTest.java b/core/camel-core/src/test/java/org/apache/camel/support/CustomizersTest.java index 88d7a37d9de..38b1dbce3d7 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/CustomizersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/CustomizersTest.java @@ -139,7 +139,7 @@ public class CustomizersTest { LogComponent.class, target -> target.setExchangeFormatter(new MyExchangeFormatter()))); - assertTrue(context.getComponent("log", LogComponent.class).getExchangeFormatter() instanceof MyExchangeFormatter); + assertInstanceOf(MyExchangeFormatter.class, context.getComponent("log", LogComponent.class).getExchangeFormatter()); } @Test @@ -166,7 +166,7 @@ public class CustomizersTest { LogComponent.class, target -> target.setExchangeFormatter(new MyExchangeFormatter()))); - assertTrue(context.getComponent("log", LogComponent.class).getExchangeFormatter() instanceof MyExchangeFormatter); + assertInstanceOf(MyExchangeFormatter.class, context.getComponent("log", LogComponent.class).getExchangeFormatter()); } @ParameterizedTest @@ -202,7 +202,7 @@ public class CustomizersTest { LogComponent.class, target -> target.setExchangeFormatter(new MyExchangeFormatter()))); - assertTrue(context.getComponent("log", LogComponent.class).getExchangeFormatter() instanceof MyExchangeFormatter); + assertInstanceOf(MyExchangeFormatter.class, context.getComponent("log", LogComponent.class).getExchangeFormatter()); } // ***************************** @@ -228,9 +228,9 @@ public class CustomizersTest { assertNotEquals(df1, df2); - assertTrue(df1 instanceof MyDataFormat); + assertInstanceOf(MyDataFormat.class, df1); assertEquals(1, ((MyDataFormat) df1).getId()); - assertTrue(df2 instanceof MyDataFormat); + assertInstanceOf(MyDataFormat.class, df2); assertEquals(2, ((MyDataFormat) df2).getId()); } @@ -254,9 +254,9 @@ public class CustomizersTest { assertNotEquals(df1, df2); - assertTrue(df1 instanceof MyDataFormat); + assertInstanceOf(MyDataFormat.class, df1); assertEquals(0, ((MyDataFormat) df1).getId()); - assertTrue(df2 instanceof MyDataFormat); + assertInstanceOf(MyDataFormat.class, df2); assertEquals(0, ((MyDataFormat) df2).getId()); } diff --git a/core/camel-core/src/test/java/org/apache/camel/util/IOHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/util/IOHelperTest.java index c977f8b8766..657aec9d202 100644 --- a/core/camel-core/src/test/java/org/apache/camel/util/IOHelperTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/util/IOHelperTest.java @@ -41,14 +41,14 @@ public class IOHelperTest { public void testIOException() { IOException io = new IOException("Damn", new IllegalArgumentException("Damn")); assertEquals("Damn", io.getMessage()); - assertTrue(io.getCause() instanceof IllegalArgumentException); + assertInstanceOf(IllegalArgumentException.class, io.getCause()); } @Test public void testIOExceptionWithMessage() { IOException io = new IOException("Not again", new IllegalArgumentException("Damn")); assertEquals("Not again", io.getMessage()); - assertTrue(io.getCause() instanceof IllegalArgumentException); + assertInstanceOf(IllegalArgumentException.class, io.getCause()); } @Test diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainCustomizerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainCustomizerTest.java index 917f9c6f7de..70e6513d7a0 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainCustomizerTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainCustomizerTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; public class MainCustomizerTest { @Test @@ -40,7 +40,7 @@ public class MainCustomizerTest { main.start(); LogComponent component = main.getCamelContext().getComponent("log", LogComponent.class); - assertTrue(component.getExchangeFormatter() instanceof MyFormatter); + assertInstanceOf(MyFormatter.class, component.getExchangeFormatter()); } finally { main.stop(); } diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java index fd09d95c25e..65222b0eab4 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java @@ -84,7 +84,7 @@ public class MainIoCTest { // and seda should be created and use the custom queue factory Object qf = seda.getDefaultQueueFactory(); assertNotNull(qf); - assertTrue(qf instanceof PriorityBlockingQueueFactory); + assertInstanceOf(PriorityBlockingQueueFactory.class, qf); assertSame(camelContext, seda.getCamelContext()); MyConfiguration.MyCoolBean mcb = (MyConfiguration.MyCoolBean) camelContext.getRegistry().lookupByName("MyCoolBean"); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java index 5b80fe562a9..23ec4124636 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java @@ -22,8 +22,8 @@ import org.apache.camel.component.seda.SedaComponent; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class MainSedaTest { @@ -40,7 +40,7 @@ public class MainSedaTest { SedaComponent seda = camelContext.getComponent("seda", SedaComponent.class); assertNotNull(seda); - assertTrue(seda.getDefaultQueueFactory() instanceof MySedaBlockingQueueFactory); + assertInstanceOf(MySedaBlockingQueueFactory.class, seda.getDefaultQueueFactory()); MySedaBlockingQueueFactory myBQF = (MySedaBlockingQueueFactory) seda.getDefaultQueueFactory(); assertEquals(123, myBQF.getCounter()); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSedaWildcardTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSedaWildcardTest.java index ee91e52e0a0..e8bced7906b 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainSedaWildcardTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSedaWildcardTest.java @@ -22,8 +22,8 @@ import org.apache.camel.component.seda.SedaComponent; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class MainSedaWildcardTest { @@ -43,13 +43,13 @@ public class MainSedaWildcardTest { SedaComponent seda = camelContext.getComponent("seda", SedaComponent.class); assertNotNull(seda); - assertTrue(seda.getDefaultQueueFactory() instanceof MySedaBlockingQueueFactory); + assertInstanceOf(MySedaBlockingQueueFactory.class, seda.getDefaultQueueFactory()); MySedaBlockingQueueFactory myBQF = (MySedaBlockingQueueFactory) seda.getDefaultQueueFactory(); assertEquals(123, myBQF.getCounter()); SedaComponent seda2 = camelContext.getComponent("seda", SedaComponent.class); assertNotNull(seda2); - assertTrue(seda2.getDefaultQueueFactory() instanceof MySedaBlockingQueueFactory); + assertInstanceOf(MySedaBlockingQueueFactory.class, seda2.getDefaultQueueFactory()); myBQF = (MySedaBlockingQueueFactory) seda2.getDefaultQueueFactory(); assertEquals(123, myBQF.getCounter()); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java index 7bf38871057..4c3d5673f91 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java @@ -31,8 +31,8 @@ import org.apache.camel.spi.SupervisingRouteController; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class MainSupervisingRouteControllerTest { @@ -74,7 +74,7 @@ public class MainSupervisingRouteControllerTest { Throwable e = src.getRestartException("cake"); assertNotNull(e); assertEquals("Cannot start", e.getMessage()); - assertTrue(e instanceof IllegalArgumentException); + assertInstanceOf(IllegalArgumentException.class, e); // bar is no auto startup assertEquals("Stopped", main.camelContext.getRouteController().getRouteStatus("bar").toString()); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainVaultTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainVaultTest.java index 18fcbe55a8e..c6f817c0918 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainVaultTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainVaultTest.java @@ -201,7 +201,7 @@ public class MainVaultTest { Assertions.assertEquals("id1", cfg.getClientId()); Assertions.assertEquals("secret1", cfg.getClientSecret()); Assertions.assertEquals("tenant1", cfg.getTenantId()); - Assertions.assertEquals(false, cfg.isAzureIdentityEnabled()); + Assertions.assertFalse(cfg.isAzureIdentityEnabled()); main.stop(); } @@ -227,7 +227,7 @@ public class MainVaultTest { Assertions.assertEquals("id1", cfg.getClientId()); Assertions.assertEquals("secret1", cfg.getClientSecret()); Assertions.assertEquals("tenant1", cfg.getTenantId()); - Assertions.assertEquals(false, cfg.isAzureIdentityEnabled()); + Assertions.assertFalse(cfg.isAzureIdentityEnabled()); main.stop(); } diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFailoverLoadBalancerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFailoverLoadBalancerTest.java index 90ec1f34289..450af5530e5 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFailoverLoadBalancerTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFailoverLoadBalancerTest.java @@ -33,6 +33,7 @@ import org.junit.jupiter.api.condition.OS; import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_PROCESSOR; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledOnOs(OS.AIX) public class ManagedFailoverLoadBalancerTest extends ManagementTestSupport { @@ -70,10 +71,10 @@ public class ManagedFailoverLoadBalancerTest extends ManagementTestSupport { assertEquals(2, size.intValue()); Boolean roundRobin = (Boolean) mbeanServer.getAttribute(on, "RoundRobin"); - assertEquals(true, roundRobin.booleanValue()); + assertTrue(roundRobin.booleanValue()); Boolean sticky = (Boolean) mbeanServer.getAttribute(on, "Sticky"); - assertEquals(true, sticky.booleanValue()); + assertTrue(sticky.booleanValue()); Integer attempts = (Integer) mbeanServer.getAttribute(on, "MaximumFailoverAttempts"); assertEquals(3, attempts.intValue()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedMulticastTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedMulticastTest.java index 8b8dda7b23b..c020959c076 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedMulticastTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedMulticastTest.java @@ -27,6 +27,7 @@ import org.junit.jupiter.api.condition.OS; import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT; import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_PROCESSOR; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; @DisabledOnOs(OS.AIX) public class ManagedMulticastTest extends ManagementTestSupport { @@ -59,7 +60,7 @@ public class ManagedMulticastTest extends ManagementTestSupport { assertEquals(3, total.intValue()); Boolean parallel = (Boolean) mbeanServer.getAttribute(name, "ParallelProcessing"); - assertEquals(false, parallel.booleanValue()); + assertFalse(parallel.booleanValue()); } @Override diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java index b6126b2ddc9..9e98ebbd582 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRecipientListTest.java @@ -31,6 +31,7 @@ import org.junit.jupiter.api.condition.OS; import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_PROCESSOR; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @DisabledOnOs(OS.AIX) @@ -74,7 +75,7 @@ public class ManagedRecipientListTest extends ManagementTestSupport { assertEquals(ServiceStatus.Started.name(), state); Boolean parallel = (Boolean) mbeanServer.getAttribute(on, "ParallelProcessing"); - assertEquals(false, parallel.booleanValue()); + assertFalse(parallel.booleanValue()); String lan = (String) mbeanServer.getAttribute(on, "ExpressionLanguage"); assertEquals("header", lan); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRefProducerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRefProducerTest.java index 0e254cf018e..aa6b348c5a6 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRefProducerTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRefProducerTest.java @@ -58,7 +58,7 @@ public class ManagedRefProducerTest extends ManagementTestSupport { for (ObjectName on : set) { boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); assertTrue(uri.equals("mock://foo") || uri.equals("mock://result"), uri); @@ -73,7 +73,7 @@ public class ManagedRefProducerTest extends ManagementTestSupport { for (ObjectName on : set) { boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); assertTrue(uri.equals("direct://start") || uri.equals("ref://foo") || uri.equals("mock://foo") diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java index 5b0446cacfa..7b8dc4d6d9b 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java @@ -28,6 +28,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledOnOs(OS.AIX) public class ManagedRegisterRouteTest extends ManagementTestSupport { @@ -42,7 +43,7 @@ public class ManagedRegisterRouteTest extends ManagementTestSupport { ObjectName on = set.iterator().next(); boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); // the route has this starting endpoint uri @@ -69,7 +70,7 @@ public class ManagedRegisterRouteTest extends ManagementTestSupport { context.getRouteController().stopRoute(context.getRouteDefinitions().get(0).getId()); registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); // should be stopped, eg its removed state = (String) mbeanServer.getAttribute(on, "State"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java index ee4cbf66df2..42be2b6a678 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java @@ -56,7 +56,7 @@ public class ManagedRouteRestartTest extends ManagementTestSupport { ObjectName on = set.iterator().next(); boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); // the route has this starting endpoint uri @@ -76,7 +76,7 @@ public class ManagedRouteRestartTest extends ManagementTestSupport { mbeanServer.invoke(on, "restart", null, null); registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); // should be started state = (String) mbeanServer.getAttribute(on, "State"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopAndFailTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopAndFailTest.java index 3e12f90cc36..001e4517147 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopAndFailTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopAndFailTest.java @@ -52,7 +52,7 @@ public class ManagedRouteStopAndFailTest extends ManagementTestSupport { ObjectName on = set.iterator().next(); boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); // the route has this starting endpoint uri @@ -74,7 +74,7 @@ public class ManagedRouteStopAndFailTest extends ManagementTestSupport { mbeanServer.invoke(on, "stopAndFail", null, null); registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); // should be stopped, eg its removed state = (String) mbeanServer.getAttribute(on, "State"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java index 9fa9ffe4985..27008407dea 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java @@ -49,7 +49,7 @@ public class ManagedRouteStopTest extends ManagementTestSupport { ObjectName on = set.iterator().next(); boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); // the route has this starting endpoint uri @@ -69,7 +69,7 @@ public class ManagedRouteStopTest extends ManagementTestSupport { mbeanServer.invoke(on, "stop", null, null); registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); // should be stopped, eg its removed state = (String) mbeanServer.getAttribute(on, "State"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSedaEndpointTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSedaEndpointTest.java index 0dcc84ba2cc..69cdc602c5e 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSedaEndpointTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSedaEndpointTest.java @@ -55,7 +55,7 @@ public class ManagedSedaEndpointTest extends ManagementTestSupport { assertEquals(0, size.intValue()); Boolean singleton = (Boolean) mbeanServer.getAttribute(name, "Singleton"); - assertEquals(true, singleton.booleanValue()); + assertTrue(singleton.booleanValue()); // stop route context.getRouteController().stopRoute("foo"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java index ed0142249f9..6251045bdef 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java @@ -54,7 +54,7 @@ public class ManagedSetAndRemoveHeaderAndPropertiesTest extends ManagementTestSu for (ObjectName on : set) { boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); // should be one with name setFoo String id = (String) mbeanServer.getAttribute(on, "ProcessorId"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java index f3b9efee03d..4f25688682c 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java @@ -29,6 +29,7 @@ import org.junit.jupiter.api.condition.OS; import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_THREAD_POOL; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledIfSystemProperty(named = "camel.threads.virtual.enabled", matches = "true", @@ -43,7 +44,7 @@ public class ManagedThreadPoolProfileTest extends ManagementTestSupport { ObjectName on = getCamelObjectName(TYPE_THREAD_POOL, "mythreads(threads)"); Boolean shutdown = (Boolean) mbeanServer.getAttribute(on, "Shutdown"); - assertEquals(false, shutdown.booleanValue()); + assertFalse(shutdown.booleanValue()); Integer corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize"); assertEquals(5, corePoolSize.intValue()); @@ -58,7 +59,7 @@ public class ManagedThreadPoolProfileTest extends ManagementTestSupport { assertEquals(25, keepAlive.intValue()); Boolean allow = (Boolean) mbeanServer.getAttribute(on, "AllowCoreThreadTimeout"); - assertEquals(true, allow.booleanValue()); + assertTrue(allow.booleanValue()); getMockEndpoint("mock:result").expectedMessageCount(1); template.sendBody("direct:start", "Hello World"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java index ce8be83dbb6..b4f1a0a759e 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java @@ -34,6 +34,8 @@ import org.junit.jupiter.api.condition.OS; import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_THREAD_POOL; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledIfSystemProperty(named = "camel.threads.virtual.enabled", matches = "true", disabledReason = "In case of Virtual Threads, the created thread pools don't have all these attributes") @@ -47,7 +49,7 @@ public class ManagedThreadPoolTest extends ManagementTestSupport { ObjectName on = getCamelObjectName(TYPE_THREAD_POOL, "mythreads(threads)"); Boolean shutdown = (Boolean) mbeanServer.getAttribute(on, "Shutdown"); - assertEquals(false, shutdown.booleanValue()); + assertFalse(shutdown.booleanValue()); Integer corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize"); assertEquals(15, corePoolSize.intValue()); @@ -62,7 +64,7 @@ public class ManagedThreadPoolTest extends ManagementTestSupport { assertEquals(60, keepAlive.intValue()); Boolean allow = (Boolean) mbeanServer.getAttribute(on, "AllowCoreThreadTimeout"); - assertEquals(true, allow.booleanValue()); + assertTrue(allow.booleanValue()); getMockEndpoint("mock:result").expectedMessageCount(1); template.sendBody("direct:start", "Hello World"); @@ -82,7 +84,7 @@ public class ManagedThreadPoolTest extends ManagementTestSupport { assertEquals(0, size.intValue()); Boolean empty = (Boolean) mbeanServer.getAttribute(on, "TaskQueueEmpty"); - assertEquals(true, empty.booleanValue()); + assertTrue(empty.booleanValue()); int remainingCapacity = (Integer) mbeanServer.invoke(on, "getTaskQueueRemainingCapacity", null, null); assertEquals(200, remainingCapacity, "remainingCapacity"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java index 9116e20f8ef..5da899121a4 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java @@ -27,6 +27,7 @@ import org.junit.jupiter.api.condition.OS; import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_THREAD_POOL; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; @DisabledIfSystemProperty(named = "camel.threads.virtual.enabled", matches = "true", disabledReason = "In case of Virtual Threads, the created thread pools don't have all these attributes") @@ -40,7 +41,7 @@ public class ManagedThreadPoolWithIdTest extends ManagementTestSupport { ObjectName on = getCamelObjectName(TYPE_THREAD_POOL, "myThreads(threads)"); Boolean shutdown = (Boolean) mbeanServer.getAttribute(on, "Shutdown"); - assertEquals(false, shutdown.booleanValue()); + assertFalse(shutdown.booleanValue()); Integer corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize"); assertEquals(15, corePoolSize.intValue()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java index 65f63a1e189..57e59be7494 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlingExceptionRoutePolicyTest.java @@ -51,7 +51,7 @@ public class ManagedThrottlingExceptionRoutePolicyTest extends ManagementTestSup assertEquals(1, set.size()); ObjectName on = set.iterator().next(); boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); // check the starting endpoint uri String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlingInflightRoutePolicyTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlingInflightRoutePolicyTest.java index a4a433b4822..f1355a2ee3f 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlingInflightRoutePolicyTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThrottlingInflightRoutePolicyTest.java @@ -45,7 +45,7 @@ public class ManagedThrottlingInflightRoutePolicyTest extends ManagementTestSupp ObjectName on = set.iterator().next(); boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); // the route has this starting endpoint uri diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedTimerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedTimerTest.java index 512385c9c23..309df4e5b20 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedTimerTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedTimerTest.java @@ -30,6 +30,7 @@ import org.junit.jupiter.api.condition.OS; import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledOnOs(OS.AIX) public class ManagedTimerTest extends ManagementTestSupport { @@ -39,7 +40,7 @@ public class ManagedTimerTest extends ManagementTestSupport { MBeanServer mbeanServer = getMBeanServer(); ObjectName name = getCamelObjectName(TYPE_ENDPOINT, "timer://foo\\?delay=5000&period=8000"); - assertEquals(true, mbeanServer.isRegistered(name), "Should be registered"); + assertTrue(mbeanServer.isRegistered(name), "Should be registered"); Long period = (Long) mbeanServer.getAttribute(name, "Period"); assertEquals(8000, period.longValue()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java b/core/camel-management/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java index 08f7802b9a8..2459e0ef5bf 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java @@ -65,7 +65,7 @@ public class RemoveRouteDefinitionTest extends ManagementTestSupport { ObjectName on = set.iterator().next(); boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); RouteDefinition definition = context.getRouteDefinition("route1"); List<RouteDefinition> routeDefinitions = new ArrayList<>(); @@ -89,7 +89,7 @@ public class RemoveRouteDefinitionTest extends ManagementTestSupport { ObjectName on = set.iterator().next(); boolean registered = mbeanServer.isRegistered(on); - assertEquals(true, registered, "Should be registered"); + assertTrue(registered, "Should be registered"); RouteDefinition definition = context.getRouteDefinition("route1"); List<RouteDefinition> routeDefinitions = new ArrayList<>();