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 ac287174dc0b4748f7e9e5847cf43efa7d523a4d
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jun 22 13:42:36 2020 +0200
[CAMEL-11807] Upgrade camel-azure to junit5
---
components/camel-azure/pom.xml | 6 ++--
.../azure/blob/BlobServiceAppendConsumerTest.java | 13 +++++----
.../azure/blob/BlobServiceBlockConsumerTest.java | 13 +++++----
...lobServiceComponentConfigurationClientTest.java | 11 ++++++--
.../BlobServiceComponentConfigurationTest.java | 11 ++++++--
.../BlobServiceProducerOverrideBlobNameTest.java | 6 ++--
.../azure/blob/BlobServiceProducerSpringTest.java | 16 +++++------
.../component/azure/blob/BlobServiceUtilTest.java | 7 +++--
.../azure/common/AzureCredentialsTest.java | 6 ++--
.../azure/common/MissingCredentialsTest.java | 32 ++++++++++------------
...eueServiceComponentClientConfigurationTest.java | 8 ++++--
.../QueueServiceComponentConfigurationTest.java | 8 ++++--
.../azure/queue/QueueServiceProducerTest.java | 24 +++++++++-------
.../azure/queue/QueueServiceUtilTest.java | 7 +++--
14 files changed, 103 insertions(+), 65 deletions(-)
diff --git a/components/camel-azure/pom.xml b/components/camel-azure/pom.xml
index 6b2f6f6..1e825b9 100644
--- a/components/camel-azure/pom.xml
+++ b/components/camel-azure/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceAppendConsumerTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceAppendConsumerTest.java
index 730a670..8f7eb0a 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceAppendConsumerTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceAppendConsumerTest.java
@@ -27,17 +27,20 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class BlobServiceAppendConsumerTest extends CamelTestSupport {
@EndpointInject("direct:start")
ProducerTemplate templateStart;
@Test
- @Ignore
+ @Disabled
public void testGetAppendBlob() throws Exception {
templateStart.send("direct:start", ExchangePattern.InOnly, exchange ->
exchange.getIn().setBody("Append Blob"));
@@ -46,7 +49,7 @@ public class BlobServiceAppendConsumerTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
File f = mock.getExchanges().get(0).getIn().getBody(File.class);
- assertNotNull("File must be set", f);
+ assertNotNull(f, "File must be set");
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
IOHelper.copy(new FileInputStream(f), bos);
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceBlockConsumerTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceBlockConsumerTest.java
index 578ee94..14c8b2f 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceBlockConsumerTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceBlockConsumerTest.java
@@ -27,17 +27,20 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class BlobServiceBlockConsumerTest extends CamelTestSupport {
@EndpointInject("direct:start")
ProducerTemplate templateStart;
@Test
- @Ignore
+ @Disabled
public void testGetBlockBlob() throws Exception {
templateStart.send("direct:start", ExchangePattern.InOnly, exchange ->
exchange.getIn().setBody("Block Blob"));
@@ -46,7 +49,7 @@ public class BlobServiceBlockConsumerTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
File f = mock.getExchanges().get(0).getIn().getBody(File.class);
- assertNotNull("File must be set", f);
+ assertNotNull(f, "File must be set");
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
IOHelper.copy(new FileInputStream(f), bos);
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurationClientTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurationClientTest.java
index b2eb85b..88f1a9f 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurationClientTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurationClientTest.java
@@ -24,8 +24,15 @@ import
com.microsoft.azure.storage.StorageCredentialsAccountAndKey;
import com.microsoft.azure.storage.blob.CloudBlockBlob;
import com.microsoft.azure.storage.core.Base64;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import 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;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class BlobServiceComponentConfigurationClientTest extends
CamelTestSupport {
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurationTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurationTest.java
index 1185496..ee70353 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurationTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurationTest.java
@@ -25,8 +25,15 @@ import com.microsoft.azure.storage.blob.CloudBlob;
import com.microsoft.azure.storage.blob.CloudBlockBlob;
import com.microsoft.azure.storage.core.Base64;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import 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;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class BlobServiceComponentConfigurationTest extends CamelTestSupport {
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceProducerOverrideBlobNameTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceProducerOverrideBlobNameTest.java
index 0a4ba77..7b1b69a 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceProducerOverrideBlobNameTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceProducerOverrideBlobNameTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
-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.azure.blob.BlobHeadersConstants.OVERRIDE_BLOB_NAME;
@@ -30,7 +30,7 @@ public class BlobServiceProducerOverrideBlobNameTest {
private Exchange exchange;
private BlobServiceProducer producer;
- @Before
+ @BeforeEach
public void setUp() {
CamelContext context = new DefaultCamelContext();
BlobServiceEndpoint endpoint = (BlobServiceEndpoint)
context.getEndpoint("azure-blob://camelazure/container/blob?credentialsAccountKey=aKey&credentialsAccountName=name");
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceProducerSpringTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceProducerSpringTest.java
index 6922a0a..8556f31 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceProducerSpringTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceProducerSpringTest.java
@@ -26,9 +26,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class BlobServiceProducerSpringTest extends CamelSpringTestSupport {
@@ -40,7 +40,7 @@ public class BlobServiceProducerSpringTest extends
CamelSpringTestSupport {
private MockEndpoint result;
@Test
- @Ignore
+ @Disabled
public void testUpdateBlockBlob() throws Exception {
result.expectedMessageCount(1);
@@ -52,7 +52,7 @@ public class BlobServiceProducerSpringTest extends
CamelSpringTestSupport {
}
@Test
- @Ignore
+ @Disabled
public void testUploadBlobBlocks() throws Exception {
result.expectedMessageCount(1);
final BlobBlock st = new BlobBlock(new ByteArrayInputStream("Block
Blob List".getBytes()));
@@ -64,7 +64,7 @@ public class BlobServiceProducerSpringTest extends
CamelSpringTestSupport {
}
@Test
- @Ignore
+ @Disabled
public void testGetBlockBlob() throws Exception {
result.expectedMessageCount(1);
OutputStream os = new ByteArrayOutputStream();
@@ -76,7 +76,7 @@ public class BlobServiceProducerSpringTest extends
CamelSpringTestSupport {
}
@Test
- @Ignore
+ @Disabled
public void testUpdateAppendBlob() throws Exception {
result.expectedMessageCount(1);
@@ -88,7 +88,7 @@ public class BlobServiceProducerSpringTest extends
CamelSpringTestSupport {
}
@Test
- @Ignore
+ @Disabled
public void testUpdatePageBlob() throws Exception {
result.expectedMessageCount(1);
final byte[] data = new byte[512];
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceUtilTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceUtilTest.java
index 146c728..21862d5 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceUtilTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceUtilTest.java
@@ -21,10 +21,13 @@ import java.net.URI;
import com.microsoft.azure.storage.blob.CloudAppendBlob;
import com.microsoft.azure.storage.blob.CloudBlob;
import com.microsoft.azure.storage.blob.CloudBlockBlob;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.registerCredentials;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
public class BlobServiceUtilTest extends CamelTestSupport {
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/common/AzureCredentialsTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/common/AzureCredentialsTest.java
index 53e2aa8..33d8759 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/common/AzureCredentialsTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/common/AzureCredentialsTest.java
@@ -26,8 +26,8 @@ import org.apache.camel.component.azure.blob.BlobServiceUtil;
import org.apache.camel.component.azure.queue.QueueServiceConfiguration;
import org.apache.camel.component.azure.queue.QueueServiceEndpoint;
import org.apache.camel.component.azure.queue.QueueServiceUtil;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.ACCOUNT_NAME;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.BLOB_NAME;
@@ -42,6 +42,8 @@ import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.registerBlockBlobClient;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.registerCredentials;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.registerQueueClient;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class AzureCredentialsTest extends CamelTestSupport {
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/common/MissingCredentialsTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/common/MissingCredentialsTest.java
index 42151bf..eb1fd0c 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/common/MissingCredentialsTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/common/MissingCredentialsTest.java
@@ -22,10 +22,8 @@ import
com.microsoft.azure.storage.StorageCredentialsAnonymous;
import com.microsoft.azure.storage.blob.CloudBlockBlob;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.azure.blob.BlobServiceEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.azure.blob.BlobServiceComponent.MISSING_BLOB_CREDENTIALS_EXCEPTION_MESSAGE;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.ACCOUNT_NAME;
@@ -35,12 +33,11 @@ import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.INLINE_CREDENTIALS_ACCOUNT_NAME;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.QUEUE_NAME;
import static
org.apache.camel.component.azure.queue.QueueServiceComponent.MISSING_QUEUE_CREDNTIALS_EXCEPTION_MESSAGE;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MissingCredentialsTest extends CamelTestSupport {
- @Rule
- public ExpectedException exceptionRule = ExpectedException.none();
-
//Missing credentials
private String missingCredentialsBlobUriEndoint = new StringBuilder()
.append("azure-blob://")
@@ -146,30 +143,31 @@ public class MissingCredentialsTest extends
CamelTestSupport {
@Test
public void testBlobClientWithoutAnonymousCredentials() throws Exception {
- exceptionRule.expect(ResolveEndpointFailedException.class);
-
exceptionRule.expectMessage(MISSING_BLOB_CREDENTIALS_EXCEPTION_MESSAGE);
CloudBlockBlob client =
new
CloudBlockBlob(URI.create("https://camelazure.blob.core.windows.net/container/blob";),
StorageCredentialsAnonymous.ANONYMOUS);
context.getRegistry().bind("azureBlobClient", client);
- context.getEndpoint("azure-blob://camelazure/container/blob");
+ assertContains(MISSING_BLOB_CREDENTIALS_EXCEPTION_MESSAGE,
assertThrows(ResolveEndpointFailedException.class,
+ () ->
context.getEndpoint("azure-blob://camelazure/container/blob")).getMessage());
}
@Test
public void testBlobClientWithoutCredentials() throws Exception {
- exceptionRule.expect(ResolveEndpointFailedException.class);
-
exceptionRule.expectMessage(MISSING_BLOB_CREDENTIALS_EXCEPTION_MESSAGE);
CloudBlockBlob client =
new
CloudBlockBlob(URI.create("https://camelazure.blob.core.windows.net/container/blob";));
context.getRegistry().bind("azureBlobClient", client);
- context.getEndpoint("azure-blob://camelazure/container/blob");
-
+ assertContains(MISSING_BLOB_CREDENTIALS_EXCEPTION_MESSAGE,
assertThrows(ResolveEndpointFailedException.class,
+ () ->
context.getEndpoint("azure-blob://camelazure/container/blob")).getMessage());
}
private void createEndpointWithoutCredentials(String uri, String
errorMessage) {
- exceptionRule.expect(ResolveEndpointFailedException.class);
- exceptionRule.expectMessage(errorMessage);
- context.getEndpoint(uri);
+ assertContains(errorMessage,
assertThrows(ResolveEndpointFailedException.class,
+ () -> context.getEndpoint(uri)).getMessage());
}
+
+ private void assertContains(String expected, String message) {
+ assertTrue(message.contains(expected));
+ }
+
}
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceComponentClientConfigurationTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceComponentClientConfigurationTest.java
index 52022e3..d89c0d3 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceComponentClientConfigurationTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceComponentClientConfigurationTest.java
@@ -23,10 +23,14 @@ import
com.microsoft.azure.storage.StorageCredentialsAccountAndKey;
import com.microsoft.azure.storage.core.Base64;
import com.microsoft.azure.storage.queue.CloudQueue;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.azure.queue.QueueServiceComponent.MISSING_QUEUE_CREDNTIALS_EXCEPTION_MESSAGE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class QueueServiceComponentClientConfigurationTest extends
CamelTestSupport {
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurationTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurationTest.java
index 3c9afdd..5d286c7 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurationTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurationTest.java
@@ -23,10 +23,14 @@ import
com.microsoft.azure.storage.StorageCredentialsAccountAndKey;
import com.microsoft.azure.storage.core.Base64;
import com.microsoft.azure.storage.queue.CloudQueue;
import org.apache.camel.Endpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.azure.queue.QueueServiceComponent.MISSING_QUEUE_CREDNTIALS_EXCEPTION_MESSAGE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class QueueServiceComponentConfigurationTest extends CamelTestSupport {
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceProducerTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceProducerTest.java
index 7fcf53f..6839344 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceProducerTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceProducerTest.java
@@ -27,9 +27,13 @@ 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.Assert;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class QueueServiceProducerTest {
@@ -39,7 +43,7 @@ public class QueueServiceProducerTest {
public void testAppendQueue() throws Exception {
StorageCredentials creds = getStorageCredentials("camelqueue",
System.getenv(AZURE_STORAGE_QUEUE));
- Assume.assumeNotNull("Credentials not null", creds);
+ Assumptions.assumeTrue(creds != null, "Credentials not null");
OperationContext.setLoggingEnabledByDefault(true);
@@ -63,20 +67,20 @@ public class QueueServiceProducerTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Iterator<?> it = producer.requestBody("direct:listQueues", null,
Iterable.class).iterator();
- Assert.assertFalse("No more queues", it.hasNext());
+ assertFalse(it.hasNext(), "No more queues");
producer.sendBody("direct:addMessage", "SomeMsg");
it = producer.requestBody("direct:listQueues", null,
Iterable.class).iterator();
- Assert.assertTrue("Has queues", it.hasNext());
+ assertTrue(it.hasNext(), "Has queues");
CloudQueue queue = (CloudQueue)it.next();
- Assert.assertEquals("queue1", queue.getName());
- Assert.assertFalse("No more queues", it.hasNext());
+ assertEquals("queue1", queue.getName());
+ assertFalse(it.hasNext(), "No more queues");
try {
CloudQueueMessage msg =
producer.requestBody("direct:retrieveMessage", null, CloudQueueMessage.class);
- Assert.assertNotNull("Retrieve a message", msg);
- Assert.assertEquals("SomeMsg",
msg.getMessageContentAsString());
+ assertNotNull(msg, "Retrieve a message");
+ assertEquals("SomeMsg", msg.getMessageContentAsString());
} finally {
queue.delete();
}
diff --git
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceUtilTest.java
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceUtilTest.java
index f9f1900..216e658 100644
---
a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceUtilTest.java
+++
b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceUtilTest.java
@@ -19,11 +19,14 @@ package org.apache.camel.component.azure.queue;
import java.net.URI;
import com.microsoft.azure.storage.queue.CloudQueue;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.newAccountKeyCredentials;
import static
org.apache.camel.component.azure.common.AzureServiceCommonTestUtil.registerCredentials;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
public class QueueServiceUtilTest extends CamelTestSupport {
