diff --git a/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java index 979c28755..7a74057cb 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java @@ -36,7 +36,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateMasterClassification() throws ClassificationAlreadyExistException, ClassificationNotFoundException, @@ -62,7 +62,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationWithMasterCopy() throws ClassificationAlreadyExistException, ClassificationNotFoundException, @@ -111,7 +111,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationWithExistingMaster() throws DomainNotFoundException, ClassificationAlreadyExistException, NotAuthorizedException, @@ -134,7 +134,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateChildInDomainAndCopyInMaster() throws TaskanaException { Classification parent = classificationService.newClassification("Key0816", "DOMAIN_A", "TASK"); @@ -154,7 +154,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationWithInvalidValues() { classificationService.createClassificationQuery().count(); @@ -176,7 +176,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationAlreadyExisting() throws TaskanaException { Classification classification = classificationService.newClassification("Key3", "", "TASK"); @@ -188,7 +188,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationInUnknownDomain() { Classification classification = @@ -199,7 +199,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationOfUnknownType() { Classification classification = @@ -210,7 +210,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationOfUnknownCategory() { Classification classification = @@ -222,7 +222,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationWithInvalidParentId() { Classification classification = classificationService.newClassification("Key5", "", "TASK"); @@ -233,7 +233,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationWithInvalidParentKey() { Classification classification = classificationService.newClassification("Key5", "", "TASK"); @@ -244,7 +244,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testCreateClassificationWithExplicitId() { ClassificationImpl classification = @@ -256,7 +256,7 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void should_beAbleToCreateNewClassification_When_ClassificationCopy() throws Exception { ClassificationImpl oldClassification = diff --git a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java index 196a3bb15..1202ca7eb 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java @@ -41,7 +41,7 @@ class DeleteClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testDeleteClassificationInDomainUserIsNotAuthorized() { ThrowingCallable call = () -> classificationService.deleteClassification("L140101", "DOMAIN_A"); @@ -65,7 +65,7 @@ class DeleteClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testThrowExeptionIfDeleteClassificationWithExistingTasks() { ThrowingCallable call = () -> classificationService.deleteClassification("L1050", "DOMAIN_A"); @@ -74,7 +74,7 @@ class DeleteClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testThrowExeptionIfDeleteMasterClassificationWithExistingTasks() { ThrowingCallable call = () -> classificationService.deleteClassification("L1050", ""); @@ -100,7 +100,7 @@ class DeleteClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testThrowExceptionWhenChildClassificationIsInUseAndRollback() throws ClassificationNotFoundException { diff --git a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java index 48975ea79..59bc4c8de 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java @@ -124,7 +124,7 @@ class UpdateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateTaskOnClassificationKeyCategoryChange() throws Exception { setupTest(); @@ -156,7 +156,7 @@ class UpdateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateClassificationNotLatestAnymore() throws ClassificationNotFoundException, NotAuthorizedException, ConcurrencyException, @@ -183,7 +183,7 @@ class UpdateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateClassificationParentIdToInvalid() throws ClassificationNotFoundException { Classification classification = classificationService.getClassification("T2100", "DOMAIN_A"); @@ -194,7 +194,7 @@ class UpdateClassificationAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateClassificationParentKeyToInvalid() throws ClassificationNotFoundException { Classification classification = classificationService.getClassification("T2100", "DOMAIN_A"); diff --git a/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java b/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java index 225c7e542..04164b317 100644 --- a/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java @@ -46,7 +46,7 @@ import pro.taskana.workbasket.api.models.WorkbasketAccessItem; @ExtendWith(JaasExtension.class) public class UpdateObjectsUseUtcTimeStampsAccTest extends AbstractAccTest { - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testTimestampsOnTaskUpdate() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, @@ -73,7 +73,7 @@ public class UpdateObjectsUseUtcTimeStampsAccTest extends AbstractAccTest { assertThat(retrievedTask).isEqualTo(updatedTask); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreatedTaskObjectEqualsReadTaskObjectInNewTimezone() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -111,7 +111,7 @@ public class UpdateObjectsUseUtcTimeStampsAccTest extends AbstractAccTest { assertThat(readTask).isEqualTo(createdTask); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testTimestampsOnClassificationUpdate() throws ClassificationNotFoundException, InvalidArgumentException, ConcurrencyException, @@ -133,7 +133,7 @@ public class UpdateObjectsUseUtcTimeStampsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testTimestampsOnCreateMasterClassification() throws ClassificationAlreadyExistException, ClassificationNotFoundException, @@ -157,7 +157,7 @@ public class UpdateObjectsUseUtcTimeStampsAccTest extends AbstractAccTest { assertThat(retrievedClassification).isEqualTo(classification); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testTimestampsOnWorkbasketUpdate() throws ConcurrencyException, NotAuthorizedException, WorkbasketNotFoundException { diff --git a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java index 557f124b5..473ba4058 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java @@ -37,7 +37,7 @@ class WorkbasketQueryAccTest extends AbstractAccTest { .createWorkbasketQuery() .nameLike("%") .accessIdsHavePermission( - WorkbasketPermission.TRANSFER, "teamlead-1", "group_1", "group_2") + WorkbasketPermission.TRANSFER, "teamlead-1", "group-1", "group-2") .list(); }; assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); @@ -56,7 +56,7 @@ class WorkbasketQueryAccTest extends AbstractAccTest { .createWorkbasketQuery() .nameLike("%") .accessIdsHavePermission( - WorkbasketPermission.TRANSFER, "teamlead-1", "group_1", "group_2") + WorkbasketPermission.TRANSFER, "teamlead-1", "group-1", "group-2") .list(); }; assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); @@ -76,7 +76,7 @@ class WorkbasketQueryAccTest extends AbstractAccTest { .createWorkbasketQuery() .nameLike("%") .accessIdsHavePermission( - WorkbasketPermission.TRANSFER, "teamlead-1", "group_1", "group_2") + WorkbasketPermission.TRANSFER, "teamlead-1", "group-1", "group-2") .list(); assertThat(results).hasSize(13); @@ -95,7 +95,7 @@ class WorkbasketQueryAccTest extends AbstractAccTest { .createWorkbasketQuery() .nameLike("%") .accessIdsHavePermission( - WorkbasketPermission.TRANSFER, "teamlead-1", "group_1", "group_2") + WorkbasketPermission.TRANSFER, "teamlead-1", "group-1", "group-2") .list(); assertThat(results).hasSize(13); diff --git a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java index 4dce4e160..6a53641a5 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java @@ -37,7 +37,7 @@ import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; @ExtendWith(JaasExtension.class) class CallbackStateAccTest extends AbstractAccTest { - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreateTaskWithDifferentCallbackStates() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -63,7 +63,7 @@ class CallbackStateAccTest extends AbstractAccTest { assertThat(createdTask.getCallbackState()).isEqualTo(CallbackState.CLAIMED); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testDeletionOfTaskWithWrongCallbackStateIsBlocked() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -110,7 +110,7 @@ class CallbackStateAccTest extends AbstractAccTest { .hasMessageEndingWith(endOfMessage); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testUpdateOfCallbackState() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -176,7 +176,7 @@ class CallbackStateAccTest extends AbstractAccTest { assertThat(bulkResult3.containsErrors()).isFalse(); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testInvalidUpdateOfCallbackStateToNone() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -212,7 +212,7 @@ class CallbackStateAccTest extends AbstractAccTest { assertThat(failedTaskIds).hasSize(3); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testInvalidUpdateOfCallbackStateToComplete() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -252,7 +252,7 @@ class CallbackStateAccTest extends AbstractAccTest { assertThat(failedTaskIds).hasSize(2).doesNotContain(createdTask3.getExternalId()); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testInvalidUpdateOfCallbackStateToClaimed() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -296,7 +296,7 @@ class CallbackStateAccTest extends AbstractAccTest { .containsOnly(createdTask2.getExternalId(), createdTask3.getExternalId()); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testInvalidUpdateOfCallbackStateToRequired() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -333,7 +333,7 @@ class CallbackStateAccTest extends AbstractAccTest { assertThat(failedTaskIds).containsOnly(createdTask3.getExternalId()); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testQueriesWithCallbackState() throws Exception { resetDb(false); diff --git a/lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java index 91e8d26d1..6c1fe7ff9 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java @@ -38,7 +38,7 @@ class CancelTaskAccTest extends AbstractAccTest { resetDb(false); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testQeryCancelledTasks() { List taskSummaries = @@ -46,7 +46,7 @@ class CancelTaskAccTest extends AbstractAccTest { assertThat(taskSummaries).hasSize(5); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testCancelReadyTask() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException { @@ -73,7 +73,7 @@ class CancelTaskAccTest extends AbstractAccTest { assertThat(cancelledTask.getState()).isEqualTo(TaskState.CANCELLED); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testCancelClaimedTask() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException { @@ -91,7 +91,7 @@ class CancelTaskAccTest extends AbstractAccTest { assertThat(numTasksCancelled).isEqualTo(6); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testCancelCompletedTask() { List taskSummaries = @@ -103,7 +103,7 @@ class CancelTaskAccTest extends AbstractAccTest { assertThatThrownBy(taskanaCall).isInstanceOf(InvalidStateException.class); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testCancelTerminatedTask() { List taskSummaries = @@ -114,7 +114,7 @@ class CancelTaskAccTest extends AbstractAccTest { assertThatThrownBy(taskanaCall).isInstanceOf(InvalidStateException.class); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testCancelCancelledTask() { List taskSummaries = diff --git a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java index 6ad1edc50..3499c2c39 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -35,7 +35,7 @@ class CompleteTaskAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCompleteTask() throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, @@ -70,7 +70,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(completedTask.getModified()).isNotEqualTo(completedTask.getCreated()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCompleteTaskTwice() throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, @@ -81,7 +81,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(completedTask2).isEqualTo(completedTask); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testForceCompleteAlreadyClaimed() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -107,7 +107,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(completedTask.getCompleted()).isEqualTo(completedTask.getModified()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testForceCompleteNotClaimed() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -132,7 +132,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(completedTask.getCompleted()).isEqualTo(completedTask.getModified()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCompleteTaskThrowsErrors() { TaskService taskService = taskanaEngine.getTaskService(); @@ -162,7 +162,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidOwnerException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testClaimTaskWithDefaultFlag() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -192,7 +192,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(claimedTask.getModified()).isEqualTo(claimedTask.getClaimed()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testForceClaimTaskFromOtherUser() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -222,7 +222,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(taskAfterClaim.isRead()).isTrue(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testClaimTaskNotExisting() { @@ -234,7 +234,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(TaskNotFoundException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testClaimTaskWithInvalidState() { @@ -246,7 +246,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidStateException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testClaimTaskWithInvalidOwner() { @@ -258,7 +258,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidOwnerException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCancelClaimForcedWithInvalidState() { @@ -270,7 +270,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidStateException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCancelClaimDefaultFlag() throws NotAuthorizedException, WorkbasketNotFoundException, ClassificationNotFoundException, @@ -317,7 +317,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(taskAfter.isRead()).isTrue(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCancelClaimWithInvalidOwner() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java index 570047445..f505ea377 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java @@ -44,7 +44,7 @@ class CreateTaskAccTest extends AbstractAccTest { private final TaskService taskService = taskanaEngine.getTaskService(); - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_beAbleToCreateNewTask_When_TaskCopy() throws Exception { Task oldTask = taskService.getTask("TKI:000000000000000000000000000000000000"); @@ -59,7 +59,7 @@ class CreateTaskAccTest extends AbstractAccTest { .containsOnly(newTask.getId()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreateSimpleManualTask() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -94,7 +94,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(createdTask.isTransferred()).isFalse(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_createTask_When_ObjectReferenceSystemAndSystemInstanceIsNull() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -135,7 +135,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(createdTask.getCreator()).isEqualTo(CurrentUserContext.getUserid()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testIdempotencyOfTaskCreation() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -177,7 +177,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(TaskAlreadyExistException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreateSimpleTaskWithCustomAttributes() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -245,7 +245,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(customAttributesForCreate).isEqualTo(customAttributesFromDb); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreateExternalTaskWithAttachment() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -331,7 +331,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(customAttributesForCreate).isEqualTo(customAttributesFromDb); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreateExternalTaskWithMultipleAttachments() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -383,7 +383,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(readTask.getAttachments().get(0).getObjectReference()).isNotNull(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testPrioDurationOfTaskFromAttachmentsAtCreate() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -443,7 +443,7 @@ class CreateTaskAccTest extends AbstractAccTest { .isEqualTo(readTask.getDue()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testThrowsExceptionIfAttachmentIsInvalid() throws ClassificationNotFoundException { @@ -498,7 +498,7 @@ class CreateTaskAccTest extends AbstractAccTest { createSimpleCustomProperties(3))); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testUseCustomNameIfSetForNewTask() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -516,7 +516,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(createdTask.getName()).isEqualTo("Test Name"); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testUseClassificationMetadataFromCorrectDomainForNewTask() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -534,7 +534,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(createdTask.getPriority()).isEqualTo(2); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetExceptionIfWorkbasketDoesNotExist() { @@ -547,7 +547,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(WorkbasketNotFoundException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetExceptionIfAppendIsNotPermitted() { @@ -560,7 +560,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testThrowsExceptionIfMandatoryPrimaryObjectReferenceIsNotSetOrIncomplete() { @@ -586,7 +586,7 @@ class CreateTaskAccTest extends AbstractAccTest { testCreateTask.accept(createObjectReference(null, "SYSTEM_A", "INSTANCE_A", "VNR", "1234567")); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testSetDomainFromWorkbasket() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -608,7 +608,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(createdTask.getDomain()).isEqualTo(workbasket.getDomain()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreatedTaskObjectEqualsReadTaskObject() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -642,7 +642,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThat(readTask).isEqualTo(createdTask); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreateSimpleTaskWithCallbackInfo() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -689,7 +689,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreateTaskAlreadyExisting() throws NotAuthorizedException, TaskNotFoundException { @@ -699,7 +699,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(TaskAlreadyExistException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testCreateTaskNotAuthorizedOnWorkbasket() { @@ -709,7 +709,7 @@ class CreateTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testCreateTaskWithWorkbasketMarkedForDeletion() throws NotAuthorizedException, InvalidStateException, TaskNotFoundException, diff --git a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java index 6da61981f..9bd68ca07 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java @@ -23,7 +23,7 @@ public class CreateTaskCommentAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_CreateTaskComment_For_TaskComment() throws TaskNotFoundException, NotAuthorizedException, InvalidArgumentException { @@ -46,7 +46,7 @@ public class CreateTaskCommentAccTest extends AbstractAccTest { assertThat(taskCommentsAfterInsert).hasSize(3); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_FailToCreateTaskComment_When_TaskIdIsNullOrNonExisting() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java index 4cc853d15..c8304a3fc 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java @@ -31,7 +31,7 @@ class DeleteTaskAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testDeleteSingleTaskNotAuthorized() { @@ -67,7 +67,7 @@ class DeleteTaskAccTest extends AbstractAccTest { @WithAccessId( user = "user-1-2", - groups = {"group_1", "admin"}) + groups = {"group-1", "admin"}) @Test void testDeleteSingleTask() throws TaskNotFoundException, InvalidStateException, NotAuthorizedException { @@ -101,7 +101,7 @@ class DeleteTaskAccTest extends AbstractAccTest { @WithAccessId( user = "user-1-2", - groups = {"group_1", "admin"}) + groups = {"group-1", "admin"}) @Test void testThrowsExceptionIfTaskIsNotCompleted() throws TaskNotFoundException, NotAuthorizedException { @@ -117,7 +117,7 @@ class DeleteTaskAccTest extends AbstractAccTest { @WithAccessId( user = "user-1-2", - groups = {"group_1", "admin"}) + groups = {"group-1", "admin"}) @Test void testForceDeleteTaskIfNotCompleted() throws TaskNotFoundException, InvalidStateException, NotAuthorizedException { diff --git a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java index 6264aa1d0..c382decb5 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java @@ -27,7 +27,7 @@ public class DeleteTaskCommentAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_DeleteTaskComment_For_TaskCommentId() throws TaskCommentNotFoundException, NotAuthorizedException, TaskNotFoundException, @@ -47,7 +47,7 @@ public class DeleteTaskCommentAccTest extends AbstractAccTest { assertThat(taskCommentsAfterDeletion).hasSize(1); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void should_FailToDeleteTaskComment_When_UserHasNoAuthorization() throws NotAuthorizedException, TaskNotFoundException { @@ -92,7 +92,7 @@ public class DeleteTaskCommentAccTest extends AbstractAccTest { assertThat(taskCommentsAfterDeletion).hasSize(1); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_FailToDeleteTaskComment_When_TaskCommentIdIsInvalid() throws NotAuthorizedException, TaskNotFoundException { @@ -115,7 +115,7 @@ public class DeleteTaskCommentAccTest extends AbstractAccTest { assertThat(taskCommentsAfterDeletion).hasSize(3); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_FailToDeleteTaskComment_When_TaskCommentIsNotExisting() throws NotAuthorizedException, TaskNotFoundException { diff --git a/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java index 2cf020e36..35a475ffb 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java @@ -27,7 +27,7 @@ class GetTaskAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ReturnTask_When_RequestingTaskByTaskId() throws TaskNotFoundException, NotAuthorizedException, InvalidArgumentException { @@ -80,7 +80,7 @@ class GetTaskAccTest extends AbstractAccTest { assertThat(task.getCustomAttribute("16")).isEqualTo("custom16"); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ThrowException_When_RequestedTaskByIdIsNotExisting() { TaskService taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java index 4410283ba..dc1437bbf 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java @@ -25,7 +25,7 @@ public class GetTaskCommentAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ReturnTaskComments_For_TaskId() throws NotAuthorizedException, TaskNotFoundException { @@ -37,7 +37,7 @@ public class GetTaskCommentAccTest extends AbstractAccTest { assertThat(taskComments).hasSize(3); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ReturnEmptyList_When_TaskCommentsDontExist() throws NotAuthorizedException, TaskNotFoundException { @@ -47,7 +47,7 @@ public class GetTaskCommentAccTest extends AbstractAccTest { assertThat(taskService.getTaskComments("TKI:000000000000000000000000000000000036")).isEmpty(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_FailToReturnTaskComments_When_TaskIstNotVisible() { @@ -60,7 +60,7 @@ public class GetTaskCommentAccTest extends AbstractAccTest { assertThatThrownBy(httpCall).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ReturnTaskComment_For_TaskCommentId() throws TaskCommentNotFoundException, NotAuthorizedException, TaskNotFoundException, @@ -73,7 +73,7 @@ public class GetTaskCommentAccTest extends AbstractAccTest { assertThat(taskComment.getCreator()).isEqualTo("user-1-1"); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_FailToReturnTaskComment_When_TaskCommentIsNotExisting() { @@ -84,7 +84,7 @@ public class GetTaskCommentAccTest extends AbstractAccTest { assertThatThrownBy(lambda).isInstanceOf(TaskCommentNotFoundException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_FailToReturntaskComment_When_TaskIstNotVisible() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java index 3540e1898..bf8a3cd42 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java @@ -58,7 +58,7 @@ class QueryTaskByClassificationNameAccTest extends AbstractAccTest { assertThat(columnValueList).hasSize(5); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testQueryByClassificationNameIn() { TaskService taskService = taskanaEngine.getTaskService(); @@ -79,7 +79,7 @@ class QueryTaskByClassificationNameAccTest extends AbstractAccTest { assertThat(tasks).hasSize(1); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testQueryByClassificationNameLike() { TaskService taskService = taskanaEngine.getTaskService(); @@ -96,7 +96,7 @@ class QueryTaskByClassificationNameAccTest extends AbstractAccTest { assertThat(tasks).hasSize(32); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testSelectByAttachmentClassificationNameLike() { TaskService taskService = taskanaEngine.getTaskService(); @@ -117,7 +117,7 @@ class QueryTaskByClassificationNameAccTest extends AbstractAccTest { assertThat(tasks).hasSize(7); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testSelectByAttachmentClassificationNameIn() { TaskService taskService = taskanaEngine.getTaskService(); @@ -138,7 +138,7 @@ class QueryTaskByClassificationNameAccTest extends AbstractAccTest { assertThat(tasks).hasSize(4); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testQueryAndCountMatchForClassificationName() { TaskService taskService = taskanaEngine.getTaskService(); @@ -150,7 +150,7 @@ class QueryTaskByClassificationNameAccTest extends AbstractAccTest { assertThat(tasks).hasSize((int) numberOfTasks); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testQueryAndCountForAttachmentClassificationName() { TaskService taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java index 3748e3f2f..2509492a7 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java @@ -34,7 +34,7 @@ class QueryTaskWithAttachmentAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetAttachmentSummariesFromTask() { TaskService taskService = taskanaEngine.getTaskService(); @@ -58,7 +58,7 @@ class QueryTaskWithAttachmentAccTest extends AbstractAccTest { assertThat(attachmentSummaries).isEmpty(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testIfNewTaskHasEmptyAttachmentList() { TaskService taskService = taskanaEngine.getTaskService(); @@ -67,7 +67,7 @@ class QueryTaskWithAttachmentAccTest extends AbstractAccTest { assertThat(task.asSummary().getAttachmentSummaries()).isNotNull(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ConfirmIfAttachmentSummariesAreCorrect_When_UsingTaskQueryAndGetTaskById() throws TaskNotFoundException, NotAuthorizedException { @@ -92,7 +92,7 @@ class QueryTaskWithAttachmentAccTest extends AbstractAccTest { toArray(originalAttachments)); // but not same reference } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ConfirmIfAttachmentSummariesAreCorrect() throws InvalidArgumentException, TaskNotFoundException, NotAuthorizedException { 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 1a0655e90..72af28cbd 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java @@ -150,7 +150,7 @@ class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryForOwnerLike() { @@ -169,7 +169,7 @@ class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryForParentBusinessProcessId() { @@ -190,7 +190,7 @@ class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryForName() { @@ -205,7 +205,7 @@ class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryForClassificationKey() { @@ -227,7 +227,7 @@ class QueryTasksAccTest extends AbstractAccTest { assertThat(result4).hasSize(7); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryForAttachmentInSummary() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -284,7 +284,7 @@ class QueryTasksAccTest extends AbstractAccTest { assertThat(countAllExternalIds).isEqualTo(countAllIds); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @TestFactory Stream testQueryForCustomX() { List> list = @@ -326,7 +326,7 @@ class QueryTasksAccTest extends AbstractAccTest { assertThat(result2).hasSize(expectedResult); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryForCustom7WithExceptionInLike() { @@ -338,7 +338,7 @@ class QueryTasksAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidArgumentException.class); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryForCustom7WithExceptionInIn() throws InvalidArgumentException { @@ -358,7 +358,7 @@ class QueryTasksAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidArgumentException.class); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryForCustom7WithException() throws InvalidArgumentException { @@ -372,7 +372,7 @@ class QueryTasksAccTest extends AbstractAccTest { assertThat(result2).hasSize(2); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testQueryTaskByCustomAttributes() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -418,7 +418,7 @@ class QueryTasksAccTest extends AbstractAccTest { } } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testQueryAndCountMatch() { TaskQuery taskQuery = taskService.createTaskQuery(); @@ -838,7 +838,7 @@ class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryForExternalIdIn() { @@ -867,7 +867,7 @@ class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryForExternalIdLike() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java index 34a340b22..b7144d34f 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java @@ -23,7 +23,7 @@ class QueryTasksByObjectReferenceAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryTasksByExcactValueOfObjectReference() throws SystemException { TaskService taskService = taskanaEngine.getTaskService(); @@ -34,7 +34,7 @@ class QueryTasksByObjectReferenceAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryTasksByExcactValueAndTypeOfObjectReference() throws SystemException { TaskService taskService = taskanaEngine.getTaskService(); @@ -49,7 +49,7 @@ class QueryTasksByObjectReferenceAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryTasksByValueLikeOfObjectReference() throws SystemException { TaskService taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java index d4bcd55bb..60f1efab7 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java @@ -27,7 +27,7 @@ class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testCreatedWithin2Intervals() { TaskService taskService = taskanaEngine.getTaskService(); @@ -59,7 +59,7 @@ class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testCreatedBefore() { TaskService taskService = taskanaEngine.getTaskService(); @@ -84,7 +84,7 @@ class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testCreatedAfter() { TaskService taskService = taskanaEngine.getTaskService(); @@ -109,7 +109,7 @@ class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testClaimedWithin2Intervals() { TaskService taskService = taskanaEngine.getTaskService(); @@ -141,7 +141,7 @@ class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testCompletedWithin() { TaskService taskService = taskanaEngine.getTaskService(); @@ -166,7 +166,7 @@ class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testModifiedWithin() { TaskService taskService = taskanaEngine.getTaskService(); @@ -191,7 +191,7 @@ class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testPlannedWithin() { TaskService taskService = taskanaEngine.getTaskService(); @@ -216,7 +216,7 @@ class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testDueWithin() { TaskService taskService = taskanaEngine.getTaskService(); 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 3ae4d5fde..3f42f1a10 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java @@ -21,7 +21,7 @@ public class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void should_ReturnAllTasksByWildcardSearch_For_ProvidedSearchValue() { TaskService taskService = taskanaEngine.getTaskService(); @@ -43,7 +43,7 @@ public class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void should_ReturnAllTasks_For_ProvidedSearchValueAndAdditionalParameters() { TaskService taskService = taskanaEngine.getTaskService(); @@ -67,7 +67,7 @@ public class QueryTasksByWildcardSearchAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void should_ThrowException_When_NotUsingSearchFieldsAndValueParamsTogether() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java index b68d4e690..92acc5ae4 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java @@ -26,7 +26,7 @@ class QueryTasksByWorkbasketAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryForWorkbasketKeyDomain() { TaskService taskService = taskanaEngine.getTaskService(); @@ -50,7 +50,7 @@ class QueryTasksByWorkbasketAccTest extends AbstractAccTest { assertThat(result2).hasSize(52); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testThrowsExceptionIfNoOpenerPermissionOnQueriedWorkbasket() { TaskService taskService = taskanaEngine.getTaskService(); @@ -65,7 +65,7 @@ class QueryTasksByWorkbasketAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(NotAuthorizedToQueryWorkbasketException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testThrowsExceptionIfNoOpenerPermissionOnAtLeastOneQueriedWorkbasket() { TaskService taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java index 8d6777fec..0e965a623 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java @@ -21,7 +21,7 @@ class QueryTasksWithPaginationAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testGetFirstPageOfTaskQueryWithOffset() { TaskService taskService = taskanaEngine.getTaskService(); @@ -33,7 +33,7 @@ class QueryTasksWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(10); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testSecondPageOfTaskQueryWithOffset() { TaskService taskService = taskanaEngine.getTaskService(); @@ -45,7 +45,7 @@ class QueryTasksWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(10); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testListOffsetAndLimitOutOfBounds() { TaskService taskService = taskanaEngine.getTaskService(); @@ -75,7 +75,7 @@ class QueryTasksWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testPaginationWithPages() { TaskService taskService = taskanaEngine.getTaskService(); @@ -121,7 +121,7 @@ class QueryTasksWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(2); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testPaginationNullAndNegativeLimitsIgnoring() { TaskService taskService = taskanaEngine.getTaskService(); @@ -157,7 +157,7 @@ class QueryTasksWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(10); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testCountOfTaskQuery() { TaskService taskService = taskanaEngine.getTaskService(); @@ -169,7 +169,7 @@ class QueryTasksWithPaginationAccTest extends AbstractAccTest { assertThat(count).isEqualTo(22L); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testCountOfTaskQueryWithAttachmentChannelFilter() { TaskService taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java index 04c04d83a..92cd1a0f2 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java @@ -31,7 +31,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortByModifiedAndDomain() { TaskService taskService = taskanaEngine.getTaskService(); @@ -55,7 +55,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortByTaskIdDesc() { TaskService taskService = taskanaEngine.getTaskService(); @@ -82,7 +82,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortByTaskIdAsc() { TaskService taskService = taskanaEngine.getTaskService(); @@ -106,7 +106,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortByDomainNameAndCreated() { TaskService taskService = taskanaEngine.getTaskService(); @@ -128,7 +128,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortByPorSystemNoteDueAndOwner() { TaskService taskService = taskanaEngine.getTaskService(); @@ -160,7 +160,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortByPorSystemInstanceParentProcPlannedAndState() { TaskService taskService = taskanaEngine.getTaskService(); @@ -192,7 +192,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortByPorCompanyAndClaimed() { TaskService taskService = taskanaEngine.getTaskService(); @@ -225,7 +225,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortByWbKeyPrioPorValueAndCompleted() { TaskService taskService = taskanaEngine.getTaskService(); @@ -258,7 +258,7 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testSortBpIdClassificationIdDescriptionAndPorType() { TaskService taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java index 559e79c06..f95746d34 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java @@ -26,7 +26,7 @@ import pro.taskana.task.api.models.TaskSummary; public class ServiceLevelOfAllTasksAccTest extends AbstractAccTest { TaskService taskService; - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void testSetPlannedPropertyOnAllTasks() throws SQLException { taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java index 4f6704fe3..875ae7688 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java @@ -55,7 +55,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { /* CREATE TASK */ - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_CalculatePlannedDateAtCreate() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -90,7 +90,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(expectedPlanned).isEqualTo(readTask.getPlanned()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_calculateDueDateAtCreate() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -122,7 +122,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(expectedDue).isEqualTo(readTask.getDue()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_NotThrowException_When_DueAndPlannedAreConsistent() throws ClassificationNotFoundException { @@ -150,7 +150,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThatCode(call).doesNotThrowAnyException(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ThrowException_When_DueAndPlannedAreInconsistent() { @@ -170,7 +170,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidArgumentException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_VerifyThatCreateAndPlannedAreClose() throws Exception { @@ -195,7 +195,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { /* UPDATE TASK */ - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ThrowException_When_DueAndPlannedAreChangedInconsistently() throws Exception { TaskService taskService = taskanaEngine.getTaskService(); @@ -209,7 +209,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { + "date 2020-07-02T00:00:00Z not matching the service level PT24H."); } - @WithAccessId(user = "user-3-2", groups = "group_2") + @WithAccessId(user = "user-3-2", groups = "group-2") @Test void should_SetPlanned_When_SetPlannedRequestContainsDuplicateTaskIds() throws NotAuthorizedException, TaskNotFoundException { @@ -246,7 +246,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(due4).isEqualTo(dueExpected); } - @WithAccessId(user = "user-3-2", groups = "group_2") + @WithAccessId(user = "user-3-2", groups = "group-2") @Test void should_SetPlanned_When_RequestContainsDuplicatesAndNotExistingTaskIds() throws NotAuthorizedException, TaskNotFoundException { @@ -273,7 +273,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(due5).isEqualTo(dueExpected); } - @WithAccessId(user = "user-1-1", groups = "group_2") + @WithAccessId(user = "user-1-1", groups = "group-2") @Test void should_SetPlanned_When_RequestContainsTasksWithAttachments() throws NotAuthorizedException, TaskNotFoundException, ClassificationNotFoundException, @@ -352,7 +352,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { // |TAI:000000000000000000000000000000000014 | CLI:100000000000000000000000000000000004,| P14D | // +-----------------------------------------+------------------------------------------+------+ - @WithAccessId(user = "user-3-2", groups = "group_2") + @WithAccessId(user = "user-3-2", groups = "group-2") @Test void should_ReturnBulkLog_When_UserIsNotAuthorizedForTasks() { String tkId1 = "TKI:000000000000000000000000000000000008"; @@ -373,7 +373,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { .hasOnlyElementsOfType(NotAuthorizedException.class); } - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void should_SetPlannedPropertyOfTasks_When_RequestedByAdminUser() throws NotAuthorizedException, TaskNotFoundException { @@ -398,7 +398,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(dueBulk4).isEqualTo(getInstant("2020-05-22T07:00:00")); } - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void should_DoNothing_When_SetPlannedIsCalledWithEmptyTasksList() { Instant planned = getInstant("2020-05-03T07:00:00"); @@ -416,7 +416,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { // |TAI:000000000000000000000000000000000007 | CLI:100000000000000000000000000000000008 | P1D | // |TKI:000000000000000000000000000000000066 | CLI:100000000000000000000000000000000024 | P0D | // +-----------------------------------------+------------------------------------------+------+ - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void should_SetPlannedPropertyWithBulkUpdate_When_RequestContainsASingleTask() throws NotAuthorizedException, TaskNotFoundException { @@ -432,7 +432,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(task.getDue()).isEqualTo(planned.plus(Duration.ofDays(days))); } - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void should_SetPlannedPropertyOnSingle_When_UpdateTaskWasCalled() throws NotAuthorizedException, TaskNotFoundException, InvalidArgumentException, @@ -448,7 +448,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(task.getDue()).isEqualTo(task.getPlanned().plus(Duration.ofDays(days))); } - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void should_SetPlanned_When_OnlyDueWasChanged() throws NotAuthorizedException, TaskNotFoundException, InvalidArgumentException, @@ -464,7 +464,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(task.getPlanned()).isEqualTo(getInstant("2020-05-08T07:00:00")); // Friday } - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void should_SetDue_When_OnlyPlannedWasChanged() throws NotAuthorizedException, TaskNotFoundException, InvalidArgumentException, @@ -482,7 +482,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(task.getPlanned()).isEqualTo(task.getDue().plus(Duration.ofDays(days))); } - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void should_SetPlanned_When_DueIsChangedAndPlannedIsNulled() throws NotAuthorizedException, TaskNotFoundException, InvalidArgumentException, @@ -499,7 +499,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(task.getPlanned()).isEqualTo(task.getDue().plus(Duration.ofDays(days))); } - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void should_SetDue_When_TaskUpdateIsCalled() throws NotAuthorizedException, TaskNotFoundException, InvalidArgumentException, @@ -533,7 +533,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(task.getDue()).isEqualTo(getInstant("2020-05-15T07:00:00")); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void should_UpdateTaskPlannedOrDue_When_PlannedOrDueAreWeekendDays() throws NotAuthorizedException, TaskNotFoundException, ClassificationNotFoundException, @@ -564,7 +564,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { assertThat(task.getDue()).isEqualTo(getInstant("2020-03-20T07:00:00")); // friday } - @WithAccessId(user = "user-1-4", groups = "group_1") + @WithAccessId(user = "user-1-4", groups = "group-1") @Test void should_UpdateTaskPlannedOrDue_When_PlannedOrDueAreOnWeekends_ServiceLevel_P0D() throws NotAuthorizedException, TaskNotFoundException, ClassificationNotFoundException, @@ -637,7 +637,7 @@ public class ServiceLevelPriorityAccTest extends AbstractAccTest { + "due date 2020-03-23T07:00:00Z not matching the service level PT0S."); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void should_notThrowServiceLevelViolation_IfWeekendOrHolidaysBetweenDates() throws NotAuthorizedException, TaskNotFoundException, ClassificationNotFoundException, diff --git a/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java index d36c1e51b..cd5e7bdd7 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java @@ -37,7 +37,7 @@ import pro.taskana.task.api.models.TaskSummary; @ExtendWith(JaasExtension.class) public class SetOwnerAccTest extends AbstractAccTest { - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testSetOwnerAndSubsequentClaimSucceeds() throws TaskNotFoundException, NotAuthorizedException, InvalidStateException, @@ -59,7 +59,7 @@ public class SetOwnerAccTest extends AbstractAccTest { assertThat(taskClaimed.getOwner()).isEqualTo("user-1-2"); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testSetOwnerViaUpdateTaskNotAuthorized() { @@ -73,7 +73,7 @@ public class SetOwnerAccTest extends AbstractAccTest { .isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testSetOwnerOfClaimedTaskFails() throws TaskNotFoundException, NotAuthorizedException { @@ -87,7 +87,7 @@ public class SetOwnerAccTest extends AbstractAccTest { .isInstanceOf(InvalidStateException.class); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testSetOwnerNotAuthorized() { @@ -103,7 +103,7 @@ public class SetOwnerAccTest extends AbstractAccTest { assertThat(results.getErrorForId(taskReadyId)).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "user-3-2", groups = "group_2") + @WithAccessId(user = "user-3-2", groups = "group-2") @Test void testSetOwnerOfTasksWithDuplicatesSucceeds() { @@ -118,7 +118,7 @@ public class SetOwnerAccTest extends AbstractAccTest { assertThat(results.containsErrors()).isFalse(); } - @WithAccessId(user = "user-3-2", groups = "group_2") + @WithAccessId(user = "user-3-2", groups = "group-2") @Test void testSetOwnerOfTasksWithDuplicatesAndNotExistingSucceeds() { List taskIds = @@ -136,7 +136,7 @@ public class SetOwnerAccTest extends AbstractAccTest { .isInstanceOf(TaskNotFoundException.class); } - @WithAccessId(user = "user-3-2", groups = "group_2") + @WithAccessId(user = "user-3-2", groups = "group-2") @Test void testSetOwnerOfTasksWithNoQualifyingTasks() { @@ -152,7 +152,7 @@ public class SetOwnerAccTest extends AbstractAccTest { assertThat(results.getErrorMap()).hasSize(3); } - @WithAccessId(user = "user-3-2", groups = "group_2") + @WithAccessId(user = "user-3-2", groups = "group-2") @Test void testSetOwnerWithEmptyList() { List taskIds = new ArrayList<>(); @@ -161,7 +161,7 @@ public class SetOwnerAccTest extends AbstractAccTest { assertThat(results.containsErrors()).isFalse(); } - @WithAccessId(user = "user-1-2", groups = "group_2") + @WithAccessId(user = "user-1-2", groups = "group-2") @Test void testSetOwnerWithAllTasksAndVariousExceptions() throws NoSuchFieldException, IllegalAccessException, SQLException { @@ -190,7 +190,7 @@ public class SetOwnerAccTest extends AbstractAccTest { .areExactly(23, notAuthorizedException); } - @WithAccessId(user = "admin", groups = "group_2") + @WithAccessId(user = "admin", groups = "group-2") @Test void testSetOwnerWithAllTasksAndVariousExceptionsAsAdmin() throws SQLException { resetDb(false); diff --git a/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java index a4db87129..9e76083da 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java @@ -36,7 +36,7 @@ class TerminateTaskAccTest extends AbstractAccTest { taskService = taskanaEngine.getTaskService(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ReturnAllTerminatedTasks_When_QueryTerminatedState() { List taskSummaries = @@ -44,7 +44,7 @@ class TerminateTaskAccTest extends AbstractAccTest { assertThat(taskSummaries).hasSize(5); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @WithAccessId(user = "taskadmin") @TestTemplate void should_TerminateTask_When_TaskStateIsReady() @@ -58,7 +58,7 @@ class TerminateTaskAccTest extends AbstractAccTest { assertThat(numTasks).isEqualTo(6); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @WithAccessId(user = "taskadmin") @TestTemplate void should_TerminateTask_When_TaskStateIsClaimed() @@ -77,7 +77,7 @@ class TerminateTaskAccTest extends AbstractAccTest { assertThat(numTasksTerminated).isEqualTo(6); } - @WithAccessId(user = "taskadmin", groups = "group_1") + @WithAccessId(user = "taskadmin", groups = "group-1") @Test void should_ThrowException_When_TerminateTaskWithTaskStateCompleted() { List taskSummaries = @@ -98,7 +98,7 @@ class TerminateTaskAccTest extends AbstractAccTest { assertThatThrownBy(taskanaCall).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "taskadmin", groups = "group_1") + @WithAccessId(user = "taskadmin", groups = "group-1") @Test void should_ThrowException_When_TerminateTaskWithTaskStateTerminated() { List taskSummaries = @@ -109,7 +109,7 @@ class TerminateTaskAccTest extends AbstractAccTest { assertThatThrownBy(taskanaCall).isInstanceOf(InvalidStateException.class); } - @WithAccessId(user = "taskadmin", groups = "group_1") + @WithAccessId(user = "taskadmin", groups = "group-1") @Test void should_ThrowException_When_TerminateTaskWithTaskStateCancelled() { List taskSummaries = diff --git a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java index 2745bdf08..b40c46cde 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java @@ -38,7 +38,7 @@ class TransferTaskAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_TransferTaskToWorkbasket_When_WorkbasketIdIsProvided() throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, @@ -77,7 +77,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThat(transferredTask.getState()).isEqualTo(TaskState.READY); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_TransferTaskToWorkbasket_When_WorkbasketKeyAndDomainIsProvided() throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, @@ -96,7 +96,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThat(transferredTask.getState()).isEqualTo(TaskState.READY); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ChangeDomain_When_TransferingTaskToWorkbasketWithDifferentDomain() throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, @@ -111,7 +111,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThat(transferedTask.getDomain()).isNotEqualTo(domain1); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ThrowException_When_UserHasNoTransferAuthorization() throws NotAuthorizedException, TaskNotFoundException { @@ -125,7 +125,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_ThrowException_When_DestinationWorkbasketDoesNotExist() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -142,7 +142,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(WorkbasketNotFoundException.class); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_ThrowException_When_TaskToTransferDoesNotExist() { TaskService taskService = taskanaEngine.getTaskService(); @@ -174,7 +174,7 @@ class TransferTaskAccTest extends AbstractAccTest { + "'WBI:100000000000000000000000000000000005' is needed."); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ThrowException_When_TransferWithNoAppendAuthorization() throws NotAuthorizedException, TaskNotFoundException { @@ -194,7 +194,7 @@ class TransferTaskAccTest extends AbstractAccTest { + "'WBI:100000000000000000000000000000000008' is needed."); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_ThrowException_When_TaskToTransferIsAlreadyCompleted() throws NotAuthorizedException, TaskNotFoundException { @@ -208,7 +208,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidStateException.class); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_BulkTransferTasks_When_WorkbasketIdIsProvided() throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, @@ -245,7 +245,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThat(transferredTask.getOwner()).isNull(); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_BulkTransferOnlyValidTasks_When_SomeTasksToTransferCauseExceptions() throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, @@ -322,7 +322,7 @@ class TransferTaskAccTest extends AbstractAccTest { .hasMessageContaining("APPEND"); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_TransferTasks_When_TransferTasksWithListNotSupportingRemove() { TaskService taskService = taskanaEngine.getTaskService(); @@ -336,7 +336,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatCode(call).doesNotThrowAnyException(); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_ThrowException_When_TransferTasksWithInvalidTasksIdList() { TaskService taskService = taskanaEngine.getTaskService(); @@ -361,7 +361,7 @@ class TransferTaskAccTest extends AbstractAccTest { .hasMessage("TaskIds must not contain only invalid arguments."); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_ThrowException_When_TransferEmptyTaskIdList() { TaskService taskService = taskanaEngine.getTaskService(); @@ -373,7 +373,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidArgumentException.class); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_BulkTransferTasks_When_WorkbasketKeyAndDomainIsProvided() throws WorkbasketNotFoundException, NotAuthorizedException, InvalidArgumentException, diff --git a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java index 3988ea479..eb274ac7e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java @@ -39,7 +39,7 @@ class UpdateTaskAccTest extends AbstractAccTest { private final TaskService taskService = taskanaEngine.getTaskService(); - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_UpdatePrimaryObjectReferenceOfTask_When_Requested() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -67,7 +67,7 @@ class UpdateTaskAccTest extends AbstractAccTest { assertThat(updatedTask.getParentBusinessProcessId()).isEqualTo("MY_PARENT_PROCESS_ID"); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_UpdatePrimaryObjectReferenceOfTask_When_ObjectreferenceSystemAndSystemInstanceIsNull() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -96,7 +96,7 @@ class UpdateTaskAccTest extends AbstractAccTest { assertThat(updatedTask.getParentBusinessProcessId()).isEqualTo("MY_PARENT_PROCESS_ID"); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ThrowException_When_MandatoryPrimaryObjectReferenceIsNotSetOrIncomplete() throws NotAuthorizedException, TaskNotFoundException { @@ -124,7 +124,7 @@ class UpdateTaskAccTest extends AbstractAccTest { .isInstanceOf(InvalidArgumentException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ThrowException_When_TaskHasAlreadyBeenUpdated() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -156,7 +156,7 @@ class UpdateTaskAccTest extends AbstractAccTest { assertThatCode(updateTaskCall).doesNotThrowAnyException(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_UpdateTaskProperties_When_ClassificationOfTaskIsChanged() throws Exception { Task task = taskService.getTask("TKI:000000000000000000000000000000000000"); @@ -174,7 +174,7 @@ class UpdateTaskAccTest extends AbstractAccTest { assertThat(task.getDescription()).isEqualTo(updatedTask.getDescription()); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void should_UpdateReadFlagOfTask_When_SetTaskReadIsCalled() throws TaskNotFoundException, NotAuthorizedException { @@ -195,7 +195,7 @@ class UpdateTaskAccTest extends AbstractAccTest { .isInstanceOf(TaskNotFoundException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_UpdateTask_When_CustomPropertiesOfTaskWereChanged() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, @@ -209,7 +209,7 @@ class UpdateTaskAccTest extends AbstractAccTest { assertThat(updatedTask).isNotNull(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_ThrowException_When_ModificationOfWorkbasketKeyIsAttempted() throws NotAuthorizedException, TaskNotFoundException { @@ -221,7 +221,7 @@ class UpdateTaskAccTest extends AbstractAccTest { .isInstanceOf(InvalidArgumentException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_UpdateNoTasks_When_UpdateTasksWithUnmatchedObjectReferenceWasCalled() throws InvalidArgumentException { @@ -241,7 +241,7 @@ class UpdateTaskAccTest extends AbstractAccTest { assertThat(taskIds).isEmpty(); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_UpdateTasks_When_MatchingPrimaryObjectReferenceWasChanged() throws InvalidArgumentException, TaskNotFoundException, NotAuthorizedException { @@ -268,7 +268,7 @@ class UpdateTaskAccTest extends AbstractAccTest { } } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void should_UpdateTaskCustomAttributes_When_UpdateTasksIsCalled() throws InvalidArgumentException, TaskNotFoundException, NotAuthorizedException { @@ -295,7 +295,7 @@ class UpdateTaskAccTest extends AbstractAccTest { } } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_UpdateCallbackInfo_When_RequestedByApi() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, diff --git a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java index 006e73824..d30ab0c9b 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java @@ -75,7 +75,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(task).isNotNull(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testAddNewAttachment() throws TaskNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -95,7 +95,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { .containsOnly(task.getModified()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testAddValidAttachmentTwice() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, @@ -118,7 +118,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { .containsOnly(task.getModified()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testAddNewAttachmentTwiceWithoutTaskanaMethodWillThrowAttachmentPersistenceException() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, @@ -138,7 +138,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(AttachmentPersistenceException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testAddExistingAttachmentAgainWillUpdateWhenNotEqual() throws TaskNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -174,7 +174,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(task.getPlanned().plus(Duration.ofDays(calendarDays))).isEqualTo(task.getDue()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testAddExistingAttachmentAgainWillDoNothingWhenEqual() throws TaskNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -198,7 +198,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(task.getAttachments()).hasSize(attachmentCount2); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testAddAttachmentAsNullValueWillBeIgnored() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, @@ -232,7 +232,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(task.getPlanned().plus(Duration.ofDays(1))).isEqualTo(task.getDue()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testRemoveAttachment() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, @@ -254,7 +254,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(task.getPlanned().plus(Duration.ofDays(1))).isEqualTo(task.getDue()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testRemoveAttachmentWithNullAndNotAddedId() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, @@ -277,7 +277,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(task.getAttachments()).hasSize(attachmentCount); // persisted, still same } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testUpdateAttachment() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, @@ -314,7 +314,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(task.getPlanned().plus(Duration.ofDays(calendarDays))).isEqualTo(task.getDue()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void modifyExistingAttachment() throws TaskNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -411,7 +411,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(faxFound && rohrpostFound).isTrue(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void replaceExistingAttachments() throws TaskNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -472,7 +472,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { assertThat(task.getAttachments().get(0).getChannel()).isEqualTo("DHL"); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testPrioDurationOfTaskFromAttachmentsAtUpdate() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, @@ -535,7 +535,7 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { .isEqualTo(readTask.getDue()); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testAddCustomAttributeToAttachment() throws TaskNotFoundException, ClassificationNotFoundException, NotAuthorizedException, diff --git a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java index 49bfbb992..17480a004 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java @@ -27,7 +27,7 @@ public class UpdateTaskCommentAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_UpdateTaskComment_For_TaskComment() throws TaskCommentNotFoundException, NotAuthorizedException, ConcurrencyException, @@ -51,7 +51,7 @@ public class UpdateTaskCommentAccTest extends AbstractAccTest { assertThat(taskCommentsAfterUpdate.get(0).getTextField()).isEqualTo("updated textfield"); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void should_FailToUpdateTaskComment_When_UserHasNoAuthorization() throws TaskCommentNotFoundException, NotAuthorizedException, TaskNotFoundException, @@ -78,7 +78,7 @@ public class UpdateTaskCommentAccTest extends AbstractAccTest { .isEqualTo("some other text in textfield"); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void should_FailToUpdateTaskComment_When_UserTriesToUpdateTaskByManipulatingOwner() throws TaskCommentNotFoundException, NotAuthorizedException, TaskNotFoundException, @@ -99,7 +99,7 @@ public class UpdateTaskCommentAccTest extends AbstractAccTest { assertThatThrownBy(updateTaskCommentCall).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void should_FailToUpdateTaskComment_When_TaskCommentWasModifiedConcurrently() throws TaskCommentNotFoundException, NotAuthorizedException, TaskNotFoundException, diff --git a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java index 9061fcd1d..a2cf573a3 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java @@ -33,7 +33,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testClaimTask() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -53,7 +53,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThat(claimedTask.getOwner()).isEqualTo("user-1-2"); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testThrowsExceptionIfTaskIsAlreadyClaimed() throws NotAuthorizedException, TaskNotFoundException { @@ -69,7 +69,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidOwnerException.class); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testClaimAlreadyClaimedByCallerTask() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -80,7 +80,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { taskService.claim(task.getId()); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testForceClaimTaskWhichIsAlreadyClaimedByAnotherUser() throws NotAuthorizedException, TaskNotFoundException { @@ -96,7 +96,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidOwnerException.class); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testCancelClaimTask() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -114,7 +114,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThat(unclaimedTask.getOwner()).isNull(); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testThrowsExceptionIfCancelClaimOfTaskFromAnotherUser() throws NotAuthorizedException, TaskNotFoundException { @@ -130,7 +130,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidOwnerException.class); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testForceCancelClaimOfTaskFromAnotherUser() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -148,7 +148,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThat(unclaimedTask.getOwner()).isNull(); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testCompleteTask() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -170,7 +170,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThat(completedTask.getOwner()).isEqualTo("user-1-2"); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testForceCompleteUnclaimedTask() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -189,7 +189,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThat(completedTask.getOwner()).isEqualTo("user-1-2"); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testThrowsExceptionIfCompletingClaimedTaskOfAnotherUser() throws NotAuthorizedException, TaskNotFoundException { @@ -205,7 +205,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidOwnerException.class); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testForceCompleteClaimedTaskOfAnotherUser() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -224,7 +224,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { assertThat(completedTask.getOwner()).isEqualTo("user-1-2"); } - @WithAccessId(user = "user-1-2", groups = "group_1") + @WithAccessId(user = "user-1-2", groups = "group-1") @Test void testBulkCompleteTasks() throws NotAuthorizedException, InvalidArgumentException, TaskNotFoundException { diff --git a/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java b/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java index 48a5a1594..b1babfc98 100644 --- a/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java @@ -22,7 +22,7 @@ import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; @ExtendWith(JaasExtension.class) class TaskRoutingAccTest extends AbstractAccTest { - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testCreateTaskWithoutWorkbasketAndVoidNewTaskMethod() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -45,7 +45,7 @@ class TaskRoutingAccTest extends AbstractAccTest { .isEqualTo(createdTask.getWorkbasketSummary().getId()); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testCreateTaskWithNullWorkbasket() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -60,7 +60,7 @@ class TaskRoutingAccTest extends AbstractAccTest { .isInstanceOf(InvalidArgumentException.class); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testCreateTaskWithNullRouting() throws InvalidArgumentException { @@ -74,7 +74,7 @@ class TaskRoutingAccTest extends AbstractAccTest { .isInstanceOf(InvalidArgumentException.class); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testCreateTaskWithRoutingToMultipleWorkbaskets() throws InvalidArgumentException { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java index 05552a778..5da830f40 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java @@ -80,7 +80,7 @@ class CreateWorkbasketAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void should_beAbleToCreateNewWorkbasket_When_WorkbasketCopy() throws Exception { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java index 1cc72621a..7fa55ee96 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java @@ -89,7 +89,7 @@ class DeleteWorkbasketAccTest extends AbstractAccTest { @WithAccessId( user = "user-1-1", - groups = {"teamlead_1", "group_1", "businessadmin"}) + groups = {"teamlead_1", "group-1", "businessadmin"}) @Test void testDeleteWorkbasketAlsoAsDistributionTarget() throws WorkbasketNotFoundException, NotAuthorizedException { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java index 0443339cf..caa7ffab3 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java @@ -25,7 +25,7 @@ class DeleteWorkbasketAuthorizationsAccTest extends AbstractAccTest { ThrowingCallable deleteWorkbasketAccessItemCall = () -> { - workbasketService.deleteWorkbasketAccessItemsForAccessId("group_1"); + workbasketService.deleteWorkbasketAccessItemsForAccessId("group-1"); }; assertThatThrownBy(deleteWorkbasketAccessItemCall).isInstanceOf(NotAuthorizedException.class); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java index ecee80b1b..ebabc9cb7 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java @@ -78,7 +78,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( user = "user-1-1", - groups = {"teamlead-1", "group_1", "group_2", "businessadmin"}) + groups = {"teamlead-1", "group-1", "group-2", "businessadmin"}) @Test void testDistributionTargetCallsWithNonExistingWorkbaskets() throws NotAuthorizedException, WorkbasketNotFoundException { @@ -124,7 +124,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { assertThat(distributionTargets).hasSize(4); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @WithAccessId(user = "taskadmin") @TestTemplate void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdminAndMakesDistTargetCalls() { @@ -169,7 +169,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( user = "user-2-2", - groups = {"group_1", "group_2", "businessadmin"}) + groups = {"group-1", "group-2", "businessadmin"}) @Test void testAddAndRemoveDistributionTargets() throws NotAuthorizedException, WorkbasketNotFoundException { @@ -224,7 +224,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( user = "user-2-2", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testAddDistributionTargetsFailsNotAuthorized() throws NotAuthorizedException, WorkbasketNotFoundException { @@ -247,7 +247,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( user = "user-2-2", - groups = {"group_1", "group_2", "businessadmin"}) + groups = {"group-1", "group-2", "businessadmin"}) @Test void testSetDistributionTargets() throws NotAuthorizedException, WorkbasketNotFoundException, SQLException { @@ -277,7 +277,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( user = "user-2-2", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testGetDistributionSourcesById() throws NotAuthorizedException, WorkbasketNotFoundException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -299,7 +299,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( user = "user-2-2", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testGetDistributionSourcesByKeyDomain() throws NotAuthorizedException, WorkbasketNotFoundException { @@ -334,7 +334,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( user = "user-2-2", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) @Test void testQueryDistributionSourcesThrowsWorkbasketNotFound() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java index 01287732d..42e2b1230 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java @@ -28,7 +28,7 @@ class GetWorkbasketAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetWorkbasketById() throws NotAuthorizedException, WorkbasketNotFoundException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -83,7 +83,7 @@ class GetWorkbasketAccTest extends AbstractAccTest { assertThat(retrievedWorkbasket).isNotNull(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetWorkbasketByKeyAndDomain() throws NotAuthorizedException, WorkbasketNotFoundException { @@ -106,7 +106,7 @@ class GetWorkbasketAccTest extends AbstractAccTest { assertThat(workbasket.getCustom4()).isEqualTo("custom4"); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetWorkbasketPermissions() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -120,7 +120,7 @@ class GetWorkbasketAccTest extends AbstractAccTest { assertThat(permissions.contains(WorkbasketPermission.APPEND)).isTrue(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetWorkbasketPermissionsForInvalidWorkbasketId() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -130,7 +130,7 @@ class GetWorkbasketAccTest extends AbstractAccTest { assertThat(permissions).isEmpty(); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetWorkbasketAsSummary() throws NotAuthorizedException, WorkbasketNotFoundException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -196,7 +196,7 @@ class GetWorkbasketAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testGetWorkbasketByIdNotExisting() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java index 54983538b..bfcbde480 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -36,7 +36,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { workbasketService = taskanaEngine.getWorkbasketService(); } - @WithAccessId(user = "teamlead-1", groups = "group_1_1") + @WithAccessId(user = "teamlead-1", groups = "group-1_1") @Test void testQueryAllForUserMultipleTimes() { WorkbasketQuery query = workbasketService.createWorkbasketQuery(); @@ -78,7 +78,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(workbaskets).hasSize(count); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketValuesForColumnName() { List columnValueList = workbasketService.createWorkbasketQuery().listValues(NAME, null); @@ -95,7 +95,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(columnValueList).hasSize(4); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByDomain() { List results = @@ -103,7 +103,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(1); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByDomainAndType() { List results = @@ -115,7 +115,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(6); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByName() { List results = @@ -127,7 +127,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .isEqualTo("GPK_KSC"); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByNameStartsWith() { List results = @@ -135,7 +135,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByNameContains() { List results = @@ -146,7 +146,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(5); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByNameContainsCaseInsensitive() { List results = @@ -154,7 +154,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(2); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByDescription() { List results = @@ -167,7 +167,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(9); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByOwnerLike() { List results = @@ -179,7 +179,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(1); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByKey() { List results = @@ -187,7 +187,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(1); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByMultipleKeys() { List results = @@ -195,7 +195,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(2); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByMultipleKeysWithUnknownKey() { List results = @@ -203,7 +203,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(2); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByKeyContains() { List results = @@ -211,7 +211,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByKeyContainsIgnoreCase() { List results = @@ -219,7 +219,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByKeyOrNameContainsIgnoreCase() { List results = @@ -227,7 +227,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(9); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByNameStartsWithSortedByNameAscending() { List results = @@ -279,7 +279,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .isSortedAccordingTo(CASE_INSENSITIVE_ORDER.reversed()); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByCreated() { List results = @@ -287,7 +287,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(9); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByModified() { List results = @@ -310,14 +310,14 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .createWorkbasketQuery() .nameLike("%") .accessIdsHavePermission( - WorkbasketPermission.TRANSFER, "teamlead-1", "group_1", "group_2") + WorkbasketPermission.TRANSFER, "teamlead-1", "group-1", "group-2") .orderByName(DESCENDING) .list(); assertThat(results).hasSize(13); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryWorkbasketByDomainLike() { List results = @@ -346,7 +346,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .containsOnly(toArray(expectedIds)); } - @WithAccessId(user = "admin", groups = "group_1") + @WithAccessId(user = "admin", groups = "group-1") @Test void testQueryWorkbasketByOwnerInOrderByDomainDesc() { List results = @@ -361,7 +361,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results.get(1).getId()).isEqualTo("WBI:100000000000000000000000000000000001"); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testQueryForCustom1In() { List results = diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java index 32be7b28e..7227792fa 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java @@ -59,7 +59,7 @@ class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest { List results = workbasketService .createWorkbasketAccessItemQuery() - .accessIdIn("user-1-1", "group_1") + .accessIdIn("user-1-1", "group-1") .list(); assertThat(results).hasSize(8); } @@ -73,7 +73,7 @@ class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest { () -> { workbasketService .createWorkbasketAccessItemQuery() - .accessIdIn("user-1-1", "group_1") + .accessIdIn("user-1-1", "group-1") .list(); }; assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); @@ -86,7 +86,7 @@ class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest { WorkbasketAccessItemQuery query = workbasketService .createWorkbasketAccessItemQuery() - .accessIdIn("user-1-1", "group_1") + .accessIdIn("user-1-1", "group-1") .orderByAccessId(SortDirection.DESCENDING) .orderByWorkbasketId(SortDirection.DESCENDING); List results = query.list(); @@ -102,7 +102,7 @@ class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest { List results = workbasketService .createWorkbasketAccessItemQuery() - .accessIdIn("user-1-1", "group_1") + .accessIdIn("user-1-1", "group-1") .workbasketIdIn( "WBI:100000000000000000000000000000000006", "WBI:100000000000000000000000000000000002") diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java index 187f7bfdc..b1ebdc805 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -69,7 +69,7 @@ class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { List results = workbasketService .createWorkbasketQuery() - .accessIdsHavePermission(WorkbasketPermission.APPEND, "user-1-1", "group_1") + .accessIdsHavePermission(WorkbasketPermission.APPEND, "user-1-1", "group-1") .list(); assertThat(results).hasSize(6); } @@ -82,7 +82,7 @@ class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { List results = workbasketService .createWorkbasketQuery() - .accessIdsHavePermission(WorkbasketPermission.APPEND, "user-1-1", "group_1") + .accessIdsHavePermission(WorkbasketPermission.APPEND, "user-1-1", "group-1") .orderByName(asc) .list(); assertThat(results).hasSize(6); @@ -97,7 +97,7 @@ class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { List results = workbasketService .createWorkbasketQuery() - .accessIdsHavePermission(WorkbasketPermission.APPEND, "user-1-1", "group_1") + .accessIdsHavePermission(WorkbasketPermission.APPEND, "user-1-1", "group-1") .orderByName(desc) .orderByKey(asc) .list(); @@ -113,7 +113,7 @@ class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { List results = workbasketService .createWorkbasketQuery() - .accessIdsHavePermission(WorkbasketPermission.DISTRIBUTE, "user-1-1", "group_1") + .accessIdsHavePermission(WorkbasketPermission.DISTRIBUTE, "user-1-1", "group-1") .list(); assertThat(results).hasSize(2); List keys = new ArrayList<>(Arrays.asList("GPK_KSC_1", "USER-1-1")); @@ -122,7 +122,7 @@ class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { } } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @Test void testQueryAllTransferTargetsForUserAndGroupFromSubject() throws SystemException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java index ec82d9d40..b0aca592c 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java @@ -20,7 +20,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { super(); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testGetFirstPageOfWorkbasketQueryWithOffset() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -29,7 +29,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(5); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testGetSecondPageOfWorkbasketQueryWithOffset() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -38,7 +38,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(4); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testListOffsetAndLimitOutOfBounds() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -57,7 +57,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testPaginationWithPages() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -103,7 +103,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(4); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testPaginationNullAndNegativeLimitsIgnoring() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -139,7 +139,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(9); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testCountOfWorkbasketQuery() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -147,7 +147,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(count).isEqualTo(9L); } - @WithAccessId(user = "teamlead-1", groups = "group_1") + @WithAccessId(user = "teamlead-1", groups = "group-1") @Test void testWorkbasketQueryDomA() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java index f149c8c9e..cf5406192 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java @@ -27,7 +27,7 @@ class UpdateWorkbasketAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateWorkbasket() throws NotAuthorizedException, WorkbasketNotFoundException, ConcurrencyException { @@ -61,7 +61,7 @@ class UpdateWorkbasketAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateWorkbasketWithConcurrentModificationShouldThrowException() throws NotAuthorizedException, WorkbasketNotFoundException { @@ -79,7 +79,7 @@ class UpdateWorkbasketAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead-1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateWorkbasketOfNonExistingWorkbasketShouldThrowException() throws NotAuthorizedException, WorkbasketNotFoundException { @@ -96,7 +96,7 @@ class UpdateWorkbasketAccTest extends AbstractAccTest { .isThrownBy(() -> workbasketService.updateWorkbasket(workbasket)); } - @WithAccessId(user = "user-1-1", groups = "group_1") + @WithAccessId(user = "user-1-1", groups = "group-1") @WithAccessId(user = "taskadmin") @TestTemplate void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java index 29d996116..4b1f9e09a 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java @@ -23,7 +23,7 @@ public class UpdateWorkbasketAuthorizations2AccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdatedAccessItemListToEmptyList() throws Exception { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java index 0ce27d1f6..23d64c083 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -60,7 +60,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateWorkbasketAccessItemSucceeds() throws InvalidArgumentException, NotAuthorizedException, WorkbasketNotFoundException, @@ -96,7 +96,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdateWorkbasketAccessItemRejected() throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, @@ -145,7 +145,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId( user = "user-1-1", - groups = {"group_2", "businessadmin"}) + groups = {"group-2", "businessadmin"}) @Test void testUpdatedAccessItemLeadsToNotAuthorizedException() throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, @@ -155,7 +155,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { String wbKey = "USER-2-1"; String wbDomain = "DOMAIN_A"; - final String groupName = "group_2"; + final String groupName = "group-2"; Task newTask = taskService.newTask(wbKey, wbDomain); newTask.setClassificationKey("T2100"); @@ -191,7 +191,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testUpdatedAccessItemList() throws Exception { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -231,7 +231,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testInsertAccessItemList() throws Exception { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -269,7 +269,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", - groups = {"group_1", "businessadmin"}) + groups = {"group-1", "businessadmin"}) @Test void testDeleteAccessItemForAccessItemId() throws Exception { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -282,7 +282,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { } List accessList = new ArrayList<>(originalList); - WorkbasketAccessItem newItem = workbasketService.newWorkbasketAccessItem(wbId, "group_1"); + WorkbasketAccessItem newItem = workbasketService.newWorkbasketAccessItem(wbId, "group-1"); accessList.add(newItem); assertThat(accessList).isNotEqualTo(originalList); workbasketService.setWorkbasketAccessItems(wbId, accessList); @@ -305,7 +305,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @Test void testDeleteAccessItemsForAccessId() throws NotAuthorizedException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - final String accessId = "group_1"; + final String accessId = "group-1"; final long accessIdCountBefore = workbasketService.createWorkbasketAccessItemQuery().accessIdIn(accessId).count(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java index fc67c11d6..ed1d47078 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java @@ -23,7 +23,7 @@ class WorkbasketQueryWithOrderedPaginationAccTest extends AbstractAccTest { @Test @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) void testGetFirstPageOfTaskQueryWithOffset() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = @@ -42,7 +42,7 @@ class WorkbasketQueryWithOrderedPaginationAccTest extends AbstractAccTest { @Test @WithAccessId( user = "teamlead-1", - groups = {"group_1", "group_2"}) + groups = {"group-1", "group-2"}) void testGetSecondPageOfTaskQueryWithOffset() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql b/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql index 22b2178bb..14d35ef32 100644 --- a/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql +++ b/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql @@ -7,23 +7,23 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008', 'user-2-1', 'Simone Müller' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009', 'user-2-2', 'Tim Schläfrig' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- group internal access -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'group-1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'group-1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'group-1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -- teamlead substitution INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead-2', 'Frauke Faul' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead-1', 'Titus Toll' , true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- cross team tranfers -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'group_2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'group_2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'group_1', 'DevelopersGroup' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'group_1', 'DevelopersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'group-2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'group-2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'group-1', 'DevelopersGroup' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'group-1', 'DevelopersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Team GPK access -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'group_1', 'DevelopersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'group_2', 'UsersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'group-1', 'DevelopersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'group-2', 'UsersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- Cross team GPK access INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead-1', 'Titus Toll' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead-2', 'Frauke Faul' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); @@ -31,10 +31,10 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000123', 'WBI:100000000000000000000000000000000010', 'teamlead-1', 'Titus Toll' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Access to other domains -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'group_1', 'DevelopersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'group_2', 'UsersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'group-1', 'DevelopersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'group-2', 'UsersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Access to workbaskets for sorting test INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000900', 'WBI:000000000000000000000000000000000900', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql b/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql index 22b2178bb..14d35ef32 100644 --- a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql +++ b/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql @@ -7,23 +7,23 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008', 'user-2-1', 'Simone Müller' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009', 'user-2-2', 'Tim Schläfrig' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- group internal access -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'group-1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'group-1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'group-1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -- teamlead substitution INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead-2', 'Frauke Faul' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead-1', 'Titus Toll' , true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- cross team tranfers -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'group_2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'group_2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'group_1', 'DevelopersGroup' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'group_1', 'DevelopersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'group-2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'group-2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'group-1', 'DevelopersGroup' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'group-1', 'DevelopersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Team GPK access -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'group_1', 'DevelopersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'group_2', 'UsersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'group-1', 'DevelopersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'group-2', 'UsersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- Cross team GPK access INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead-1', 'Titus Toll' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead-2', 'Frauke Faul' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); @@ -31,10 +31,10 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000123', 'WBI:100000000000000000000000000000000010', 'teamlead-1', 'Titus Toll' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Access to other domains -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'group_1', 'DevelopersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'group_2', 'UsersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'group-1', 'DevelopersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'group-2', 'UsersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'group-2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Access to workbaskets for sorting test INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000900', 'WBI:000000000000000000000000000000000900', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true);