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 d9f66f8b6a61fe770727a48761efa0aa226ec8ac
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jul 22 16:05:10 2020 +0200
[CAMEL-11807] Upgrade camel-slack to junit5
---
components/camel-slack/pom.xml | 2 +-
.../slack/SlackComponentVerifierExtensionTest.java | 19 ++++++++++---------
.../camel/component/slack/SlackConsumerTest.java | 13 +++++++------
.../camel/component/slack/SlackProducerTest.java | 4 ++--
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 9425817..24ac3e9 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -60,7 +60,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java
index bcde56a..300d860 100644
---
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java
+++
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java
@@ -21,9 +21,10 @@ import java.util.Map;
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-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;
public class SlackComponentVerifierExtensionTest extends CamelTestSupport {
@@ -46,7 +47,7 @@ public class SlackComponentVerifierExtensionTest extends
CamelTestSupport {
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
}
@Test
@@ -60,7 +61,7 @@ public class SlackComponentVerifierExtensionTest extends
CamelTestSupport {
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
}
@Test
@@ -73,7 +74,7 @@ public class SlackComponentVerifierExtensionTest extends
CamelTestSupport {
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
}
@Test
@@ -88,7 +89,7 @@ public class SlackComponentVerifierExtensionTest extends
CamelTestSupport {
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
}
@Test
@@ -101,7 +102,7 @@ public class SlackComponentVerifierExtensionTest extends
CamelTestSupport {
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
}
@Test
@@ -114,6 +115,6 @@ public class SlackComponentVerifierExtensionTest extends
CamelTestSupport {
ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
}
}
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 ad8ec32..7744d69 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
@@ -20,7 +20,7 @@ import java.io.IOException;
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.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
@@ -28,10 +28,11 @@ 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.Assert;
import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SlackConsumerTest extends CamelTestSupport {
@@ -39,7 +40,7 @@ public class SlackConsumerTest extends CamelTestSupport {
private String hook;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
token = System.getProperty("SLACK_TOKEN");
hook = System.getProperty("SLACK_HOOK",
"https://hooks.slack.com/services/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";);
@@ -71,7 +72,7 @@ public class SlackConsumerTest extends CamelTestSupport {
post.setHeader("Content-type", "application/json");
post.setEntity(new StringEntity(String.format("{ 'text': '%s'}",
message)));
HttpResponse response = client.execute(post);
- Assert.assertEquals(HttpStatus.SC_OK,
response.getStatusLine().getStatusCode());
+ assertEquals(HttpStatus.SC_OK,
response.getStatusLine().getStatusCode());
}
@Override
diff --git
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
index 4a24b29..dd20289 100644
---
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
+++
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.direct.DirectEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class SlackProducerTest extends CamelTestSupport {
