Check events in each method

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

@@ -74,7 +74,12 @@ public class ProcessVariablesTest {
         String nameOne = variableOne.getName();
         assertThat(nameOne).isEqualTo("one");
 
-        checkVariableEvents();
+        assertThat(collectedEvents)
+                .extracting(RuntimeEvent::getEventType)
+                .containsExactly(
+                        VariableEvent.VariableEvents.VARIABLE_CREATED,
+                        VariableEvent.VariableEvents.VARIABLE_CREATED
+                );
     }
 
     @Test
@@ -90,7 +95,12 @@ public class ProcessVariablesTest {
         assertThat(variableOne.getTaskId()).isNull();
         assertThat(variableOne.getProcessInstanceId()).isEqualTo(processInstanceId);
 
-        checkVariableEvents();
+        assertThat(collectedEvents)
+                .extracting(RuntimeEvent::getEventType)
+                .containsExactly(
+                        VariableEvent.VariableEvents.VARIABLE_CREATED,
+                        VariableEvent.VariableEvents.VARIABLE_CREATED
+                );
     }
 
     @Test
@@ -104,7 +114,12 @@ public class ProcessVariablesTest {
         VariableInstance variableOne = variableInstanceList.get(0);
         assertThat(variableOne.isTaskVariable()).isFalse();
 
-        checkVariableEvents();
+        assertThat(collectedEvents)
+                .extracting(RuntimeEvent::getEventType)
+                .containsExactly(
+                        VariableEvent.VariableEvents.VARIABLE_CREATED,
+                        VariableEvent.VariableEvents.VARIABLE_CREATED
+                );
     }
 
     @Test
@@ -120,7 +135,12 @@ public class ProcessVariablesTest {
         assertThat(variableOne.getType()).isEqualTo("string");
         assertThat(variableTwo.getType()).isEqualTo("integer");
 
-        checkVariableEvents();
+        assertThat(collectedEvents)
+                .extracting(RuntimeEvent::getEventType)
+                .containsExactly(
+                        VariableEvent.VariableEvents.VARIABLE_CREATED,
+                        VariableEvent.VariableEvents.VARIABLE_CREATED
+                );
     }
 
     @After
@@ -167,13 +187,4 @@ public class ProcessVariablesTest {
         variableInstanceList = processRuntime.variables(new GetVariablesPayloadBuilder().withProcessInstanceId(processInstanceId).build());
     }
 
-    private void checkVariableEvents(){
-        assertThat(collectedEvents)
-                .extracting(RuntimeEvent::getEventType)
-                .containsExactly(
-                        VariableEvent.VariableEvents.VARIABLE_CREATED,
-                        VariableEvent.VariableEvents.VARIABLE_CREATED
-                );
-    }
-
 }

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

@@ -77,7 +77,12 @@ public class TaskVariablesTest {
         String nameOne = variableOne.getName();
         assertThat(nameOne).isEqualTo("one");
 
-        checkVariableEvents();
+        assertThat(collectedEvents)
+                .extracting(RuntimeEvent::getEventType)
+                .containsExactly(
+                        VariableEvent.VariableEvents.VARIABLE_CREATED,
+                        VariableEvent.VariableEvents.VARIABLE_CREATED
+                );
     }
 
     @Test
@@ -93,7 +98,12 @@ public class TaskVariablesTest {
         assertThat(variableOne.getTaskId()).isEqualTo(taskId);
         assertThat(variableOne.getProcessInstanceId()).isEqualTo(processInstanceId);
 
-        checkVariableEvents();
+        assertThat(collectedEvents)
+                .extracting(RuntimeEvent::getEventType)
+                .containsExactly(
+                        VariableEvent.VariableEvents.VARIABLE_CREATED,
+                        VariableEvent.VariableEvents.VARIABLE_CREATED
+                );
     }
 
     @Test
@@ -108,7 +118,12 @@ public class TaskVariablesTest {
         VariableInstance variableOne = variableInstanceList.get(0);
         assertThat(variableOne.isTaskVariable()).isTrue();
 
-        checkVariableEvents();
+        assertThat(collectedEvents)
+                .extracting(RuntimeEvent::getEventType)
+                .containsExactly(
+                        VariableEvent.VariableEvents.VARIABLE_CREATED,
+                        VariableEvent.VariableEvents.VARIABLE_CREATED
+                );
     }
 
     @Test
@@ -124,7 +139,12 @@ public class TaskVariablesTest {
         assertThat(variableOne.getType()).isEqualTo("string");
         assertThat(variableTwo.getType()).isEqualTo("integer");
 
-        checkVariableEvents();
+        assertThat(collectedEvents)
+                .extracting(RuntimeEvent::getEventType)
+                .containsExactly(
+                        VariableEvent.VariableEvents.VARIABLE_CREATED,
+                        VariableEvent.VariableEvents.VARIABLE_CREATED
+                );
     }
 
     @After
@@ -176,13 +196,4 @@ public class TaskVariablesTest {
         variableInstanceList = taskRuntime.variables(new GetTaskVariablesPayloadBuilder().withTaskId(taskId).build());
     }
 
-    private void checkVariableEvents(){
-        assertThat(collectedEvents)
-                .extracting(RuntimeEvent::getEventType)
-                .containsExactly(
-                        VariableEvent.VariableEvents.VARIABLE_CREATED,
-                        VariableEvent.VariableEvents.VARIABLE_CREATED
-                );
-    }
-
 }