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 ef9b130fa01111ba49eee5cc6da6088d7ec09708
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 09:54:31 2020 +0200
[CAMEL-11807] Upgrade camel-jclouds to junit5
---
components/camel-jclouds/pom.xml | 2 +-
.../jclouds/JcloudsBlobStoreConsumerTest.java | 4 +--
.../jclouds/JcloudsBlobStoreProducerTest.java | 6 +++--
.../JcloudsFileConsumerStreamCachingIssueTest.java | 10 +++++---
.../jclouds/JcloudsMultipleBlobStoreTest.java | 4 +--
.../jclouds/JcloudsSpringBlobstoreTest.java | 10 +++++---
.../jclouds/JcloudsSpringComputeTest.java | 29 ++++++++++++----------
7 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index c190e74..9075fa8 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -69,7 +69,7 @@
<!-- test -->
<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-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumerTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumerTest.java
index 285c41a..9cc033a 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumerTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumerTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.jclouds;
import com.google.common.collect.Lists;
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.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.io.payloads.StringPayload;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JcloudsBlobStoreConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
index 7c55b80..2061381 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
@@ -33,12 +33,14 @@ import org.apache.camel.StreamCache;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.xml.StreamSourceConverter;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
diff --git
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsFileConsumerStreamCachingIssueTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsFileConsumerStreamCachingIssueTest.java
index 31c5a8f..6187d1d 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsFileConsumerStreamCachingIssueTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsFileConsumerStreamCachingIssueTest.java
@@ -19,9 +19,11 @@ package org.apache.camel.component.jclouds;
import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* There is a jclouds fallback type-converter that may cause issue when stream
caching is enabled.
@@ -29,7 +31,7 @@ import org.junit.Test;
public class JcloudsFileConsumerStreamCachingIssueTest extends
CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/foo");
super.setUp();
diff --git
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsMultipleBlobStoreTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsMultipleBlobStoreTest.java
index 1990708..1190dcb 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsMultipleBlobStoreTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsMultipleBlobStoreTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.jclouds;
import com.google.common.collect.Lists;
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.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.io.payloads.StringPayload;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JcloudsMultipleBlobStoreTest extends CamelTestSupport {
diff --git
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
index 071a496..744a9f7 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
@@ -23,15 +23,17 @@ import java.util.Map;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport {
@EndpointInject("mock:result-foo")
@@ -40,7 +42,7 @@ public class JcloudsSpringBlobstoreTest extends
CamelSpringTestSupport {
@EndpointInject("mock:result-bar")
protected MockEndpoint resultBar;
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
BlobStore blobStore =
ContextBuilder.newBuilder("transient").credentials("id",
"credential").buildView(BlobStoreContext.class).getBlobStore();
blobStore.createContainerInLocation(null, "foo");
diff --git
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
index 470ce0a..c20d084 100644
---
a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
+++
b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
@@ -24,16 +24,19 @@ import java.util.Set;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class JcloudsSpringComputeTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
@@ -43,7 +46,7 @@ public class JcloudsSpringComputeTest extends
CamelSpringTestSupport {
protected MockEndpoint resultlist;
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
template.sendBodyAndHeaders("direct:start", null, destroyHeaders(null,
null));
}
@@ -99,7 +102,7 @@ public class JcloudsSpringComputeTest extends
CamelSpringTestSupport {
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
- assertEquals("Nodes should be 0", 0, nodeMetadatas.size());
+ assertEquals(0, nodeMetadatas.size(), "Nodes should be 0");
}
}
}
@@ -115,7 +118,7 @@ public class JcloudsSpringComputeTest extends
CamelSpringTestSupport {
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
- assertEquals("Nodes should be 1", 1, nodeMetadatas.size());
+ assertEquals(1, nodeMetadatas.size(), "Nodes should be 1");
}
}
}
@@ -149,7 +152,7 @@ public class JcloudsSpringComputeTest extends
CamelSpringTestSupport {
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
- assertEquals("There should be no node running", 1,
nodeMetadatas.size());
+ assertEquals(1, nodeMetadatas.size(), "There should be no node
running");
for (Object obj : nodeMetadatas) {
NodeMetadata nodeMetadata = (NodeMetadata) obj;
@@ -169,7 +172,7 @@ public class JcloudsSpringComputeTest extends
CamelSpringTestSupport {
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
- assertEquals("There should be one node running", 1,
nodeMetadatas.size());
+ assertEquals(1, nodeMetadatas.size(), "There should be one
node running");
for (Object obj : nodeMetadatas) {
NodeMetadata nodeMetadata = (NodeMetadata) obj;
@@ -189,7 +192,7 @@ public class JcloudsSpringComputeTest extends
CamelSpringTestSupport {
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
- assertEquals("There should be one node running", 1,
nodeMetadatas.size());
+ assertEquals(1, nodeMetadatas.size(), "There should be one
node running");
for (Object obj : nodeMetadatas) {
NodeMetadata nodeMetadata = (NodeMetadata) obj;
@@ -209,7 +212,7 @@ public class JcloudsSpringComputeTest extends
CamelSpringTestSupport {
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
- assertEquals("There should be one node running", 1,
nodeMetadatas.size());
+ assertEquals(1, nodeMetadatas.size(), "There should be one
node running");
for (Object obj : nodeMetadatas) {
NodeMetadata nodeMetadata = (NodeMetadata) obj;
@@ -220,14 +223,14 @@ public class JcloudsSpringComputeTest extends
CamelSpringTestSupport {
}
@SuppressWarnings("unchecked")
- @Ignore("For now not possible to combine stub provider with ssh module,
required for runScript")
+ @Disabled("For now not possible to combine stub provider with ssh module,
required for runScript")
@Test
public void testRunScript() throws InterruptedException {
Map<String, Object> runScriptHeaders = new HashMap<>();
runScriptHeaders.put(JcloudsConstants.OPERATION,
JcloudsConstants.RUN_SCRIPT);
Set<? extends NodeMetadata> nodeMetadatas = (Set<? extends
NodeMetadata>) template.requestBodyAndHeaders("direct:in-out", null,
createHeaders("1", "default"));
- assertEquals("There should be a node running", 1,
nodeMetadatas.size());
+ assertEquals(1, nodeMetadatas.size(), "There should be a node
running");
for (NodeMetadata nodeMetadata : nodeMetadatas) {
runScriptHeaders.put(JcloudsConstants.NODE_ID,
nodeMetadata.getId());
template.requestBodyAndHeaders("direct:in-out", null,
runScriptHeaders);
