resolve pr comments, fix assertions

Activiti · Dec 4, 2024 · 3093153 · 3093153
1 parent 9c9ad78
commit 3093153
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 87 deletions.
diff --git a/...viti/cloud/services/query/app/repository/CustomizedProcessInstanceRepositoryImplTest.java b/...viti/cloud/services/query/app/repository/CustomizedProcessInstanceRepositoryImplTest.java
@@ -17,7 +17,6 @@
 
 import static org.activiti.cloud.services.query.app.repository.utils.ProcessInstanceHelper.*;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import com.querydsl.jpa.impl.JPAQuery;
@@ -81,7 +80,7 @@ void testGetParentIds() {
         List<String> result = repository.getParentIds(processInstances);
 
         assertThat(result).isNotNull();
-        assertEquals(3, result.size());
+        assertThat(result.size()).isEqualTo(3);
     }
 
     @Test
@@ -97,11 +96,11 @@ void testGroupSubprocesses() {
         Map<String, Set<QueryCloudSubprocessInstance>> result = repository.groupSubprocesses(subprocesses);
 
         assertThat(result).isNotNull();
-        assertEquals(2, result.size());
-        assertTrue(result.containsKey(parentIdOne));
-        assertTrue(result.containsKey(parentIdTwo));
-        assertEquals(2, result.get(parentIdOne).size());
-        assertEquals(3, result.get(parentIdTwo).size());
+        assertThat(result.size()).isEqualTo(2);
+        assertThat(result.containsKey(parentIdOne)).isTrue();
+        assertThat(result.containsKey(parentIdTwo)).isTrue();
+        assertThat(result.get(parentIdOne).size()).isEqualTo(2);
+        assertThat(result.get(parentIdTwo).size()).isEqualTo(3);
     }
 
     @Test
