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 e9e068d0382a7369705617595226c488be8c1c08 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 16:53:27 2020 +0200 [CAMEL-11807] Fix a bunch of references to org.junit.Assert --- .../arangodb/ArangoCollectionDeleteTest.java | 4 ++-- .../arangodb/ArangoCollectionFindByKeyTest.java | 4 ++-- .../arangodb/ArangoCollectionSaveTest.java | 4 ++-- .../component/arangodb/ArangoDbComponentTest.java | 4 ++-- .../ResultSetConversionStrategiesTest.java | 6 +++--- .../consul/cloud/ConsulServiceDiscoveryTest.java | 2 +- .../camel/component/fhir/FhirConfigurationIT.java | 4 ++-- .../FhirXmlDataformatErrorHandlerSpringTest.java | 1 - .../camel/component/ipfs/SimpleIPFSTest.java | 14 ++++++------- .../apache/camel/component/ldap/LdapRouteTest.java | 2 +- .../quickfixj/QuickfixjComponentTest.java | 10 ++++----- .../quickfixj/QuickfixjLazyProducerTest.java | 2 +- .../component/rabbitmq/RabbitConsumerHangTest.java | 2 +- .../component/rabbitmq/RabbitMQConsumerTest.java | 4 ++-- .../component/rabbitmq/RabbitMQProducerTest.java | 6 +++--- .../integration/RabbitMQDeadLetterArgsIntTest.java | 24 ++++++++++++---------- .../RabbitMQDeadLetterRoutingKeyIntTest.java | 2 +- .../RabbitMQTemporaryQueueAutoRecoveryIntTest.java | 4 ++-- .../reactive/streams/DelayedMonoPublisherTest.java | 4 ++-- ...alesforceJwtBearerTokenFlowIntegrationTest.java | 6 +++--- .../camel/component/slack/SlackConsumerTest.java | 7 +++---- .../spring/ws/ProducerRemoteRouteTest.java | 5 ++--- .../spring/ws/SoapResponseAttachmentTest.java | 3 +-- .../builder/endpoint/FtpRawParameterTest.java | 6 +++--- .../camel/builder/endpoint/LogAdvancedTest.java | 2 +- .../camel/builder/endpoint/LogToDAdvancedTest.java | 2 +- .../camel/builder/endpoint/NormalizedUriTest.java | 2 +- .../apache/camel/builder/endpoint/PahoTest.java | 4 ++-- .../apache/camel/builder/endpoint/QuartzTest.java | 5 ++--- .../builder/endpoint/RabbitMQMultiValueTest.java | 4 ++-- .../camel/builder/endpoint/TimerAdvancedTest.java | 2 +- 31 files changed, 74 insertions(+), 77 deletions(-) diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionDeleteTest.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionDeleteTest.java index 5cca4ed..5558b1d 100644 --- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionDeleteTest.java +++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionDeleteTest.java @@ -26,8 +26,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.apache.camel.component.arangodb.ArangoDbConstants.MULTI_DELETE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; public class ArangoCollectionDeleteTest extends AbstractArangoDbTest { diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionFindByKeyTest.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionFindByKeyTest.java index 67e046a..381db3a 100644 --- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionFindByKeyTest.java +++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionFindByKeyTest.java @@ -28,9 +28,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.apache.camel.component.arangodb.ArangoDbConstants.RESULT_CLASS_TYPE; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; 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 ArangoCollectionFindByKeyTest extends AbstractArangoDbTest { private ArangoCollection collection; diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionSaveTest.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionSaveTest.java index 58154f5..296618c 100644 --- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionSaveTest.java +++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoCollectionSaveTest.java @@ -36,8 +36,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.apache.camel.component.arangodb.ArangoDbConstants.MULTI_INSERT; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +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 ArangoCollectionSaveTest extends AbstractArangoDbTest { diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoDbComponentTest.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoDbComponentTest.java index f5ce518..8e57469 100644 --- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoDbComponentTest.java +++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/ArangoDbComponentTest.java @@ -20,8 +20,8 @@ import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class ArangoDbComponentTest extends CamelTestSupport { diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java index 8856375..d8ec63a 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/ResultSetConversionStrategiesTest.java @@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.core.cql.ResultSet; import com.datastax.oss.driver.api.core.cql.Row; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java index 3711dab..40e8cec 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java @@ -32,7 +32,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.util.SocketUtils; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; public class ConsulServiceDiscoveryTest extends ConsulTestSupport { diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java index 6c6f5be..4bd102f 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java @@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.fhir.internal.FhirApiCollection; import org.apache.camel.component.fhir.internal.FhirCreateApiMethod; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -81,7 +81,7 @@ public class FhirConfigurationIT extends AbstractFhirTestSupport { assertEquals(5, interceptors.size()); long counter = context.adapt(ExtendedCamelContext.class).getBeanIntrospection().getInvokedCounter(); - Assert.assertEquals("Should not use reflection", 0, counter); + assertEquals(0, counter, "Should not use reflection"); } @Override diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java index c3a4181..e087f3b 100644 --- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java +++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java @@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java index fbb0c25..218f0ff 100644 --- a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java +++ b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java @@ -29,11 +29,11 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.Assume; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; /* @@ -77,7 +77,7 @@ public class SimpleIPFSTest { assertTrue(resA.startsWith("0.4"), "Expecting 0.4 in: " + resA); } catch (Exception e) { boolean notRunning = e.getCause().getMessage().contains("Is IPFS running"); - Assume.assumeFalse("IPFS is running", notRunning); + assumeFalse(notRunning, "IPFS is running"); } } } @@ -103,7 +103,7 @@ public class SimpleIPFSTest { assertEquals(SINGLE_HASH, res); } catch (Exception e) { boolean notRunning = e.getCause().getMessage().contains("Is IPFS running"); - Assume.assumeFalse("IPFS is running", notRunning); + assumeFalse(notRunning, "IPFS is running"); } } } @@ -131,7 +131,7 @@ public class SimpleIPFSTest { assertEquals(RECURSIVE_HASH, res.get(9)); } catch (Exception e) { boolean notRunning = e.getCause().getMessage().contains("Is IPFS running"); - Assume.assumeFalse("IPFS is running", notRunning); + assumeFalse(notRunning, "IPFS is running"); } } } @@ -156,7 +156,7 @@ public class SimpleIPFSTest { verifyFileContent(res); } catch (Exception e) { boolean notRunning = e.getCause().getMessage().contains("Is IPFS running"); - Assume.assumeFalse("IPFS is running", notRunning); + assumeFalse(notRunning, "IPFS is running"); } } } @@ -182,7 +182,7 @@ public class SimpleIPFSTest { verifyFileContent(new FileInputStream(res.toFile())); } catch (Exception e) { boolean notRunning = e.getCause().getMessage().contains("Is IPFS running"); - Assume.assumeFalse("IPFS is running", notRunning); + assumeFalse(notRunning, "IPFS is running"); } } } @@ -209,7 +209,7 @@ public class SimpleIPFSTest { assertTrue(res.resolve("index.html").toFile().exists()); } catch (Exception e) { boolean notRunning = e.getCause().getMessage().contains("Is IPFS running"); - Assume.assumeFalse("IPFS is running", notRunning); + assumeFalse(notRunning, "IPFS is running"); } } } diff --git a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java index e477267..62e6ecb 100644 --- a/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java +++ b/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapRouteTest.java @@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext; -import static org.junit.Assert.assertEquals; +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.assertNull; diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java index 81d99cd..3b6461d 100644 --- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java +++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjComponentTest.java @@ -67,8 +67,8 @@ import quickfix.mina.ProtocolFactory; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; public class QuickfixjComponentTest { private File settingsFile; @@ -349,7 +349,7 @@ public class QuickfixjComponentTest { // will start the component camelContext.start(); - assertTrue("Session not created", latch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(latch.await(5000, TimeUnit.MILLISECONDS), "Session not created"); component.stop(); @@ -406,7 +406,7 @@ public class QuickfixjComponentTest { // will start the component camelContext.start(); - assertTrue("Session not created", logonLatch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(logonLatch.await(5000, TimeUnit.MILLISECONDS), "Session not created"); Endpoint producerEndpoint = component.createEndpoint(getEndpointUri(settingsFile.getName(), acceptorSessionID)); Producer producer = producerEndpoint.createProducer(); @@ -426,7 +426,7 @@ public class QuickfixjComponentTest { producer2.process(exchange); - assertTrue("Messages not received", messageLatch.await(5000, TimeUnit.MILLISECONDS)); + assertTrue(messageLatch.await(5000, TimeUnit.MILLISECONDS), "Messages not received"); } @Test diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java index 1e71767..9698dae 100644 --- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java +++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java @@ -32,7 +32,7 @@ import quickfix.field.SenderCompID; import quickfix.field.TargetCompID; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; @Disabled("Fails on CI server sometimes") public class QuickfixjLazyProducerTest { diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java index f6505db..fea6025 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.mockito.Mockito; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class RabbitConsumerHangTest { diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java index 3bb1757..27b6e66 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java @@ -28,8 +28,8 @@ import org.apache.camel.Processor; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java index 2335752..dd68bf4 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java @@ -34,9 +34,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; public class RabbitMQProducerTest { diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java index ccd9044..755196c 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java @@ -31,9 +31,11 @@ import org.apache.camel.component.rabbitmq.RabbitMQEndpoint; import org.apache.camel.util.json.JsonArray; import org.apache.camel.util.json.JsonObject; import org.apache.camel.util.json.Jsoner; -import org.junit.Assert; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class RabbitMQDeadLetterArgsIntTest extends AbstractRabbitMQIntTest { private static final String LOCAL_RABBITMQ_PARAMS = "hostname=localhost&portNumber=5672&username=cameltest&password=cameltest"; private static final String QUEUE = "queue"; @@ -107,8 +109,8 @@ public class RabbitMQDeadLetterArgsIntTest extends AbstractRabbitMQIntTest { receivedEndpoint.assertIsSatisfied(); RabbitMQEndpoint endpoint = (RabbitMQEndpoint) context.getRoute("consumer").getEndpoint(); - Assert.assertNotNull(endpoint.getDlqArgs()); - Assert.assertEquals(10, endpoint.getDlqArgs().get("x-max-priority")); + assertNotNull(endpoint.getDlqArgs()); + assertEquals(10, endpoint.getDlqArgs().get("x-max-priority")); String rabbitApiResponse = template.requestBody( String.format("http://localhost:%s/api/queues?authUsername=cameltest&authPassword=cameltest&authMethod=Basic&httpMethod=GET";, DockerTestUtils.EXPOSE_PORT_MANAGEMENT), @@ -120,15 +122,15 @@ public class RabbitMQDeadLetterArgsIntTest extends AbstractRabbitMQIntTest { JsonObject queueSkipDeclareObject = (JsonObject) rabbitApiResponseJson.stream().filter(jsonQueueFilter(QUEUE_SKIP_DECLARE)).findAny().orElse(null); JsonObject dlqSkipDeclareObject = (JsonObject) rabbitApiResponseJson.stream().filter(jsonQueueFilter(DLQ_SKIP_DECLARE)).findAny().orElse(null); - Assert.assertNotNull(String.format("Queue with name '%s' not found in REST API. API response was '%s'", DLQ, rabbitApiResponse), dlqObject); - Assert.assertNotNull(String.format("Queue with name '%s' not found in REST API. API response was '%s'", QUEUE, rabbitApiResponse), queueObject); - Assert.assertNotNull(String.format("Queue with name '%s' not found in REST API. API response was '%s'", QUEUE_SKIP_DECLARE, rabbitApiResponse), queueObject); - Assert.assertNotNull(String.format("Queue with name '%s' not found in REST API. API response was '%s'", DLQ_SKIP_DECLARE, rabbitApiResponse), dlqSkipDeclareObject); + assertNotNull(dlqObject, String.format("Queue with name '%s' not found in REST API. API response was '%s'", DLQ, rabbitApiResponse)); + assertNotNull(queueObject, String.format("Queue with name '%s' not found in REST API. API response was '%s'", QUEUE, rabbitApiResponse)); + assertNotNull(queueObject, String.format("Queue with name '%s' not found in REST API. API response was '%s'", QUEUE_SKIP_DECLARE, rabbitApiResponse)); + assertNotNull(dlqSkipDeclareObject, String.format("Queue with name '%s' not found in REST API. API response was '%s'", DLQ_SKIP_DECLARE, rabbitApiResponse)); - Assert.assertEquals(BigDecimal.valueOf(10), dlqObject.getMap("arguments").get("x-max-priority")); - Assert.assertEquals(BigDecimal.valueOf(5), dlqSkipDeclareObject.getMap("arguments").get("x-max-priority")); - Assert.assertEquals("dlqexchange", queueObject.getMap("arguments").get("x-dead-letter-exchange")); - Assert.assertEquals("anotherExchange", queueSkipDeclareObject.getMap("arguments").get("x-dead-letter-exchange")); + assertEquals(BigDecimal.valueOf(10), dlqObject.getMap("arguments").get("x-max-priority")); + assertEquals(BigDecimal.valueOf(5), dlqSkipDeclareObject.getMap("arguments").get("x-max-priority")); + assertEquals("dlqexchange", queueObject.getMap("arguments").get("x-dead-letter-exchange")); + assertEquals("anotherExchange", queueSkipDeclareObject.getMap("arguments").get("x-dead-letter-exchange")); } private Predicate<Object> jsonQueueFilter(String name) { diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java index 664a470..4352fd6 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.apache.camel.test.junit5.TestSupport.assertListSize; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class RabbitMQDeadLetterRoutingKeyIntTest extends AbstractRabbitMQIntTest { diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java index c9bad9b..9af56ce 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java @@ -31,8 +31,8 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.rabbitmq.RabbitMQConstants; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; /** * Integration test to check if temporary queue's name change is properly handled after auto recovering diff --git a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java index d89780d..41993b9 100644 --- a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java +++ b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/DelayedMonoPublisherTest.java @@ -32,9 +32,9 @@ import org.junit.After; import org.junit.Before; import org.junit.jupiter.api.Test; -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.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DelayedMonoPublisherTest { diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java index 010279a..7ebe7c5 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceJwtBearerTokenFlowIntegrationTest.java @@ -21,7 +21,7 @@ import org.apache.camel.component.salesforce.api.dto.Limits; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.junit.Assume.assumeNotNull; +import static org.junit.jupiter.api.Assumptions.*; import static org.junit.jupiter.api.Assertions.assertNotNull; public class SalesforceJwtBearerTokenFlowIntegrationTest extends CamelTestSupport { @@ -40,8 +40,8 @@ public class SalesforceJwtBearerTokenFlowIntegrationTest extends CamelTestSuppor final SalesforceComponent salesforce = new SalesforceComponent(); final SalesforceLoginConfig loginConfig = LoginConfigHelper.getLoginConfig(); - assumeNotNull(loginConfig.getKeystore()); - assumeNotNull(loginConfig.getKeystore().getResource()); + assumeTrue(loginConfig.getKeystore() != null); + assumeTrue(loginConfig.getKeystore().getResource() != null); // force authentication type to JWT loginConfig.setType(AuthenticationType.JWT); diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java index 7744d69..34bf7f4b 100644 --- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java +++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java @@ -27,12 +27,11 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClients; -import org.hamcrest.CoreMatchers; -import org.junit.Assume; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; public class SlackConsumerTest extends CamelTestSupport { @@ -62,8 +61,8 @@ public class SlackConsumerTest extends CamelTestSupport { } private void assumeCredentials() { - Assume.assumeThat("Please specify a Slack access token", token, CoreMatchers.notNullValue()); - Assume.assumeThat("Please specify a Slack application webhook URL", hook, CoreMatchers.notNullValue()); + assumeTrue(token != null, "Please specify a Slack access token"); + assumeTrue(hook != null, "Please specify a Slack application webhook URL"); } private void sendMessage(String message) throws IOException { diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java index 81d3fe6..805163c 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTest.java @@ -26,10 +26,9 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @Disabled("Run manually, makes connection to external webservice") @CamelSpringTest diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java index 8b91062..84fb04f 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java @@ -26,9 +26,8 @@ import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.test.spring.junit5.CamelSpringTest; import org.junit.jupiter.api.Test; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; @CamelSpringTest @ContextConfiguration diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java index fa6849f..51ce9c5 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java @@ -21,9 +21,9 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.file.remote.FtpEndpoint; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 FtpRawParameterTest extends ContextTestSupport { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java index 0e85a63..1be87b4 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java @@ -26,7 +26,7 @@ import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.support.processor.DefaultExchangeFormatter; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class LogAdvancedTest extends ContextTestSupport { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java index c9d1794..8d886f1 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java @@ -26,7 +26,7 @@ import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.support.processor.DefaultExchangeFormatter; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class LogToDAdvancedTest extends ContextTestSupport { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java index 67e648e..5a60922 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java @@ -22,7 +22,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; public class NormalizedUriTest extends CamelTestSupport { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java index f4445a5..b6087a8 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java @@ -22,8 +22,8 @@ import org.apache.camel.builder.endpoint.dsl.PahoEndpointBuilderFactory; import org.apache.camel.component.paho.PahoEndpoint; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class PahoTest extends ContextTestSupport { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java index 7c78310..c403e96 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java @@ -22,9 +22,8 @@ import org.apache.camel.builder.endpoint.dsl.QuartzEndpointBuilderFactory; import org.apache.camel.component.quartz.QuartzEndpoint; import org.junit.jupiter.api.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class QuartzTest extends ContextTestSupport { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java index 50af2d4..e96638a 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java @@ -25,8 +25,8 @@ import org.apache.camel.builder.endpoint.dsl.RabbitMQEndpointBuilderFactory; import org.apache.camel.component.rabbitmq.RabbitMQEndpoint; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class RabbitMQMultiValueTest extends ContextTestSupport { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java index 8c3486a..6b6d4ec 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.ExceptionHandler; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TimerAdvancedTest extends ContextTestSupport {
