Refactoring adding util methods

activiti-spring-conformance-tests/activiti-spring-conformance-variables/src/test/java/org/activiti/spring/conformance/variables/ProcessVariablesTest.java

@@ -49,6 +49,8 @@ public class ProcessVariablesTest {
     @Autowired
     private ProcessAdminRuntime processAdminRuntime;
 
+    private String processInstanceId;
+
     @Before
     public void cleanUp() {
         collectedEvents.clear();
@@ -59,34 +61,15 @@ public class ProcessVariablesTest {
 
         securityUtil.logInAs("user1");
 
-        ProcessInstance processInstance = processRuntime.start(ProcessPayloadBuilder
-                .start()
-                .withProcessDefinitionKey(processKey)
-                .withBusinessKey("my-business-key")
-                .withName("my-process-instance-name")
-                .build());
-
-        collectedEvents.clear();
-
-        Map<String, Object> variablesMap = new HashMap<>();
-        variablesMap.put("one", "variableOne");
-        variablesMap.put("two", 2);
-
-        processRuntime.setVariables(new SetVariablesPayloadBuilder().withVariables(variablesMap).withProcessInstanceId(processInstance.getId()).build());
+        List<VariableInstance> variableInstanceList = setVariables();
 
-        List<VariableInstance> variableInstanceList = processRuntime.variables(new GetVariablesPayloadBuilder().withProcessInstanceId(processInstance.getId()).build());
         VariableInstance variableOne = variableInstanceList.get(0);
         String valueOne = variableOne.getValue();
         assertThat(valueOne).isEqualTo("variableOne");
         String nameOne = variableOne.getName();
         assertThat(nameOne).isEqualTo("one");
 
-        assertThat(collectedEvents)
-                .extracting(RuntimeEvent::getEventType)
-                .containsExactly(
-                        VariableEvent.VariableEvents.VARIABLE_CREATED,
-                        VariableEvent.VariableEvents.VARIABLE_CREATED
-                );
+        checkVariableEvents();
     }
 
     @Test
@@ -94,91 +77,74 @@ public class ProcessVariablesTest {
 
         securityUtil.logInAs("user1");
 
-        ProcessInstance processInstance = processRuntime.start(ProcessPayloadBuilder
-                .start()
-                .withProcessDefinitionKey(processKey)
-                .withBusinessKey("my-business-key")
-                .withName("my-process-instance-name")
-                .build());
-
-        collectedEvents.clear();
-
-        Map<String, Object> variablesMap = new HashMap<>();
-        variablesMap.put("one", "variableOne");
-        variablesMap.put("two", 2);
-
-        processRuntime.setVariables(new SetVariablesPayloadBuilder().withVariables(variablesMap).withProcessInstanceId(processInstance.getId()).build());
-
-        List<VariableInstance> variableInstanceList = processRuntime.variables(new GetVariablesPayloadBuilder().withProcessInstanceId(processInstance.getId()).build());
+        List<VariableInstance> variableInstanceList = setVariables();
         VariableInstance variableOne = variableInstanceList.get(0);
 
         assertThat(variableOne.getTaskId()).isNull();
-        assertThat(variableOne.getProcessInstanceId()).isEqualTo(processInstance.getId());
+        assertThat(variableOne.getProcessInstanceId()).isEqualTo(processInstanceId);
 
-        assertThat(collectedEvents)
-                .extracting(RuntimeEvent::getEventType)
-                .containsExactly(
-                        VariableEvent.VariableEvents.VARIABLE_CREATED,
-                        VariableEvent.VariableEvents.VARIABLE_CREATED
-                );
+        checkVariableEvents();
     }
 
     @Test
     public void shouldNotBeTaskVariable() {
         securityUtil.logInAs("user1");
 
-        ProcessInstance processInstance = processRuntime.start(ProcessPayloadBuilder
-                .start()
-                .withProcessDefinitionKey(processKey)
-                .withBusinessKey("my-business-key")
-                .withName("my-process-instance-name")
-                .build());
-
-        collectedEvents.clear();
-
-        Map<String, Object> variablesMap = new HashMap<>();
-        variablesMap.put("one", "variableOne");
-        variablesMap.put("two", 2);
-
-        processRuntime.setVariables(new SetVariablesPayloadBuilder().withVariables(variablesMap).withProcessInstanceId(processInstance.getId()).build());
-
-        List<VariableInstance> variableInstanceList = processRuntime.variables(new GetVariablesPayloadBuilder().withProcessInstanceId(processInstance.getId()).build());
+        List<VariableInstance> variableInstanceList = setVariables();
         VariableInstance variableOne = variableInstanceList.get(0);
 
         assertThat(variableOne.isTaskVariable()).isFalse();
 
-        assertThat(collectedEvents)
-                .extracting(RuntimeEvent::getEventType)
-                .containsExactly(
-                        VariableEvent.VariableEvents.VARIABLE_CREATED,
-                        VariableEvent.VariableEvents.VARIABLE_CREATED
-                );
+        checkVariableEvents();
     }
 
     @Test
     public void shouldGetRightVariableType(){
         securityUtil.logInAs("user1");
 
-        ProcessInstance processInstance = processRuntime.start(ProcessPayloadBuilder
+        List<VariableInstance> variableInstanceList = setVariables();
+
+        VariableInstance variableOne = variableInstanceList.get(0);
+        VariableInstance variableTwo = variableInstanceList.get(1);
+        assertThat(variableOne.getType()).isEqualTo("string");
+        assertThat(variableTwo.getType()).isEqualTo("integer");
+
+        checkVariableEvents();
+    }
+
+    @After
+    public void cleanup() {
+        securityUtil.logInAs("admin");
+        Page<ProcessInstance> processInstancePage = processAdminRuntime.processInstances(Pageable.of(0, 50));
+        for (ProcessInstance pi : processInstancePage.getContent()) {
+            processAdminRuntime.delete(ProcessPayloadBuilder.delete(pi.getId()));
+        }
+    }
+
+    private void startProcess(){
+        processInstanceId = processRuntime.start(ProcessPayloadBuilder
                 .start()
                 .withProcessDefinitionKey(processKey)
                 .withBusinessKey("my-business-key")
                 .withName("my-process-instance-name")
-                .build());
+                .build()).getId();
 
         collectedEvents.clear();
+    }
+
+    private List<VariableInstance> setVariables(){
+        startProcess();
 
         Map<String, Object> variablesMap = new HashMap<>();
         variablesMap.put("one", "variableOne");
         variablesMap.put("two", 2);
-        processRuntime.setVariables(new SetVariablesPayloadBuilder().withVariables(variablesMap).withProcessInstanceId(processInstance.getId()).build());
 
-        List<VariableInstance> variableInstanceList = processRuntime.variables(new GetVariablesPayloadBuilder().withProcessInstanceId(processInstance.getId()).build());
-        VariableInstance variableOne = variableInstanceList.get(0);
-        VariableInstance variableTwo = variableInstanceList.get(1);
-        assertThat(variableOne.getType()).isEqualTo("string");
-        assertThat(variableTwo.getType()).isEqualTo("integer");
+        processRuntime.setVariables(new SetVariablesPayloadBuilder().withVariables(variablesMap).withProcessInstanceId(processInstanceId).build());
 
+        return processRuntime.variables(new GetVariablesPayloadBuilder().withProcessInstanceId(processInstanceId).build());
+    }
+
+    private void checkVariableEvents(){
         assertThat(collectedEvents)
                 .extracting(RuntimeEvent::getEventType)
                 .containsExactly(
@@ -187,13 +153,4 @@ public class ProcessVariablesTest {
                 );
     }
 
-    @After
-    public void cleanup() {
-        securityUtil.logInAs("admin");
-        Page<ProcessInstance> processInstancePage = processAdminRuntime.processInstances(Pageable.of(0, 50));
-        for (ProcessInstance pi : processInstancePage.getContent()) {
-            processAdminRuntime.delete(ProcessPayloadBuilder.delete(pi.getId()));
-        }
-    }
-
 }

activiti-spring-conformance-tests/activiti-spring-conformance-variables/src/test/java/org/activiti/spring/conformance/variables/TaskVariablesTest.java

@@ -47,6 +47,10 @@ public class TaskVariablesTest {
     @Autowired
     private ProcessAdminRuntime processAdminRuntime;
 
+    private String taskId;
+
+    private String processInstanceId;
+
     @Before
     public void cleanUp() {
         collectedEvents.clear();
@@ -57,38 +61,15 @@ public class TaskVariablesTest {
 
         securityUtil.logInAs("user1");
 
-        processRuntime.start(ProcessPayloadBuilder
-                .start()
-                .withProcessDefinitionKey(processKey)
-                .withBusinessKey("my-business-key")
-                .withName("my-process-instance-name")
-                .build());
-
-        collectedEvents.clear();
-
-        Page<Task> tasks = taskRuntime.tasks(Pageable.of(0, 50));
-        Task task = tasks.getContent().get(0);
-        assertThat(tasks.getTotalItems()).isEqualTo(1);
-
-        Map<String, Object> variablesMap = new HashMap<>();
-        variablesMap.put("one", "variableOne");
-        variablesMap.put("two", 2);
+        List<VariableInstance> variableInstanceList = setVariables();
 
-        taskRuntime.setVariables(new SetTaskVariablesPayloadBuilder().withVariables(variablesMap).withTaskId(task.getId()).build());
-
-        List<VariableInstance> variableInstanceList = taskRuntime.variables(new GetTaskVariablesPayloadBuilder().withTaskId(task.getId()).build());
         VariableInstance variableOne = variableInstanceList.get(0);
         String valueOne = variableOne.getValue();
         assertThat(valueOne).isEqualTo("variableOne");
         String nameOne = variableOne.getName();
         assertThat(nameOne).isEqualTo("one");
 
-        assertThat(collectedEvents)
-                .extracting(RuntimeEvent::getEventType)
-                .containsExactly(
-                        VariableEvent.VariableEvents.VARIABLE_CREATED,
-                        VariableEvent.VariableEvents.VARIABLE_CREATED
-                );
+        checkVariableEvents();
     }
 
     @Test
@@ -96,101 +77,81 @@ public class TaskVariablesTest {
 
         securityUtil.logInAs("user1");
 
-        ProcessInstance processInstance = processRuntime.start(ProcessPayloadBuilder
-                .start()
-                .withProcessDefinitionKey(processKey)
-                .withBusinessKey("my-business-key")
-                .withName("my-process-instance-name")
-                .build());
-
-        collectedEvents.clear();
-
-        Page<Task> tasks = taskRuntime.tasks(Pageable.of(0, 50));
-        Task task = tasks.getContent().get(0);
-        assertThat(tasks.getTotalItems()).isEqualTo(1);
-
-        Map<String, Object> variablesMap = new HashMap<>();
-        variablesMap.put("one", "variableOne");
-        variablesMap.put("two", 2);
-        taskRuntime.setVariables(new SetTaskVariablesPayloadBuilder().withVariables(variablesMap).withTaskId(task.getId()).build());
+        List<VariableInstance> variableInstanceList = setVariables();
 
-        List<VariableInstance> variableInstanceList = taskRuntime.variables(new GetTaskVariablesPayloadBuilder().withTaskId(task.getId()).build());
         VariableInstance variableOne = variableInstanceList.get(0);
 
-        assertThat(variableOne.getTaskId()).isEqualTo(task.getId());
-        assertThat(variableOne.getProcessInstanceId()).isEqualTo(processInstance.getId());
+        assertThat(variableOne.getTaskId()).isEqualTo(taskId);
+        assertThat(variableOne.getProcessInstanceId()).isEqualTo(processInstanceId);
 
-        assertThat(collectedEvents)
-                .extracting(RuntimeEvent::getEventType)
-                .containsExactly(
-                        VariableEvent.VariableEvents.VARIABLE_CREATED,
-                        VariableEvent.VariableEvents.VARIABLE_CREATED
-                );
+        checkVariableEvents();
     }
 
     @Test
     public void shouldBeTaskVariable() {
         securityUtil.logInAs("user1");
 
-        processRuntime.start(ProcessPayloadBuilder
-                .start()
-                .withProcessDefinitionKey(processKey)
-                .withBusinessKey("my-business-key")
-                .withName("my-process-instance-name")
-                .build());
-
-        collectedEvents.clear();
+        List<VariableInstance> variableInstanceList = setVariables();
 
-        Page<Task> tasks = taskRuntime.tasks(Pageable.of(0, 50));
-        Task task = tasks.getContent().get(0);
-        assertThat(tasks.getTotalItems()).isEqualTo(1);
-
-        Map<String, Object> variablesMap = new HashMap<>();
-        variablesMap.put("one", "variableOne");
-        variablesMap.put("two", 2);
-        taskRuntime.setVariables(new SetTaskVariablesPayloadBuilder().withVariables(variablesMap).withTaskId(task.getId()).build());
-
-        List<VariableInstance> variableInstanceList = taskRuntime.variables(new GetTaskVariablesPayloadBuilder().withTaskId(task.getId()).build());
         VariableInstance variableOne = variableInstanceList.get(0);
 
         assertThat(variableOne.isTaskVariable()).isTrue();
 
-        assertThat(collectedEvents)
-                .extracting(RuntimeEvent::getEventType)
-                .containsExactly(
-                        VariableEvent.VariableEvents.VARIABLE_CREATED,
-                        VariableEvent.VariableEvents.VARIABLE_CREATED
-                );
+        checkVariableEvents();
     }
 
     @Test
     public void shouldGetRightVariableType(){
         securityUtil.logInAs("user1");
 
-        processRuntime.start(ProcessPayloadBuilder
+        List<VariableInstance> variableInstanceList = setVariables();
+
+        VariableInstance variableOne = variableInstanceList.get(0);
+        VariableInstance variableTwo = variableInstanceList.get(1);
+        assertThat(variableOne.getType()).isEqualTo("string");
+        assertThat(variableTwo.getType()).isEqualTo("integer");
+
+        checkVariableEvents();
+    }
+
+    @After
+    public void cleanup() {
+        securityUtil.logInAs("admin");
+        Page<ProcessInstance> processInstancePage = processAdminRuntime.processInstances(Pageable.of(0, 50));
+        for (ProcessInstance pi : processInstancePage.getContent()) {
+            processAdminRuntime.delete(ProcessPayloadBuilder.delete(pi.getId()));
+        }
+    }
+
+
+    private void startProcess(){
+        processInstanceId = processRuntime.start(ProcessPayloadBuilder
                 .start()
                 .withProcessDefinitionKey(processKey)
                 .withBusinessKey("my-business-key")
                 .withName("my-process-instance-name")
-                .build());
+                .build()).getId();
 
         collectedEvents.clear();
 
         Page<Task> tasks = taskRuntime.tasks(Pageable.of(0, 50));
-        Task task = tasks.getContent().get(0);
+        taskId = tasks.getContent().get(0).getId();
         assertThat(tasks.getTotalItems()).isEqualTo(1);
+    }
+
+    private List<VariableInstance> setVariables(){
+        startProcess();
 
         Map<String, Object> variablesMap = new HashMap<>();
         variablesMap.put("one", "variableOne");
         variablesMap.put("two", 2);
-        taskRuntime.setVariables(new SetTaskVariablesPayloadBuilder().withVariables(variablesMap).withTaskId(task.getId()).build());
 
-        List<VariableInstance> variableInstanceList = taskRuntime.variables(new GetTaskVariablesPayloadBuilder().withTaskId(task.getId()).build());
-        VariableInstance variableOne = variableInstanceList.get(0);
-        VariableInstance variableTwo = variableInstanceList.get(1);
-        assertThat(variableOne.getType()).isEqualTo("string");
-        assertThat(variableTwo.getType()).isEqualTo("integer");
+        taskRuntime.setVariables(new SetTaskVariablesPayloadBuilder().withVariables(variablesMap).withTaskId(taskId).build());
 
+        return taskRuntime.variables(new GetTaskVariablesPayloadBuilder().withTaskId(taskId).build());
+    }
+
+    private void checkVariableEvents(){
         assertThat(collectedEvents)
                 .extracting(RuntimeEvent::getEventType)
                 .containsExactly(
@@ -199,13 +160,4 @@ public class TaskVariablesTest {
                 );
     }
 
-    @After
-    public void cleanup() {
-        securityUtil.logInAs("admin");
-        Page<ProcessInstance> processInstancePage = processAdminRuntime.processInstances(Pageable.of(0, 50));
-        for (ProcessInstance pi : processInstancePage.getContent()) {
-            processAdminRuntime.delete(ProcessPayloadBuilder.delete(pi.getId()));
-        }
-    }
-
 }