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 74d595f36bcc9ac79ef7792280dea67fa9e5e094
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 11:58:53 2020 +0200
[CAMEL-11807] Upgrade camel-webhook to junit5
---
components/camel-webhook/pom.xml | 2 +-
.../camel/component/webhook/WebhookBasePathTest.java | 15 ++++++++++-----
.../camel/component/webhook/WebhookHttpBindingTest.java | 12 ++++++++----
.../camel/component/webhook/WebhookMultiRouteTest.java | 4 +++-
.../apache/camel/component/webhook/WebhookPathTest.java | 10 +++++++---
.../camel/component/webhook/WebhookRegistrationTest.java | 8 +++++---
.../apache/camel/component/webhook/WebhookTestBase.java | 6 +++---
.../camel/component/webhook/WebhookUriEncodingTest.java | 4 +++-
8 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/components/camel-webhook/pom.xml b/components/camel-webhook/pom.xml
index 80762e6..5dad6eb 100644
--- a/components/camel-webhook/pom.xml
+++ b/components/camel-webhook/pom.xml
@@ -40,7 +40,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-webhook/src/test/java/org/apache/camel/component/webhook/WebhookBasePathTest.java
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookBasePathTest.java
index ec7da63..b36acd5 100644
---
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookBasePathTest.java
+++
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookBasePathTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class WebhookBasePathTest extends WebhookTestBase {
@@ -45,14 +48,16 @@ public class WebhookBasePathTest extends WebhookTestBase {
assertEquals("auto: webhook", result);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testRootPathError() {
- template.requestBody("netty-http:http://localhost:"; + port, "",
String.class);
+ assertThrows(CamelExecutionException.class,
+ () -> template.requestBody("netty-http:http://localhost:"; + port,
"", String.class));
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testRootBasePathError() {
- template.requestBody("netty-http:http://localhost:"; + port + "/base/",
"", String.class);
+ assertThrows(CamelExecutionException.class,
+ () -> template.requestBody("netty-http:http://localhost:"; + port +
"/base/", "", String.class));
}
@Override
diff --git
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookHttpBindingTest.java
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookHttpBindingTest.java
index 8e42d21..7e94b96 100644
---
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookHttpBindingTest.java
+++
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookHttpBindingTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class WebhookHttpBindingTest extends WebhookTestBase {
@@ -39,10 +42,11 @@ public class WebhookHttpBindingTest extends WebhookTestBase
{
assertEquals("msg: webhook", result);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testGetError() {
- template.requestBodyAndHeader("netty-http:http://localhost:"; + port,
"",
- Exchange.HTTP_METHOD, "GET", String.class);
+ assertThrows(CamelExecutionException.class, () ->
+ template.requestBodyAndHeader("netty-http:http://localhost:"; +
port, "",
+ Exchange.HTTP_METHOD, "GET", String.class));
}
@Override
diff --git
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookMultiRouteTest.java
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookMultiRouteTest.java
index 5a0b0c3..8b12e83 100644
---
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookMultiRouteTest.java
+++
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookMultiRouteTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class WebhookMultiRouteTest extends WebhookTestBase {
diff --git
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookPathTest.java
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookPathTest.java
index a8a07f8f..7699b52 100644
---
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookPathTest.java
+++
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookPathTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class WebhookPathTest extends WebhookTestBase {
@@ -38,9 +41,10 @@ public class WebhookPathTest extends WebhookTestBase {
assertEquals("uri: webhook", result);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testRootPathError() {
- template.requestBody("netty-http:http://localhost:"; + port, "",
String.class);
+ assertThrows(CamelExecutionException.class, () ->
+ template.requestBody("netty-http:http://localhost:"; + port, "",
String.class));
}
@Override
diff --git
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookRegistrationTest.java
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookRegistrationTest.java
index 512bc1c..9bc3f1c 100644
---
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookRegistrationTest.java
+++
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookRegistrationTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
import org.awaitility.Awaitility;
-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 WebhookRegistrationTest extends WebhookTestBase {
@@ -32,7 +34,7 @@ public class WebhookRegistrationTest extends WebhookTestBase {
private AtomicInteger unregistered;
- @Before
+ @BeforeEach
public void initialize() {
this.registered = new AtomicInteger(0);
this.unregistered = new AtomicInteger(0);
diff --git
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
index 38db5b0..71cfadf 100644
---
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
+++
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
@@ -17,14 +17,14 @@
package org.apache.camel.component.webhook;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
public class WebhookTestBase extends CamelTestSupport {
protected static int port;
- @BeforeClass
+ @BeforeAll
public static void initPort() {
port = AvailablePortFinder.getNextAvailable();
}
diff --git
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
index 574f9a0..80ae995 100644
---
a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
+++
b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class WebhookUriEncodingTest extends WebhookTestBase {
