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 8c882b3342602b6bc0417acaa58b16ef4890c176
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jun 22 14:36:00 2020 +0200
[CAMEL-11807] Upgrade camel-bonita to junit5
---
components/camel-bonita/pom.xml | 4 +--
.../component/bonita/BonitaConfigurationTest.java | 12 ++++---
.../component/bonita/api/BonitaAPIBuilderTest.java | 10 +++---
.../camel/component/bonita/api/BonitaAPITest.java | 22 +++++++------
.../api/BonitaAuthFilterAlreadyConnectedTest.java | 6 ++--
.../bonita/api/BonitaAuthFilterConnectionTest.java | 38 +++++++++++++++-------
.../component/bonita/api/BonitaAuthFilterTest.java | 21 ++++++------
.../bonita/api/util/BonitaAPIConfigTest.java | 4 +--
.../api/util/BonitaAPIUtilPrepareInputsTest.java | 16 ++++-----
.../integration/BonitaIntegrationTestSupport.java | 2 +-
.../integration/BonitaProducerIntegrationTest.java | 6 ++--
11 files changed, 83 insertions(+), 58 deletions(-)
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 7317ad7..2f66f64 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -61,12 +61,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
index ef0d95f..352385b 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
@@ -18,8 +18,11 @@ package org.apache.camel.component.bonita;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.bonita.util.BonitaOperation;
-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.assertThrows;
public class BonitaConfigurationTest extends CamelTestSupport {
@@ -48,9 +51,10 @@ public class BonitaConfigurationTest extends
CamelTestSupport {
assertEquals(0,
configuration.getOperation().compareTo(BonitaOperation.startCase));
}
- @Test(expected = ResolveEndpointFailedException.class)
+ @Test
public void testBonitaConfigurationWrongOperation() {
- context.getEndpoint("bonita:wrongOperation", BonitaEndpoint.class);
+ assertThrows(ResolveEndpointFailedException.class,
+ () -> context.getEndpoint("bonita:wrongOperation",
BonitaEndpoint.class));
}
}
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java
index 5a28f3f..a2d0827 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java
@@ -16,13 +16,15 @@
*/
package org.apache.camel.component.bonita.api;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class BonitaAPIBuilderTest {
- @Test(
- expected = IllegalArgumentException.class)
+ @Test
public void testNullBuilderInput() {
- BonitaAPIBuilder.build(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> BonitaAPIBuilder.build(null));
}
}
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java
index 3cbf261..609669c 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java
@@ -21,32 +21,34 @@ import java.util.HashMap;
import org.apache.camel.component.bonita.api.model.ProcessDefinitionResponse;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class BonitaAPITest {
- @Test(
- expected = IllegalArgumentException.class)
+ @Test
public void testGetProcessDefinitionEmptyInput() {
BonitaAPI bonitaApi = BonitaAPIBuilder
.build(new BonitaAPIConfig("hostname", "port", "username",
"password"));
- bonitaApi.getProcessDefinition("");
+ assertThrows(IllegalArgumentException.class,
+ () -> bonitaApi.getProcessDefinition(""));
}
- @Test(
- expected = IllegalArgumentException.class)
+ @Test
public void testStartCaseEmptyProcessDefinitionId() throws Exception {
BonitaAPI bonitaApi = BonitaAPIBuilder
.build(new BonitaAPIConfig("hostname", "port", "username",
"password"));
- bonitaApi.startCase(null, new HashMap<String, Serializable>());
+ assertThrows(IllegalArgumentException.class,
+ () -> bonitaApi.startCase(null, new HashMap<String,
Serializable>()));
}
- @Test(
- expected = IllegalArgumentException.class)
+ @Test
public void testStartCaseNUllContractInput() throws Exception {
BonitaAPI bonitaApi = BonitaAPIBuilder
.build(new BonitaAPIConfig("hostname", "port", "username",
"password"));
ProcessDefinitionResponse processDefinition = new
ProcessDefinitionResponse();
- bonitaApi.startCase(processDefinition, null);
+ assertThrows(IllegalArgumentException.class,
+ () -> bonitaApi.startCase(processDefinition, null));
}
}
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
index 08af1c1..58392ad 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
@@ -24,8 +24,8 @@ import javax.ws.rs.core.Cookie;
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -35,7 +35,7 @@ public class BonitaAuthFilterAlreadyConnectedTest {
@Mock
private ClientRequestContext requestContext;
- @Before
+ @BeforeEach
public void setup() {
MockitoAnnotations.initMocks(this);
Map<String, Cookie> resultCookies = new HashMap<>();
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
index dc26992..5595c3e 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
@@ -16,18 +16,25 @@
*/
package org.apache.camel.component.bonita.api;
+import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
import java.util.HashMap;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.MultivaluedHashMap;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.camel.test.AvailablePortFinder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -36,26 +43,35 @@ import static
com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.post;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class BonitaAuthFilterConnectionTest {
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(0);
-
@Mock
private ClientRequestContext requestContext;
- @Before
- public void setup() {
+ private WireMockServer wireMockServer;
+
+ @BeforeEach
+ public void setup() throws IOException {
+ wireMockServer = new
WireMockServer(WireMockConfiguration.options()/*.port(etc)*/);
+ wireMockServer.start();
+
MockitoAnnotations.initMocks(this);
Mockito.when(requestContext.getCookies()).thenReturn(new
HashMap<String, Cookie>());
Mockito.when(requestContext.getHeaders()).thenReturn(new
MultivaluedHashMap());
}
+
+ @AfterEach
+ public void tearDown() {
+ wireMockServer.stop();
+ wireMockServer = null;
+ }
+
@Test
public void testConnection() throws Exception {
- String port = wireMockRule.port() + "";
+ String port = wireMockServer.port() + "";
stubFor(post(urlEqualTo("/bonita/loginservice"))
.willReturn(aResponse().withHeader("Set-Cookie",
"JSESSIONID=something")));
@@ -68,7 +84,7 @@ public class BonitaAuthFilterConnectionTest {
@Test
public void testConnectionSupportCSRF() throws Exception {
- String port = wireMockRule.port() + "";
+ String port = wireMockServer.port() + "";
stubFor(post(urlEqualTo("/bonita/loginservice"))
.willReturn(aResponse().withHeader("Set-Cookie",
"JSESSIONID=something", "X-Bonita-API-Token=something")));
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
index c27f4f9..1e86ea9 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
@@ -25,18 +25,20 @@ import javax.ws.rs.core.Cookie;
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class BonitaAuthFilterTest {
@Mock
private ClientRequestContext requestContext;
- @Before
+ @BeforeEach
public void setup() {
MockitoAnnotations.initMocks(this);
Map<String, Cookie> resultCookies = new HashMap<>();
@@ -44,21 +46,20 @@ public class BonitaAuthFilterTest {
}
- @Test(
- expected = IllegalArgumentException.class)
+ @Test
public void testBonitaAuthFilterUsernameEmpty() throws IOException {
BonitaAPIConfig bonitaApiConfig = new BonitaAPIConfig("localhost",
"port", "", "password");
BonitaAuthFilter bonitaAuthFilter = new
BonitaAuthFilter(bonitaApiConfig);
- bonitaAuthFilter.filter(requestContext);
-
+ assertThrows(IllegalArgumentException.class,
+ () -> bonitaAuthFilter.filter(requestContext));
}
- @Test(
- expected = IllegalArgumentException.class)
+ @Test
public void testBonitaAuthFilterPasswordEmpty() throws IOException {
BonitaAPIConfig bonitaApiConfig = new BonitaAPIConfig("localhost",
"port", "username", "");
BonitaAuthFilter bonitaAuthFilter = new
BonitaAuthFilter(bonitaApiConfig);
- bonitaAuthFilter.filter(requestContext);
+ assertThrows(IllegalArgumentException.class,
+ () -> bonitaAuthFilter.filter(requestContext));
}
}
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
index 6e82926..bb9b484 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.bonita.api.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class BonitaAPIConfigTest {
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
index 6e32f59..0b5548a 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
@@ -23,19 +23,19 @@ import java.util.Map;
import org.apache.camel.component.bonita.api.model.FileInput;
import org.apache.camel.component.bonita.api.model.ProcessDefinitionResponse;
import org.apache.camel.component.bonita.api.model.UploadFileResponse;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-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.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class BonitaAPIUtilPrepareInputsTest {
@Mock
@@ -43,7 +43,7 @@ public class BonitaAPIUtilPrepareInputsTest {
private BonitaAPIUtil bonitaApiUtil;
- @Before
+ @BeforeEach
public void setup() {
bonitaApiUtil = BonitaAPIUtil.getInstance(new
BonitaAPIConfig("hostname", "port", "username", "password"));
}
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaIntegrationTestSupport.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaIntegrationTestSupport.java
index 9dcf623..f6864ce 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaIntegrationTestSupport.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaIntegrationTestSupport.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.bonita.integration;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
public class BonitaIntegrationTestSupport extends CamelTestSupport {
diff --git
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaProducerIntegrationTest.java
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaProducerIntegrationTest.java
index 67669ae..c5ff8fe 100644
---
a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaProducerIntegrationTest.java
+++
b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/integration/BonitaProducerIntegrationTest.java
@@ -22,15 +22,15 @@ import java.util.Map;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Bonita producer integration tests. Requires a running Bonita instance.
*
* See test-options.properties for configuration options.
*/
-@Ignore("Requires local Bonita instance to test")
+@Disabled("Requires local Bonita instance to test")
public class BonitaProducerIntegrationTest extends
BonitaIntegrationTestSupport {
@Test
