Fix Flowable 5 tests to run properly with the Flowable JUnit 3 support removed

filiphr · filiphr · commit 44b374ba9d69 · 2025-08-26T13:01:33.000+02:00
diff --git a/modules/flowable5-compatibility-test/pom.xml b/modules/flowable5-compatibility-test/pom.xml
@@ -42,8 +42,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/AbstractFlowable6CompatibilityTest.java b/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/AbstractFlowable6CompatibilityTest.java
@@ -18,10 +18,11 @@
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
-import org.flowable.engine.test.FlowableRule;
-import org.junit.Before;
-import org.junit.Rule;
+import org.flowable.engine.test.FlowableExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(FlowableExtension.class)
 public abstract class AbstractFlowable6CompatibilityTest {
 
     protected ProcessEngine processEngine;
@@ -31,17 +32,14 @@ public abstract class AbstractFlowable6CompatibilityTest {
     protected TaskService taskService;
     protected ManagementService managementService;
 
-    @Rule
-    public FlowableRule flowableRule = new FlowableRule();
-
-    @Before
-    public void setupServices() {
-        this.processEngine = flowableRule.getProcessEngine();
-        this.processEngineConfiguration = flowableRule.getProcessEngine().getProcessEngineConfiguration();
-        this.repositoryService = flowableRule.getRepositoryService();
-        this.runtimeService = flowableRule.getRuntimeService();
-        this.taskService = flowableRule.getTaskService();
-        this.managementService = flowableRule.getManagementService();
+    @BeforeEach
+    public void setupServices(ProcessEngine processEngine) {
+        this.processEngine = processEngine;
+        this.processEngineConfiguration = processEngine.getProcessEngineConfiguration();
+        this.repositoryService = processEngine.getRepositoryService();
+        this.runtimeService = processEngine.getRuntimeService();
+        this.taskService = processEngine.getTaskService();
+        this.managementService = processEngine.getManagementService();
     }
 
 }
diff --git a/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/AsyncFailingJobTest.java b/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/AsyncFailingJobTest.java
@@ -12,17 +12,17 @@
  */
 package org.flowable.compatibility.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.concurrent.Callable;
 
 import org.flowable.engine.impl.test.JobTestHelper;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.job.api.Job;
 import org.flowable.job.service.impl.persistence.entity.TimerJobEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AsyncFailingJobTest extends AbstractFlowable6CompatibilityTest {
 
diff --git a/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/ExpressionInJavaDelegateTest.java b/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/ExpressionInJavaDelegateTest.java
@@ -12,13 +12,13 @@
  */
 package org.flowable.compatibility.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.Map;
 
 import org.flowable.engine.runtime.ProcessInstance;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ExpressionInJavaDelegateTest extends AbstractFlowable6CompatibilityTest {
 
diff --git a/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/JavaDelegateTest.java b/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/JavaDelegateTest.java
@@ -12,14 +12,14 @@
  */
 package org.flowable.compatibility.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Map;
 
 import org.flowable.engine.runtime.ProcessInstance;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JavaDelegateTest extends AbstractFlowable6CompatibilityTest {
 
diff --git a/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/MigrateProcessInstanceTest.java b/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/MigrateProcessInstanceTest.java
@@ -21,7 +21,7 @@
 import org.flowable.engine.repository.DeploymentProperties;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.runtime.ProcessInstance;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MigrateProcessInstanceTest extends AbstractFlowable6CompatibilityTest {
 
diff --git a/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/ParseHandlerTest.java b/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/ParseHandlerTest.java
@@ -12,13 +12,13 @@
  */
 package org.flowable.compatibility.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
 import org.flowable.task.api.Task;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ParseHandlerTest extends AbstractFlowable6CompatibilityTest {
 
diff --git a/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/StartProcessInstanceTest.java b/modules/flowable5-compatibility-test/src/test/java/org/flowable/compatibility/test/StartProcessInstanceTest.java
@@ -12,14 +12,14 @@
  */
 package org.flowable.compatibility.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.flowable.engine.repository.DeploymentProperties;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.runtime.ProcessInstance;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StartProcessInstanceTest extends AbstractFlowable6CompatibilityTest {
 
diff --git a/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/repository/LaneExtensionTest.java b/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/repository/LaneExtensionTest.java
@@ -15,32 +15,26 @@
 import java.util.List;
 import java.util.Map;
 
+import org.activiti.engine.impl.test.PluggableFlowableTestCase;
 import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.bpmn.model.ExtensionElement;
 import org.flowable.bpmn.model.Lane;
 import org.flowable.bpmn.model.Process;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.test.Deployment;
-import org.flowable.engine.test.FlowableRule;
 import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
 
 /**
  * Created by P3700487 on 2/19/2015.
  */
-public class LaneExtensionTest {
+public class LaneExtensionTest extends PluggableFlowableTestCase {
 
-    @Rule
-    public FlowableRule activitiRule = new FlowableRule();
-
-    @Test
     @Deployment
     public void testLaneExtensionElement() {
-        ProcessDefinition processDefinition = activitiRule.getRepositoryService().createProcessDefinitionQuery()
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
                 .processDefinitionKey("swimlane-extension").singleResult();
-        BpmnModel bpmnModel = activitiRule.getRepositoryService().getBpmnModel(processDefinition.getId());
+        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId());
         byte[] xml = new BpmnXMLConverter().convertToXML(bpmnModel);
         System.out.println(new String(xml));
         Process bpmnProcess = bpmnModel.getMainProcess();
diff --git a/modules/flowable5-test/src/test/java/org/activiti/standalone/testing/ActivitiTestCaseTest.java b/modules/flowable5-test/src/test/java/org/activiti/standalone/testing/ActivitiTestCaseTest.java
diff --git a/pom.xml b/pom.xml
@@ -320,7 +320,6 @@
 				<module>modules/flowable-camel</module>
 				<module>modules/flowable-http</module>
 				<module>modules/flowable-http-common</module>
-				<module>modules/flowable-mail</module>
 				<module>modules/flowable-cdi</module>
 				<module>modules/flowable-cmmn-cdi</module>
 				<module>modules/flowable-ldap</module>
@@ -345,6 +344,29 @@
 				</plugins>
 			</build>
 		</profile>
+        <profile>
+            <id>flowable5-test</id>
+            <modules>
+                <module>modules/flowable-camel</module>
+                <module>modules/flowable-cxf</module>
+                <module>modules/flowable-event-registry-spring-configurator</module>
+                <module>modules/flowable-event-registry-spring</module>
+                <module>modules/flowable-idm-spring</module>
+                <module>modules/flowable-idm-spring-configurator</module>
+                <module>modules/flowable-job-spring-service</module>
+                <module>modules/flowable-spring-common</module>
+                <module>modules/flowable-spring</module>
+                <module>modules/flowable5-camel-test</module>
+                <module>modules/flowable5-compatibility-test</module>
+                <module>modules/flowable5-compatibility</module>
+                <module>modules/flowable5-cxf-test</module>
+                <module>modules/flowable5-engine</module>
+                <module>modules/flowable5-spring-compatibility</module>
+                <module>modules/flowable5-spring-test</module>
+                <module>modules/flowable5-spring</module>
+                <module>modules/flowable5-test</module>
+            </modules>
+        </profile>
 	</profiles>
 
 	<!-- Various information, not used by the build -->
diff --git a/scripts/run-flowable5-tests.sh b/scripts/run-flowable5-tests.sh
