[Fix_#1923] Fixing unit tests

apache · Jan 15, 2024 · f7f0400 · f7f0400
1 parent 0cc6bca
commit f7f0400
Show file tree

Hide file tree

Showing 94 changed files with 717 additions and 815 deletions.
diff --git a/...kie/kogito/index/event/mapper/Merger.java → ...ava/org/kie/kogito/index/CommonUtils.java b/...kie/kogito/index/event/mapper/Merger.java → ...ava/org/kie/kogito/index/CommonUtils.java
@@ -16,11 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.kie.kogito.index;
 
-package org.kie.kogito.index.event.mapper;
+import java.util.Set;
 
-public interface Merger<I, R> {
-    boolean accept(Object input);
+public class CommonUtils {
+
+    private static final Set<String> finalStates = Set.of("Completed", "Aborted");
+
+    public static boolean isTaskCompleted(String status) {
+        return finalStates.contains(status);
+    }
 
-    R merge(R instance, I input);
 }
diff --git a/...n/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java b/...n/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
diff --git a/...mon/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java b/...mon/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
@@ -92,14 +92,9 @@ public void indexProcessInstanceEvent(ProcessInstanceDataEvent<?> event) {
     //retry in case of rare but possible race condition during the insert for the first registry
     @Retry(maxRetries = 3, delay = 300, jitter = 100, retryOn = ConcurrentModificationException.class)
     public void indexProcessDefinition(ProcessDefinitionDataEvent definitionDataEvent) {
-        String key = ProcessDefinition.toKey(definitionDataEvent.getKogitoProcessId(), definitionDataEvent.getData().getVersion());
-        ProcessDefinition definition = manager.getProcessDefinitionStorage().get(key);
-        if (definition == null) {
-            definition = new ProcessDefinition();
-            definition.setId(definitionDataEvent.getKogitoProcessId());
-            definition.setVersion(definitionDataEvent.getData().getVersion());
-        }
-        manager.getProcessDefinitionStorage().put(key, ProcessDefinitionHelper.merge(definition, definitionDataEvent));
+        ProcessDefinition definition = ProcessDefinitionHelper
+                .merge(manager.getProcessDefinitionStorage().get(ProcessDefinition.toKey(definitionDataEvent.getKogitoProcessId(), definitionDataEvent.getData().getVersion())), definitionDataEvent);
+        manager.getProcessDefinitionStorage().put(definition.getKey(), definition);
     }
 
     //retry in case of rare but possible race condition during the insert for the first registry

diff --git a/...data-index-common/src/main/java/org/kie/kogito/index/service/ProcessDefinitionHelper.java b/...data-index-common/src/main/java/org/kie/kogito/index/service/ProcessDefinitionHelper.java
@@ -43,8 +43,19 @@
 public class ProcessDefinitionHelper {
 
     public static ProcessDefinition merge(ProcessDefinition instance, ProcessDefinitionDataEvent event) {
+        if (event == null) {
+            return instance;
+        }
         ProcessDefinitionEventBody data = event.getData();
+        if (data == null) {
+            return instance;
+        }
+        if (instance == null) {
+            instance = new ProcessDefinition();
+        }
+        instance.setId(doMerge(data.getId(), instance.getId()));
         instance.setName(doMerge(data.getName(), instance.getName()));
+        instance.setVersion(doMerge(data.getVersion(), instance.getVersion()));
         instance.setAddons(doMerge(data.getAddons(), instance.getAddons()));
         instance.setRoles(doMerge(data.getRoles(), instance.getRoles()));
         instance.setType(doMerge(data.getType(), instance.getType()));

diff --git a/...ndex-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java b/...ndex-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.storage.DataIndexStorageService;
+import org.kie.kogito.persistence.api.StorageService;
 import org.kie.kogito.persistence.api.query.AttributeFilter;
 
 import jakarta.inject.Inject;
@@ -36,6 +37,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.kie.kogito.index.model.ProcessInstanceState.ACTIVE;
 import static org.kie.kogito.index.model.ProcessInstanceState.COMPLETED;
+import static org.kie.kogito.index.storage.Constants.PROCESS_INSTANCES_STORAGE;
 import static org.kie.kogito.index.test.TestUtils.getProcessInstance;
 import static org.kie.kogito.persistence.api.query.QueryFilterFactory.between;
 import static org.kie.kogito.persistence.api.query.QueryFilterFactory.contains;
@@ -55,6 +57,9 @@ public abstract class AbstractQueryIT {
     @Inject
     public DataIndexStorageService cacheService;
 
+    @Inject
+    public StorageService storageService;
+
     @BeforeEach
     void setup() {
         cacheService.getProcessDefinitionStorage().clear();
@@ -74,8 +79,9 @@ void testProcessInstanceQueries() {
         String subProcessId = processId + "_sub";
         String subProcessInstanceId = UUID.randomUUID().toString();
         ProcessInstance processInstance = getProcessInstance(processId, processInstanceId, ACTIVE.ordinal(), null, null);
-        cacheService.getProcessInstanceStorage().put(processInstanceId, processInstance);
-        cacheService.getProcessInstanceStorage().put(subProcessInstanceId, getProcessInstance(subProcessId, subProcessInstanceId, COMPLETED.ordinal(), processInstanceId, processId));
+        storageService.getCache(PROCESS_INSTANCES_STORAGE, ProcessInstance.class).put(processInstanceId, processInstance);
+        storageService.getCache(PROCESS_INSTANCES_STORAGE, ProcessInstance.class).put(subProcessInstanceId,
+                getProcessInstance(subProcessId, subProcessInstanceId, COMPLETED.ordinal(), processInstanceId, processId));
 
         queryAndAssert(in("state", asList(ACTIVE.ordinal(), COMPLETED.ordinal())), processInstanceId, subProcessInstanceId);
         queryAndAssert(equalTo("state", ACTIVE.ordinal()), processInstanceId);

diff --git a/...ex-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java b/...ex-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
@@ -28,24 +28,29 @@
 import org.kie.kogito.index.model.ProcessInstanceState;
 import org.kie.kogito.index.storage.DataIndexStorageService;
 import org.kie.kogito.persistence.api.Storage;
+import org.kie.kogito.persistence.api.StorageService;
 
 import jakarta.inject.Inject;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.kie.kogito.index.storage.Constants.PROCESS_INSTANCES_STORAGE;
 import static org.kie.kogito.index.test.TestUtils.getProcessInstance;
 
 public abstract class AbstractStorageIT {
 
     @Inject
     public DataIndexStorageService cacheService;
 
+    @Inject
+    public StorageService storageService;
+
     @Test
     void testObjectCreatedListener() throws Exception {
         String processId = "travels";
         String processInstanceId = UUID.randomUUID().toString();
 
         CompletableFuture<ProcessInstance> cf = new CompletableFuture<>();
-        Storage<String, ProcessInstance> cache = cacheService.getProcessInstanceStorage();
+        Storage<String, ProcessInstance> cache = storageService.getCache(PROCESS_INSTANCES_STORAGE, ProcessInstance.class);
         cache.objectCreatedListener().subscribe().with(pi -> cf.complete(pi));
         cache.put(processInstanceId, getProcessInstance(processId, processInstanceId, ProcessInstanceState.ACTIVE.ordinal(), null, null));
 
@@ -59,7 +64,7 @@ void testObjectUpdatedListener() throws Exception {
         String processInstanceId = UUID.randomUUID().toString();
 
         CompletableFuture<ProcessInstance> cf = new CompletableFuture<>();
-        Storage<String, ProcessInstance> cache = cacheService.getProcessInstanceStorage();
+        Storage<String, ProcessInstance> cache = storageService.getCache(PROCESS_INSTANCES_STORAGE, ProcessInstance.class);
         cache.objectUpdatedListener().subscribe().with(pi -> cf.complete(pi));
         cache.put(processInstanceId, getProcessInstance(processId, processInstanceId, ProcessInstanceState.ACTIVE.ordinal(), null, null));
         cache.put(processInstanceId, getProcessInstance(processId, processInstanceId, ProcessInstanceState.COMPLETED.ordinal(), null, null));
@@ -74,7 +79,7 @@ void testObjectRemovedListener() throws Exception {
         String processInstanceId = UUID.randomUUID().toString();
 
         CompletableFuture<String> cf = new CompletableFuture<>();
-        Storage<String, ProcessInstance> cache = cacheService.getProcessInstanceStorage();
+        Storage<String, ProcessInstance> cache = storageService.getCache(PROCESS_INSTANCES_STORAGE, ProcessInstance.class);
         cache.objectRemovedListener().subscribe().with(id -> cf.complete(id));
         cache.put(processInstanceId, getProcessInstance(processId, processInstanceId, ProcessInstanceState.ACTIVE.ordinal(), null, null));
         cache.remove(processInstanceId);