diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java index 639646d43..b3e8a41ea 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java @@ -4,13 +4,18 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static pro.taskana.common.api.BaseQuery.SortDirection.ASCENDING; +import static pro.taskana.common.api.BaseQuery.SortDirection.DESCENDING; import static pro.taskana.task.api.TaskCustomField.CUSTOM_7; import acceptance.AbstractAccTest; import acceptance.TaskTestMapper; import acceptance.TaskanaEngineProxy; +import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSession; @@ -33,9 +38,12 @@ import pro.taskana.common.internal.util.Triplet; import pro.taskana.common.test.security.JaasExtension; import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; +import pro.taskana.task.api.TaskQueryColumnName; +import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.internal.models.TaskImpl; +import pro.taskana.user.api.exceptions.UserNotFoundException; /** Acceptance test for all "query tasks with sorting" scenarios. */ @ExtendWith(JaasExtension.class) @@ -119,7 +127,7 @@ class QueryTasksAccTest extends AbstractAccTest { @WithAccessId(user = "user-1-2") @Test - void should_SetOwnerLongNameOfTask_When_FilteringWithOwnerLongNameNotLike() throws Exception { + void should_SetOwnerLongNameOfTask_When_FilteringWithOwnerLongNameNotLike() { taskanaEngineConfiguration.setAddAdditionalUserInfo(false); List tasks = taskService.createTaskQuery().ownerLongNameNotLike("%1-1%").list(); @@ -175,7 +183,9 @@ class QueryTasksAccTest extends AbstractAccTest { void should_ListValues_For_OwnerLongName() { taskanaEngineConfiguration.setAddAdditionalUserInfo(false); List longNames = - taskService.createTaskQuery().listValues(TaskQueryColumnName.OWNER_LONG_NAME, ASCENDING) + taskService + .createTaskQuery() + .listValues(TaskQueryColumnName.OWNER_LONG_NAME, ASCENDING) .stream() .filter(Objects::nonNull) .collect(Collectors.toList()); @@ -185,11 +195,12 @@ class QueryTasksAccTest extends AbstractAccTest { .containsExactly("Eifrig, Elena - (user-1-2)", "Mustermann, Max - (user-1-1)"); longNames = - taskService.createTaskQuery().listValues(TaskQueryColumnName.OWNER_LONG_NAME, DESCENDING) + taskService + .createTaskQuery() + .listValues(TaskQueryColumnName.OWNER_LONG_NAME, DESCENDING) .stream() .filter(Objects::nonNull) .collect(Collectors.toList()); - ; assertThat(longNames) .hasSize(2) .contains("Mustermann, Max - (user-1-1)", "Eifrig, Elena - (user-1-2)") @@ -231,7 +242,7 @@ class QueryTasksAccTest extends AbstractAccTest { void should_SplitTaskListIntoChunksOf32000_When_AugmentingTasksAfterTaskQuery() { try (MockedStatic listUtilMock = Mockito.mockStatic(CollectionUtil.class, new CallsRealMethods())) { - TASK_SERVICE.createTaskQuery().list(); + taskService.createTaskQuery().list(); listUtilMock.verify(() -> CollectionUtil.partitionBasedOnSize(any(), eq(32000))); } @@ -275,14 +286,14 @@ class QueryTasksAccTest extends AbstractAccTest { TaskCustomField customField, String[] searchArguments, int expectedResult) throws Exception { List results = - TASK_SERVICE.createTaskQuery().customAttributeLike(customField, searchArguments).list(); + taskService.createTaskQuery().customAttributeLike(customField, searchArguments).list(); assertThat(results).hasSize(expectedResult); String[] customAttributes = results.stream().map(t -> t.getCustomAttribute(customField)).toArray(String[]::new); List result2 = - TASK_SERVICE.createTaskQuery().customAttributeIn(customField, customAttributes).list(); + taskService.createTaskQuery().customAttributeIn(customField, customAttributes).list(); assertThat(result2).hasSize(expectedResult); } @@ -319,14 +330,14 @@ class QueryTasksAccTest extends AbstractAccTest { void testQueryForCustomXNotIn( TaskCustomField customField, String[] searchArguments, int expectedCount) throws Exception { long results = - TASK_SERVICE.createTaskQuery().customAttributeNotIn(customField, searchArguments).count(); + taskService.createTaskQuery().customAttributeNotIn(customField, searchArguments).count(); assertThat(results).isEqualTo(expectedCount); } @WithAccessId(user = "admin") @Test void testQueryForCustom7WithExceptionInLike() { - assertThatThrownBy(() -> TASK_SERVICE.createTaskQuery().customAttributeLike(CUSTOM_7).list()) + assertThatThrownBy(() -> taskService.createTaskQuery().customAttributeLike(CUSTOM_7).list()) .isInstanceOf(InvalidArgumentException.class); } @@ -334,10 +345,10 @@ class QueryTasksAccTest extends AbstractAccTest { @Test void testQueryForCustom7WithExceptionInIn() throws Exception { List results = - TASK_SERVICE.createTaskQuery().customAttributeLike(CUSTOM_7, "fsdhfshk%").list(); + taskService.createTaskQuery().customAttributeLike(CUSTOM_7, "fsdhfshk%").list(); assertThat(results).isEmpty(); - assertThatThrownBy(() -> TASK_SERVICE.createTaskQuery().customAttributeIn(CUSTOM_7).list()) + assertThatThrownBy(() -> taskService.createTaskQuery().customAttributeIn(CUSTOM_7).list()) .isInstanceOf(InvalidArgumentException.class); } @@ -345,28 +356,28 @@ class QueryTasksAccTest extends AbstractAccTest { @Test void testQueryForCustom7WithException() throws Exception { List results = - TASK_SERVICE.createTaskQuery().customAttributeLike(CUSTOM_7, "%").list(); + taskService.createTaskQuery().customAttributeLike(CUSTOM_7, "%").list(); assertThat(results).hasSize(2); String[] ids = results.stream().map(t -> t.getCustomAttribute(CUSTOM_7)).toArray(String[]::new); List result2 = - TASK_SERVICE.createTaskQuery().customAttributeIn(CUSTOM_7, ids).list(); + taskService.createTaskQuery().customAttributeIn(CUSTOM_7, ids).list(); assertThat(result2).hasSize(2); } @WithAccessId(user = "admin") @Test void testQueryTaskByCustomAttributes() throws Exception { - Task newTask = TASK_SERVICE.newTask("USER-1-1", "DOMAIN_A"); + Task newTask = taskService.newTask("USER-1-1", "DOMAIN_A"); newTask.setPrimaryObjRef( createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567")); newTask.setClassificationKey("T2100"); Map customAttributesForCreate = createSimpleCustomPropertyMap(20000); // about 1 Meg newTask.setCustomAttributeMap(customAttributesForCreate); - Task createdTask = TASK_SERVICE.createTask(newTask); + Task createdTask = taskService.createTask(newTask); assertThat(createdTask).isNotNull(); // query the task by custom attributes diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java index ed4f707bd..eaccafd0e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java @@ -30,7 +30,7 @@ class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { }; List foundTasks = - TASK_SERVICE + taskService .createTaskQuery() .wildcardSearchFieldsIn(wildcards) .wildcardSearchValueLike("%99%") @@ -48,7 +48,7 @@ class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { }; long foundTasks = - TASK_SERVICE + taskService .createTaskQuery() .wildcardSearchFieldsIn(wildcards) .wildcardSearchValueLike("%99%") @@ -66,7 +66,7 @@ class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { }; List foundTasks = - TASK_SERVICE + taskService .createTaskQuery() .wildcardSearchFieldsIn(wildcards) .wildcardSearchValueLike("%99%") @@ -84,14 +84,14 @@ class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { WildcardSearchField[] wildcards = {WildcardSearchField.NAME}; List foundTasksCaseSensitive = - TASK_SERVICE + taskService .createTaskQuery() .wildcardSearchFieldsIn(wildcards) .wildcardSearchValueLike("%Wid%") .list(); List foundTasksCaseInsensitive = - TASK_SERVICE + taskService .createTaskQuery() .wildcardSearchFieldsIn(wildcards) .wildcardSearchValueLike("%wid%") @@ -107,7 +107,7 @@ class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { ThrowingCallable queryAttempt = () -> - TASK_SERVICE + taskService .createTaskQuery() .wildcardSearchValueLike("%99%") .orderByName(SortDirection.ASCENDING) @@ -117,7 +117,7 @@ class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { queryAttempt = () -> - TASK_SERVICE + taskService .createTaskQuery() .wildcardSearchFieldsIn( WildcardSearchField.CUSTOM_1, WildcardSearchField.DESCRIPTION)