flowable#3835 package change org.flowable.assertions -> org.flowable.…

…assertj
martin-grofcik · Feb 20, 2024 · 86f9192 · 86f9192
1 parent c4bbe51
commit 86f9192
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 43 deletions.
diff --git a/...ns/process/FlowableProcessAssertions.java → ...tj/process/FlowableProcessAssertions.java b/...ns/process/FlowableProcessAssertions.java → ...tj/process/FlowableProcessAssertions.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import org.assertj.core.api.Assertions;
 import org.flowable.engine.history.HistoricProcessInstance;

diff --git a/...rocess/HistoricProcessInstanceAssert.java → ...rocess/HistoricProcessInstanceAssert.java b/...rocess/HistoricProcessInstanceAssert.java → ...rocess/HistoricProcessInstanceAssert.java
@@ -11,11 +11,9 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.flowable.assertions.process.Utils.getProcessDescription;
-import static org.flowable.assertions.process.Utils.getProcessEngine;
 
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.ListAssert;
@@ -40,7 +38,7 @@ protected HistoricProcessInstanceAssert(ProcessEngine processEngine, HistoricPro
     }
 
     protected HistoricProcessInstanceAssert(HistoricProcessInstance historicProcessInstance) {
-        this(getProcessEngine(), historicProcessInstance);
+        this(Utils.getProcessEngine(), historicProcessInstance);
     }
 
     /**
@@ -64,7 +62,7 @@ public HistoricProcessInstanceAssert isFinished() {
         processExistsInHistory();
 
         if (processServicesProvider.getHistoryService().createHistoricProcessInstanceQuery().finished().processInstanceId(actual.getId()).count() != 1) {
-            failWithMessage(getProcessDescription(actual) + " to be finished, but is running in history.");
+            failWithMessage(Utils.getProcessDescription(actual) + " to be finished, but is running in history.");
         }
 
         return this;
@@ -87,7 +85,7 @@ public HistoricProcessInstanceAssert hasVariable(String variableName) {
         processExistsInHistory();
 
         if (processServicesProvider.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(actual.getId()).variableExists(variableName).count() != 1) {
-            failWithMessage(getProcessDescription(actual) + " has variable <%s> but variable does not exist in history.", variableName);
+            failWithMessage(Utils.getProcessDescription(actual) + " has variable <%s> but variable does not exist in history.", variableName);
         }
 
         return this;
@@ -102,7 +100,7 @@ public HistoricProcessInstanceAssert doesNotHaveVariable(String variableName) {
         processExistsInHistory();
 
         if (processServicesProvider.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(actual.getId()).variableExists(variableName).count() != 0) {
-            failWithMessage(getProcessDescription(actual)+" does not have variable <%s> but variable exists in history.", variableName);
+            failWithMessage(Utils.getProcessDescription(actual)+" does not have variable <%s> but variable exists in history.", variableName);
         }
 
         return this;
@@ -155,7 +153,7 @@ private void processExistsInHistory() {
 
     private void isInHistory() {
         if (processServicesProvider.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(actual.getId()).count() != 1) {
-            failWithMessage(getProcessDescription(actual)+"> exists in history but process instance not found.");
+            failWithMessage(Utils.getProcessDescription(actual)+"> exists in history but process instance not found.");
         }
     }
 

diff --git a/...rtions/process/ProcessInstanceAssert.java → ...ssertj/process/ProcessInstanceAssert.java b/...rtions/process/ProcessInstanceAssert.java → ...ssertj/process/ProcessInstanceAssert.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.Assertions;
@@ -25,8 +25,7 @@
 import org.flowable.task.api.Task;
 import org.flowable.variable.api.persistence.entity.VariableInstance;
 
-import static org.flowable.assertions.process.FlowableProcessAssertions.assertThat;
-import static org.flowable.assertions.process.Utils.*;
+import static org.flowable.assertj.process.FlowableProcessAssertions.assertThat;
 
 /**
  * @author martin.grofcik
@@ -40,7 +39,7 @@ protected ProcessInstanceAssert(ProcessEngine processEngine, ProcessInstance pro
     }
 
     protected ProcessInstanceAssert(ProcessInstance processInstance) {
-        this(getProcessEngine(), processInstance);
+        this(Utils.getProcessEngine(), processInstance);
     }
 
     /**
@@ -52,7 +51,7 @@ public ProcessInstanceAssert isRunning() {
         isNotNull();
 
         if (processServicesProvider.getRuntimeService().createProcessInstanceQuery().processInstanceId(actual.getId()).count() < 1) {
-            failWithMessage(getProcessDescription(actual)+" to be running but is not.", actual.getId());
+            failWithMessage(Utils.getProcessDescription(actual)+" to be running but is not.", actual.getId());
         }
         return this;
     }
@@ -67,7 +66,7 @@ public ProcessInstanceAssert hasVariable(String variableName) {
         isNotNull();
 
         if (processServicesProvider.getRuntimeService().createProcessInstanceQuery().processInstanceId(actual.getId()).variableExists(variableName).count() != 1) {
-            failWithMessage(getProcessDescription(actual)+" has variable <%s> but variable does not exist.", variableName);
+            failWithMessage(Utils.getProcessDescription(actual)+" has variable <%s> but variable does not exist.", variableName);
         }
 
         return this;
@@ -98,7 +97,7 @@ public ProcessInstanceAssert doesNotHaveVariable(String variableName) {
         isNotNull();
 
         if (processServicesProvider.getRuntimeService().createProcessInstanceQuery().processInstanceId(actual.getId()).variableExists(variableName).count() != 0) {
-            failWithMessage(getProcessDescription(actual)+" does not have variable <%s> but variable exists.", variableName);
+            failWithMessage(Utils.getProcessDescription(actual)+" does not have variable <%s> but variable exists.", variableName);
         }
 
         return this;
@@ -113,7 +112,7 @@ public ProcessInstanceAssert doesNotExist() {
         isNotNull();
 
         if (processServicesProvider.getRuntimeService().createProcessInstanceQuery().processInstanceId(actual.getId()).count() != 0) {
-            failWithMessage(getProcessDescription(actual)+" is finished but instance exists in runtime.");
+            failWithMessage(Utils.getProcessDescription(actual)+" is finished but instance exists in runtime.");
         }
 
         return this;
@@ -178,7 +177,7 @@ public ListAssert<IdentityLink> identityLinks() {
     public ListAssert<Task> userTasks() {
         isNotNull();
 
-        return assertThat(getTaskService().createTaskQuery().processInstanceId(actual.getId()).orderByTaskName().asc()
+        return assertThat(Utils.getTaskService().createTaskQuery().processInstanceId(actual.getId()).orderByTaskName().asc()
                 .includeProcessVariables().includeIdentityLinks().includeTaskLocalVariables().list());
     }
 

diff --git a/...ions/process/ProcessServicesProvider.java → ...ertj/process/ProcessServicesProvider.java b/...ions/process/ProcessServicesProvider.java → ...ertj/process/ProcessServicesProvider.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.ProcessEngine;

diff --git a/...rg/flowable/assertions/process/Utils.java → ...a/org/flowable/assertj/process/Utils.java b/...rg/flowable/assertions/process/Utils.java → ...a/org/flowable/assertj/process/Utils.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import org.flowable.engine.*;
 import org.flowable.engine.history.HistoricProcessInstance;

diff --git a/...ss/HistoricProcessInstanceAssertTest.java → ...ss/HistoricProcessInstanceAssertTest.java b/...ss/HistoricProcessInstanceAssertTest.java → ...ss/HistoricProcessInstanceAssertTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import org.assertj.core.groups.Tuple;
 import org.flowable.engine.HistoryService;
@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.flowable.assertions.process.TestUtils.createOneTaskProcess;
 
 /**
  * @author martin.grofcik
@@ -37,7 +36,7 @@ class HistoricProcessInstanceAssertTest {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void isFinishedForFinishedProcessInstance(RuntimeService runtimeService, TaskService taskService, HistoryService historyService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
         assertThatOneTaskProcess.inHistory().activities().extracting(HistoricActivityInstance::getActivityId).contains(
@@ -61,7 +60,7 @@ void isFinishedForFinishedProcessInstance(RuntimeService runtimeService, TaskSer
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void variables(RuntimeService runtimeService, TaskService taskService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
         assertThatOneTaskProcess.as("No variable exists in the process scope.")
@@ -92,7 +91,7 @@ void variables(RuntimeService runtimeService, TaskService taskService) {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void hasVariable(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
         assertThatOneTaskProcess.as("No variable exists in the process scope.")
@@ -108,7 +107,7 @@ void hasVariable(RuntimeService runtimeService) {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void doesNotHaveVariable(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
         assertThatOneTaskProcess.as("No variable exists in the process scope.")

diff --git a/...LongRunningProcessInstanceAssertTest.java → ...LongRunningProcessInstanceAssertTest.java b/...LongRunningProcessInstanceAssertTest.java → ...LongRunningProcessInstanceAssertTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;

diff --git a/...ns/process/ProcessInstanceAssertTest.java → ...tj/process/ProcessInstanceAssertTest.java b/...ns/process/ProcessInstanceAssertTest.java → ...tj/process/ProcessInstanceAssertTest.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import org.assertj.core.groups.Tuple;
 import org.flowable.engine.ManagementService;
@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.flowable.assertions.process.TestUtils.createOneTaskProcess;
 
 /**
  * @author martin.grofcik
@@ -44,15 +43,15 @@ class ProcessInstanceAssertTest {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void isRunning(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         FlowableProcessAssertions.assertThat(oneTaskProcess).isRunning();
     }
 
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void isRunningForNonRunningProcess(RuntimeService runtimeService, TaskService taskService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
         taskService.complete(taskService.createTaskQuery().processInstanceId(oneTaskProcess.getId()).singleResult().getId());
 
         assertThatThrownBy(() -> FlowableProcessAssertions.assertThat(oneTaskProcess).isRunning())
@@ -70,7 +69,7 @@ void isRunningForNull() {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void hasVariable(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
         runtimeService.setVariable(oneTaskProcess.getId(), "variableName", "variableValue");
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
@@ -85,7 +84,7 @@ void hasVariable(RuntimeService runtimeService) {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void hasVariableForNonRunningProcess(RuntimeService runtimeService, TaskService taskService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
         runtimeService.setVariable(oneTaskProcess.getId(), "variableName", "variableValue");
         taskService.complete(taskService.createTaskQuery().processInstanceId(oneTaskProcess.getId()).singleResult().getId());
 
@@ -107,7 +106,7 @@ void hasVariableForNull() {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void doesNotHaveVariable(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
         runtimeService.setVariable(oneTaskProcess.getId(), "variableName", "variableValue");
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
@@ -121,7 +120,7 @@ void doesNotHaveVariable(RuntimeService runtimeService) {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void doesNotHaveVariableForNonRunningProcess(RuntimeService runtimeService, TaskService taskService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
         runtimeService.setVariable(oneTaskProcess.getId(), "variableName", "variableValue");
         taskService.complete(taskService.createTaskQuery().processInstanceId(oneTaskProcess.getId()).singleResult().getId());
 
@@ -140,7 +139,7 @@ void doesNotHaveVariableForNull() {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void doesNotExistForRunningInstance(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         assertThatThrownBy(() -> FlowableProcessAssertions.assertThat(oneTaskProcess).doesNotExist())
                 .isInstanceOf(AssertionError.class)
@@ -150,7 +149,7 @@ void doesNotExistForRunningInstance(RuntimeService runtimeService) {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void doesNotExistForNonRunningProcess(RuntimeService runtimeService, TaskService taskService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
         taskService.complete(taskService.createTaskQuery().processInstanceId(oneTaskProcess.getId()).singleResult().getId());
 
         FlowableProcessAssertions.assertThat(oneTaskProcess).doesNotExist();
@@ -166,7 +165,7 @@ void doesNotExistForNull() {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void activitiesForRunningInstance(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         FlowableProcessAssertions.assertThat(oneTaskProcess).activities().extracting(ActivityInstance::getActivityId)
                 .contains("theStart", "theStart-theTask", "theTask");
@@ -175,7 +174,7 @@ void activitiesForRunningInstance(RuntimeService runtimeService) {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void activitiesForNonRunningProcess(RuntimeService runtimeService, TaskService taskService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
         taskService.complete(taskService.createTaskQuery().processInstanceId(oneTaskProcess.getId()).singleResult().getId());
 
         FlowableProcessAssertions.assertThat(oneTaskProcess).activities().isEmpty();
@@ -184,7 +183,7 @@ void activitiesForNonRunningProcess(RuntimeService runtimeService, TaskService t
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void executions(RuntimeService runtimeService, TaskService taskService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
         assertThatOneTaskProcess.as("Running process has at least 2 active executions." +
@@ -201,7 +200,7 @@ void executions(RuntimeService runtimeService, TaskService taskService) {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void variables(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
         assertThatOneTaskProcess.variables().isEmpty();
@@ -229,7 +228,7 @@ void variables(RuntimeService runtimeService) {
     @Test
     @Deployment(resources = "oneTask.bpmn20.xml")
     void identityLinks(RuntimeService runtimeService) {
-        ProcessInstance oneTaskProcess = createOneTaskProcess(runtimeService);
+        ProcessInstance oneTaskProcess = TestUtils.createOneTaskProcess(runtimeService);
 
         ProcessInstanceAssert assertThatOneTaskProcess = FlowableProcessAssertions.assertThat(oneTaskProcess);
         assertThatOneTaskProcess.identityLinks().isEmpty();

diff --git a/...lowable/assertions/process/TestUtils.java → ...g/flowable/assertj/process/TestUtils.java b/...lowable/assertions/process/TestUtils.java → ...g/flowable/assertj/process/TestUtils.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.flowable.assertions.process;
+package org.flowable.assertj.process;
 
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;