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 dd10aac4df16b23face61e17b088c1b638ee4962
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 09:35:36 2020 +0200
[CAMEL-11807] Upgrade camel-jbpm to junit5
---
components/camel-jbpm/pom.xml | 9 ++-
.../jbpm/JBPMComponentIntegrationTest.java | 11 ++--
.../jbpm/server/CamelKieServerExtensionTest.java | 12 ++--
.../CamelWorkItemHandlerIntegrationTests.java | 67 ++++++++++++----------
.../DeploymentContextCamelCommandTest.java | 16 +++---
.../workitem/GlobalContextCamelCommandTest.java | 17 +++---
6 files changed, 76 insertions(+), 56 deletions(-)
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index a6950b6..557cc72 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -128,12 +128,17 @@
</dependency>
<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>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
index 58f8849..04c6c4a 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
@@ -22,18 +22,21 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jbpm.JBPMProducer.Operation;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.kie.server.api.model.instance.TaskSummary;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* To run this example you need jBPM to run locally, easiest is to use single
* zip distribution - download from jbpm.org Next, start it and import
* Evaluation sample project, build and deploy. Once done this test can be ran
* out of the box.
*/
-@Ignore("This is an integration test that needs jBPM running on the local
machine")
+@Disabled("This is an integration test that needs jBPM running on the local
machine")
public class JBPMComponentIntegrationTest extends CamelTestSupport {
@SuppressWarnings("unchecked")
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
index 719ee7c..c20c06b 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/server/CamelKieServerExtensionTest.java
@@ -25,9 +25,9 @@ import
org.apache.camel.component.jbpm.config.CamelContextBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.jbpm.services.api.service.ServiceRegistry;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.kie.api.KieServices;
import org.kie.api.runtime.Environment;
import org.kie.api.runtime.KieContainer;
@@ -36,7 +36,7 @@ import org.kie.internal.runtime.manager.RuntimeEnvironment;
import org.kie.internal.runtime.manager.RuntimeManagerRegistry;
import org.kie.server.services.api.KieContainerInstance;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class CamelKieServerExtensionTest {
@Mock
InternalRuntimeManager runtimeManager;
@@ -62,7 +62,7 @@ public class CamelKieServerExtensionTest {
private String identifier = "test";
- @After
+ @AfterEach
public void cleanup() {
RuntimeManagerRegistry.get().remove(identifier);
}
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
index 6f37d5e..413e239 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
@@ -25,15 +25,17 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jbpm.JBPMConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.drools.core.process.instance.impl.WorkItemImpl;
import org.jbpm.bpmn2.handler.WorkItemHandlerRuntimeException;
import org.jbpm.process.workitem.core.TestWorkItemManager;
import org.jbpm.services.api.service.ServiceRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.runtime.process.WorkItemHandler;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
//http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html
//http://camel.apache.org/async.html
@@ -86,7 +88,7 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
}
}
- @Test(expected = WorkItemHandlerRuntimeException.class)
+ @Test
public void testSyncInOnlyException() throws Exception {
// Setup
String routeId = "testSyncInOnlyExceptionRoute";
@@ -100,32 +102,34 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
}
};
context.addRoutes(builder);
- try {
- // Register the Camel Context with the jBPM ServiceRegistry.
-
ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY,
context);
+ assertThrows(WorkItemHandlerRuntimeException.class, () -> {
+ try {
+ // Register the Camel Context with the jBPM ServiceRegistry.
+
ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY,
context);
- // Test
- String expectedBody = "helloRequest";
- resultEndpoint.expectedBodiesReceived(expectedBody);
+ // Test
+ String expectedBody = "helloRequest";
+ resultEndpoint.expectedBodiesReceived(expectedBody);
- WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
"start");
- workItem.setParameter("Request", expectedBody);
+ WorkItemImpl workItem = new WorkItemImpl();
+
workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, "start");
+ workItem.setParameter("Request", expectedBody);
- TestWorkItemManager manager = new TestWorkItemManager();
+ TestWorkItemManager manager = new TestWorkItemManager();
- WorkItemHandler handler = new InOnlyCamelWorkItemHandler();
+ WorkItemHandler handler = new InOnlyCamelWorkItemHandler();
- handler.executeWorkItem(workItem, manager);
+ handler.executeWorkItem(workItem, manager);
- // Assertions
- assertThat(manager.getResults().size(), equalTo(0));
- resultEndpoint.assertIsSatisfied();
- } finally {
- // Cleanup
- context.removeRoute(routeId);
-
ServiceRegistry.get().remove(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
- }
+ // Assertions
+ assertThat(manager.getResults().size(), equalTo(0));
+ resultEndpoint.assertIsSatisfied();
+ } finally {
+ // Cleanup
+ context.removeRoute(routeId);
+
ServiceRegistry.get().remove(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+ }
+ });
}
@Test
@@ -170,7 +174,7 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
}
- @Test(expected = WorkItemHandlerRuntimeException.class)
+ @Test
public void testSyncInOutException() throws Exception {
// Setup
String routeId = "testSyncInOutExceptionRoute";
@@ -200,7 +204,8 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
WorkItemHandler handler = new InOutCamelWorkItemHandler();
- handler.executeWorkItem(workItem, manager);
+ assertThrows(WorkItemHandlerRuntimeException.class,
+ () -> handler.executeWorkItem(workItem, manager));
} finally {
// Cleanup
context.removeRoute(routeId);
@@ -209,7 +214,7 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testSyncInOutDontHandleException() throws Exception {
// Setup
String routeId = "testSyncInOutExceptionRoute";
@@ -240,7 +245,8 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
WorkItemHandler handler = new InOutCamelWorkItemHandler();
- handler.executeWorkItem(workItem, manager);
+ assertThrows(IllegalArgumentException.class,
+ () -> handler.executeWorkItem(workItem, manager));
} finally {
// Cleanup
context.removeRoute(routeId);
@@ -248,7 +254,7 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
}
}
- @Test(expected = RuntimeCamelException.class)
+ @Test
public void testSyncInOutCamelHandleException() throws Exception {
// Setup
String routeId = "testSyncInOutExceptionRoute";
@@ -290,7 +296,8 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
WorkItemHandler handler = new InOutCamelWorkItemHandler();
- handler.executeWorkItem(workItem, manager);
+ assertThrows(RuntimeCamelException.class,
+ () -> handler.executeWorkItem(workItem, manager));
} finally {
// Cleanup
context.removeRoute(routeId);
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
index 99e3e59..24e5604 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
@@ -23,20 +23,22 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.jbpm.JBPMConstants;
import org.drools.core.process.instance.impl.WorkItemImpl;
import org.jbpm.services.api.service.ServiceRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.kie.api.executor.Command;
import org.kie.api.executor.CommandContext;
import org.kie.api.executor.ExecutionResults;
import org.kie.api.runtime.manager.RuntimeManager;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class DeploymentContextCamelCommandTest {
@Mock
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
index 8100076..1f37286 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
@@ -23,20 +23,23 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.jbpm.JBPMConstants;
import org.drools.core.process.instance.impl.WorkItemImpl;
import org.jbpm.services.api.service.ServiceRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.kie.api.executor.Command;
import org.kie.api.executor.CommandContext;
import org.kie.api.executor.ExecutionResults;
import org.kie.api.runtime.manager.RuntimeManager;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class GlobalContextCamelCommandTest {
@Mock