@@ -118,7 +117,7 @@ void testFindSubprocessesByParentId() {
         List<ProcessInstanceEntity> result = repository.findSubprocessesByParentId(parentId);
 
         assertThat(result).isNotNull();
-        assertEquals(2, result.size());
+        assertThat(result.size()).isEqualTo(2);
         assertThat(result.get(0).getId()).isNotNull();
         assertThat(result.get(1).getId()).isNotNull();
 
@@ -145,8 +144,7 @@ void testFindSubprocessesByParentIds() {
         Page<ProcessInstanceEntity> result = repository.findSubprocessesByParentIds(parentIds, pageable);
 
         assertThat(result).isNotNull();
-        assertEquals(5, result.getTotalElements());
-        assertEquals(5, result.getContent().size());
+        assertThat(result.getTotalElements()).isEqualTo(5);
         assertThat(result.getContent().get(0).getId()).isNotNull();
         assertThat(result.getContent().get(1).getId()).isNotNull();
 
@@ -181,8 +179,7 @@ void testMapSubprocesses() {
         Page<ProcessInstanceEntity> result = repository.mapSubprocesses(processInstances, pageable);
 
         assertThat(result).isNotNull();
-        assertEquals(2, result.getTotalElements());
-        assertEquals(2, result.getContent().size());
+        assertThat(result.getTotalElements()).isEqualTo(2);
         assertThat(result.getContent().get(0).getSubprocesses()).isNotNull();
         assertThat(result.getContent().get(1).getSubprocesses()).isNotNull();
     }
@@ -202,6 +199,6 @@ void testMapSubprocessesForProcessInstance() {
         ProcessInstanceEntity result = repository.mapSubprocesses(entity);
 
         assertThat(result).isNotNull();
-        assertEquals(2, result.getSubprocesses().size());
+        assertThat(result.getSubprocesses().size()).isEqualTo(2);
     }
 }
diff --git a/...st/java/org/activiti/cloud/services/query/app/repository/utils/ProcessInstanceHelper.java b/...st/java/org/activiti/cloud/services/query/app/repository/utils/ProcessInstanceHelper.java
@@ -22,6 +22,8 @@
 
 public class ProcessInstanceHelper {
 
+    private ProcessInstanceHelper() {}
+
     public static ProcessInstanceEntity createProcessInstance(String parentId) {
         ProcessInstanceEntity entity = new ProcessInstanceEntity();
         entity.setId(UUID.randomUUID().toString());

diff --git a/...est/src/test/java/org/activiti/cloud/repos/CustomizedProcessInstanceRepositoryImplIT.java b/...est/src/test/java/org/activiti/cloud/repos/CustomizedProcessInstanceRepositoryImplIT.java
@@ -16,7 +16,8 @@
 
 package org.activiti.cloud.repos;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.activiti.cloud.services.query.util.ProcessInstanceTestUtils.buildProcessInstanceEntity;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
@@ -25,7 +26,6 @@
 import org.activiti.cloud.services.query.app.repository.CustomizedProcessInstanceRepositoryImpl;
 import org.activiti.cloud.services.query.app.repository.ProcessInstanceRepository;
 import org.activiti.cloud.services.query.model.ProcessInstanceEntity;
-import org.activiti.cloud.services.query.util.ProcessInstanceTestUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,26 +93,26 @@ void testMapSubprocessesForPage() {
 
         Page<ProcessInstanceEntity> result = repository.mapSubprocesses(processInstances, pageable);
 
-        assertNotNull(result);
-        assertEquals(3, result.getTotalElements());
+        assertThat(result).isNotNull();
+        assertThat(result.getTotalElements()).isEqualTo(3);
 
         ProcessInstanceEntity parentInstance1 = result
             .getContent()
             .stream()
             .filter(instance -> instance.getId().equals(parentId1))
             .findFirst()
             .orElse(null);
-        assertNotNull(parentInstance1);
-        assertEquals(2, parentInstance1.getSubprocesses().size());
+        assertThat(parentInstance1).isNotNull();
+        assertThat(parentInstance1.getSubprocesses()).hasSize(2);
 
         ProcessInstanceEntity parentInstance2 = result
             .getContent()
             .stream()
             .filter(instance -> instance.getId().equals(parentId2))
             .findFirst()
             .orElse(null);
-        assertNotNull(parentInstance2);
-        assertEquals(3, parentInstance2.getSubprocesses().size());
+        assertThat(parentInstance2).isNotNull();
+        assertThat(parentInstance2.getSubprocesses()).hasSize(3);
     }
 
     @Test
@@ -125,14 +125,14 @@ void testMapSubprocessesForProcessInstance() {
 
         ProcessInstanceEntity result = repository.mapSubprocesses(entity);
 
-        assertNotNull(result);
-        assertNotNull(result.getSubprocesses().stream().toList().getLast().getId());
+        assertThat(result).isNotNull();
+        assertThat(result.getSubprocesses().stream().toList().getLast().getId()).isNotNull();
     }
 
     private List<ProcessInstanceEntity> buildDefaultProcessInstances(int count) {
         List<ProcessInstanceEntity> entities = new ArrayList<>();
         for (int i = 1; i <= count; i++) {
-            entities.add(new ProcessInstanceTestUtils().buildProcessInstanceEntity());
+            entities.add(buildProcessInstanceEntity());
         }
         processInstanceRepository.saveAll(entities);
         return entities;

diff --git a/...t/java/org/activiti/cloud/services/query/rest/ProcessInstanceAdminControllerHelperIT.java b/...t/java/org/activiti/cloud/services/query/rest/ProcessInstanceAdminControllerHelperIT.java
@@ -15,6 +15,8 @@
  */
 package org.activiti.cloud.services.query.rest;
 
+import static org.activiti.cloud.services.query.util.ProcessInstanceTestUtils.buildProcessInstanceEntity;
+import static org.activiti.cloud.services.query.util.ProcessInstanceTestUtils.createProcessVariables;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.querydsl.core.types.Predicate;
@@ -26,7 +28,6 @@
 import org.activiti.cloud.services.query.model.ProcessInstanceEntity;
 import org.activiti.cloud.services.query.model.ProcessVariableEntity;
 import org.activiti.cloud.services.query.rest.helper.ProcessInstanceAdminControllerHelper;
-import org.activiti.cloud.services.query.util.ProcessInstanceTestUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +68,7 @@ void setUp() {
 
     @Test
     void shouldReturnAllProcessInstanceAdmin() {
-        ProcessInstanceEntity processInstanceEntity = buildDefaultProcessInstance();
+        ProcessInstanceEntity processInstanceEntity = buildProcessInstanceEntity();
         processInstanceRepository.save(processInstanceEntity);
         Predicate predicate = null;
         int pageSize = 30;
@@ -91,7 +92,7 @@ void shouldReturnAllProcessInstanceAdmin() {
 
     @Test
     void shouldReturnAllProcessInstanceAdminWithSubprocess() {
-        ProcessInstanceEntity parentProcessInstance = buildDefaultProcessInstance();
+        ProcessInstanceEntity parentProcessInstance = buildProcessInstanceEntity();
         ProcessInstanceEntity subprocessInstance = buildSubprocessInstance(parentProcessInstance);
 
         processInstanceRepository.save(parentProcessInstance);
@@ -123,7 +124,7 @@ void shouldReturnAllProcessInstanceAdminWithSubprocess() {
 
     @Test
     void shouldReturnAllProcessInstanceAdminWithVariables() {
-        ProcessInstanceEntity processInstanceEntity = buildDefaultProcessInstance();
+        ProcessInstanceEntity processInstanceEntity = buildProcessInstanceEntity();
         processInstanceRepository.save(processInstanceEntity);
 
         Set<ProcessVariableEntity> variables = createProcessVariables(processInstanceEntity, 8);
@@ -143,7 +144,7 @@ void shouldReturnAllProcessInstanceAdminWithVariables() {
 
     @Test
     void shouldReturnProcessAdminById() {
-        ProcessInstanceEntity parentProcessInstance = buildDefaultProcessInstance();
+        ProcessInstanceEntity parentProcessInstance = buildProcessInstanceEntity();
         ProcessInstanceEntity subprocessInstance = buildSubprocessInstance(parentProcessInstance);
 
         processInstanceRepository.save(parentProcessInstance);
@@ -162,10 +163,6 @@ void shouldReturnProcessAdminById() {
             .isTrue();
     }
 
-    private ProcessInstanceEntity buildDefaultProcessInstance() {
-        return new ProcessInstanceTestUtils().buildProcessInstanceEntity();
-    }
-
     private ProcessInstanceEntity buildSubprocessInstance(ProcessInstanceEntity parentProcessInstance) {
         ProcessInstanceEntity subprocessInstance = new ProcessInstanceEntity();
         subprocessInstance.setId(UUID.randomUUID().toString());
@@ -188,13 +185,6 @@ private ProcessInstanceEntity verifyReturnedProcessInstanceEntity(
             .orElse(null);
     }
 
-    private Set<ProcessVariableEntity> createProcessVariables(
-        ProcessInstanceEntity processInstanceEntity,
-        int numberOfVariables
-    ) {
-        return new ProcessInstanceTestUtils().createProcessVariables(processInstanceEntity, numberOfVariables);
-    }
-
     private PageRequest getPageableSortedByLastModifiedDescending(int pageSize) {
         return PageRequest.of(0, pageSize, Sort.by("lastModified").descending());
     }

diff --git a/...rc/test/java/org/activiti/cloud/services/query/rest/ProcessInstanceAdminControllerIT.java b/...rc/test/java/org/activiti/cloud/services/query/rest/ProcessInstanceAdminControllerIT.java
@@ -15,6 +15,8 @@
  */
 package org.activiti.cloud.services.query.rest;
 
+import static org.activiti.cloud.services.query.util.ProcessInstanceTestUtils.buildProcessInstanceEntity;
+import static org.activiti.cloud.services.query.util.ProcessInstanceTestUtils.createProcessVariables;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
@@ -35,7 +37,6 @@
 import org.activiti.cloud.services.query.app.repository.VariableRepository;
 import org.activiti.cloud.services.query.model.ProcessInstanceEntity;
 import org.activiti.cloud.services.query.model.ProcessVariableEntity;
-import org.activiti.cloud.services.query.util.ProcessInstanceTestUtils;
 import org.activiti.cloud.services.security.TaskLookupRestrictionService;
 import org.activiti.core.common.spring.security.policies.SecurityPoliciesManager;
 import org.activiti.core.common.spring.security.policies.conf.SecurityPoliciesProperties;
@@ -112,7 +113,7 @@ void setUp() {
     @Test
     void shouldReturnProcessInstancesWithoutVariableKeys() throws Exception {
         //given
-        ProcessInstanceEntity parentProcessInstance = buildDefaultProcessInstance();
+        ProcessInstanceEntity parentProcessInstance = buildProcessInstanceEntity();
 
         Page<ProcessInstanceEntity> processInstancePage = new PageImpl<>(
             Collections.singletonList(parentProcessInstance),
@@ -138,8 +139,8 @@ void shouldReturnProcessInstancesWithoutVariableKeys() throws Exception {
     @Test
     void shouldReturnProcessInstancesWithVariableKeys() throws Exception {
         //given
-        ProcessInstanceEntity processInstanceEntity = buildDefaultProcessInstance();
-        Set<ProcessVariableEntity> variables = createProcessVariables(processInstanceEntity);
+        ProcessInstanceEntity processInstanceEntity = buildProcessInstanceEntity();
+        Set<ProcessVariableEntity> variables = createProcessVariables(processInstanceEntity, 6);
         List<String> variableKeys = variables.stream().map(ProcessVariableEntity::getName).toList();
 
         Page<ProcessInstanceEntity> processInstancePage = new PageImpl<>(
@@ -170,7 +171,7 @@ void shouldReturnProcessInstancesWithVariableKeys() throws Exception {
     @Test
     void shouldReturnProcessInstanceById() throws Exception {
         //given
-        ProcessInstanceEntity processInstanceEntity = buildDefaultProcessInstance();
+        ProcessInstanceEntity processInstanceEntity = buildProcessInstanceEntity();
         String processInstanceId = processInstanceEntity.getId();
         given(processInstanceAdminService.findById(processInstanceId)).willReturn(processInstanceEntity);
         given(processInstanceRepository.mapSubprocesses(processInstanceEntity)).willReturn(processInstanceEntity);
@@ -197,12 +198,4 @@ void shouldReturnProcessAppVersions() throws Exception {
             //then
             .andExpect(status().isOk());
     }
-
-    private ProcessInstanceEntity buildDefaultProcessInstance() {
-        return new ProcessInstanceTestUtils().buildProcessInstanceEntity();
-    }
-
-    private Set<ProcessVariableEntity> createProcessVariables(ProcessInstanceEntity processInstanceEntity) {
-        return new ProcessInstanceTestUtils().createProcessVariables(processInstanceEntity, 6);
-    }
 }
diff --git a/...c/test/java/org/activiti/cloud/services/query/rest/ProcessInstanceControllerHelperIT.java b/...c/test/java/org/activiti/cloud/services/query/rest/ProcessInstanceControllerHelperIT.java
@@ -15,6 +15,8 @@
  */
 package org.activiti.cloud.services.query.rest;
 
+import static org.activiti.cloud.services.query.util.ProcessInstanceTestUtils.buildProcessInstanceEntity;
+import static org.activiti.cloud.services.query.util.ProcessInstanceTestUtils.createProcessVariables;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 
@@ -28,7 +30,6 @@
 import org.activiti.cloud.services.query.model.ProcessInstanceEntity;
 import org.activiti.cloud.services.query.model.ProcessVariableEntity;
 import org.activiti.cloud.services.query.rest.helper.ProcessInstanceControllerHelper;
-import org.activiti.cloud.services.query.util.ProcessInstanceTestUtils;
 import org.activiti.core.common.spring.security.policies.SecurityPoliciesManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -81,7 +82,7 @@ void setUp() {
 
     @Test
     void shouldReturnAllProcessInstances() {
-        ProcessInstanceEntity processInstanceEntity = buildDefaultProcessInstance();
+        ProcessInstanceEntity processInstanceEntity = buildProcessInstanceEntity();
         processInstanceEntity.setInitiator(TEST_USER);
         processInstanceRepository.save(processInstanceEntity);
         //given
@@ -116,7 +117,7 @@ void shouldReturnAllProcessInstances() {
 
     @Test
     void shouldReturnAllProcessInstancesWithVariables() {
-        ProcessInstanceEntity processInstanceEntity = buildDefaultProcessInstance();
+        ProcessInstanceEntity processInstanceEntity = buildProcessInstanceEntity();
         processInstanceEntity.setInitiator(TEST_USER);
         processInstanceRepository.save(processInstanceEntity);
         //given
@@ -129,7 +130,7 @@ void shouldReturnAllProcessInstancesWithVariables() {
             .willReturn(true);
         given(securityManager.getAuthenticatedUserId()).willReturn(TEST_USER);
 
-        Set<ProcessVariableEntity> variables = createProcessVariables(processInstanceEntity);
+        Set<ProcessVariableEntity> variables = createProcessVariables(processInstanceEntity, 8);
         List<String> variableKeys = variables.stream().map(ProcessVariableEntity::getName).toList();
         Predicate predicate = null;
         int pageSize = 30;
@@ -146,7 +147,7 @@ void shouldReturnAllProcessInstancesWithVariables() {
 
     @Test
     void shouldReturnProcessInstanceById() {
-        ProcessInstanceEntity parentProcessInstance = buildDefaultProcessInstance();
+        ProcessInstanceEntity parentProcessInstance = buildProcessInstanceEntity();
         parentProcessInstance.setInitiator(TEST_USER);
         processInstanceRepository.save(parentProcessInstance);
         ProcessInstanceEntity subprocessInstance = buildSubprocessInstance(parentProcessInstance);
@@ -170,10 +171,6 @@ void shouldReturnProcessInstanceById() {
         assertThat(result).isEqualTo(parentProcessInstance);
     }
 
-    private ProcessInstanceEntity buildDefaultProcessInstance() {
-        return new ProcessInstanceTestUtils().buildProcessInstanceEntity();
-    }
-
     private ProcessInstanceEntity buildSubprocessInstance(ProcessInstanceEntity parentProcessInstance) {
         ProcessInstanceEntity subprocessInstance = new ProcessInstanceEntity();
         subprocessInstance.setId(UUID.randomUUID().toString());
@@ -184,10 +181,6 @@ private ProcessInstanceEntity buildSubprocessInstance(ProcessInstanceEntity pare
         return subprocessInstance;
     }
 
-    private Set<ProcessVariableEntity> createProcessVariables(ProcessInstanceEntity processInstanceEntity) {
-        return new ProcessInstanceTestUtils().createProcessVariables(processInstanceEntity, 8);
-    }
-
     private ProcessInstanceEntity verifyReturnedProcessInstanceEntity(
         Page<ProcessInstanceEntity> result,
         ProcessInstanceEntity parentProcessInstance

diff --git a/...test/java/org/activiti/cloud/services/query/rest/ProcessInstanceControllerHelperTest.java b/...test/java/org/activiti/cloud/services/query/rest/ProcessInstanceControllerHelperTest.java
@@ -15,6 +15,7 @@
  */
 package org.activiti.cloud.services.query.rest;
 
+import static org.activiti.cloud.services.query.util.ProcessInstanceTestUtils.createProcessInstanceSearchRequest;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
@@ -26,7 +27,6 @@
 import org.activiti.cloud.services.query.model.ProcessInstanceEntity;
 import org.activiti.cloud.services.query.rest.helper.ProcessInstanceControllerHelper;
 import org.activiti.cloud.services.query.rest.payload.ProcessInstanceSearchRequest;
-import org.activiti.cloud.services.query.util.ProcessInstanceTestUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -143,8 +143,4 @@ void searchSubprocesses_shouldReturnSubprocesses() {
         //then
         assertThat(result).isEqualTo(pageResult);
     }
-
-    private ProcessInstanceSearchRequest createProcessInstanceSearchRequest() {
-        return new ProcessInstanceTestUtils().createProcessInstanceSearchRequest();
-    }
 }