diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java similarity index 93% rename from lib/taskana-core/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java rename to lib/taskana-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java index 9b91716c9..6e7f7550b 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java @@ -2,7 +2,6 @@ package acceptance.jobs.helper; import static org.assertj.core.api.Assertions.assertThat; -import acceptance.DefaultTestEntities; import acceptance.priorityservice.TestPriorityServiceProvider; import java.time.Instant; import java.util.List; @@ -12,26 +11,27 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; -import testapi.TaskanaInject; -import testapi.TaskanaIntegrationTest; -import testapi.WithServiceProvider; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.TaskanaEngine; -import pro.taskana.common.test.security.WithAccessId; import pro.taskana.spi.priority.api.PriorityServiceProvider; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.task.internal.jobs.helper.TaskUpdatePriorityWorker; import pro.taskana.task.internal.models.TaskImpl; +import pro.taskana.testapi.DefaultTestEntities; +import pro.taskana.testapi.TaskanaInject; +import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.WithServiceProvider; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; +import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; @TaskanaIntegrationTest class TaskUpdatePriorityWorkerAccTest { diff --git a/lib/taskana-core-test/src/test/java/acceptance/priorityservice/TestPriorityServiceProvider.java b/lib/taskana-core-test/src/test/java/acceptance/priorityservice/TestPriorityServiceProvider.java new file mode 100644 index 000000000..db149872e --- /dev/null +++ b/lib/taskana-core-test/src/test/java/acceptance/priorityservice/TestPriorityServiceProvider.java @@ -0,0 +1,39 @@ +package acceptance.priorityservice; + +import java.time.Duration; +import java.time.Instant; +import java.util.OptionalInt; + +import pro.taskana.common.api.WorkingDaysToDaysConverter; +import pro.taskana.common.api.WorkingTimeCalculator; +import pro.taskana.spi.priority.api.PriorityServiceProvider; +import pro.taskana.task.api.TaskCustomField; +import pro.taskana.task.api.models.TaskSummary; + +public class TestPriorityServiceProvider implements PriorityServiceProvider { + private static final int MULTIPLIER = 10; + + private final WorkingDaysToDaysConverter converter = new WorkingDaysToDaysConverter(true, true); + private final WorkingTimeCalculator calculator = new WorkingTimeCalculator(converter); + + @Override + public OptionalInt calculatePriority(TaskSummary taskSummary) { + + long priority; + try { + priority = + calculator + .workingTimeBetweenTwoTimestamps(taskSummary.getCreated(), Instant.now()) + .toMinutes() + + 1; + } catch (Exception e) { + priority = Duration.between(taskSummary.getCreated(), Instant.now()).toMinutes(); + } + + if (Boolean.parseBoolean(taskSummary.getCustomField(TaskCustomField.CUSTOM_6))) { + priority *= MULTIPLIER; + } + + return OptionalInt.of(Math.toIntExact(priority)); + } +} diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java index 087cfcd6e..6f4347828 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java @@ -30,16 +30,16 @@ import pro.taskana.task.api.exceptions.InvalidTaskStateException; import pro.taskana.task.api.exceptions.TaskNotFoundException; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.testapi.DefaultTestEntities; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.MismatchedWorkbasketPermissionException; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; @TaskanaIntegrationTest class CompleteTaskAccTest { diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java index b9ca108cc..572f28ef2 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java @@ -18,17 +18,17 @@ import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; import pro.taskana.task.internal.ObjectReferenceMapper; -import pro.taskana.task.internal.builder.ObjectReferenceBuilder; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.testapi.TaskanaEngineProxy; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; /** * Acceptance test for all "create task" scenarios that involve secondary {@link ObjectReference}. diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java index 10017893a..9b2095447 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java @@ -17,16 +17,16 @@ import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; import pro.taskana.task.internal.ObjectReferenceMapper; -import pro.taskana.task.internal.builder.ObjectReferenceBuilder; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.testapi.TaskanaEngineProxy; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; /** * Acceptance test for all "delete task" scenarios that involve secondary {@link ObjectReference}s. diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java index d61bac9a0..b705def96 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java @@ -13,15 +13,15 @@ import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; -import pro.taskana.task.internal.builder.ObjectReferenceBuilder; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; @TaskanaIntegrationTest class GetTaskWithSorAccTest { diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java index 1aaffa079..31d910099 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java @@ -29,16 +29,16 @@ import pro.taskana.task.api.WildcardSearchField; import pro.taskana.task.api.models.Attachment; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.TaskSummary; -import pro.taskana.task.internal.builder.ObjectReferenceBuilder; -import pro.taskana.task.internal.builder.TaskAttachmentBuilder; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.TaskAttachmentBuilder; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; @TaskanaIntegrationTest class TaskQueryImplAccTest { diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java index 9d060ccfe..17a1c9c5a 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java @@ -11,20 +11,20 @@ import org.junit.jupiter.api.Test; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.api.models.ClassificationSummary; -import pro.taskana.classification.internal.builder.ClassificationBuilder; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.jobs.JobRunner; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.ClassificationBuilder; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; @TaskanaIntegrationTest class UpdateManualPriorityAccTest { diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java index 3412e4cf5..77dc91610 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java @@ -21,16 +21,16 @@ import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.task.internal.jobs.helper.TaskUpdatePriorityWorker; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; import pro.taskana.testapi.WithServiceProvider; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; @TaskanaIntegrationTest @WithServiceProvider( diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java index 947e58eb2..7f0ea33cd 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java @@ -13,15 +13,15 @@ import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; -import pro.taskana.task.internal.builder.ObjectReferenceBuilder; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; /** Acceptance test for "update task" scenarios that involve secondary {@link ObjectReference}s. */ @TaskanaIntegrationTest diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java index fd4331220..912273667 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java @@ -19,16 +19,16 @@ import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskComment; -import pro.taskana.task.internal.builder.TaskBuilder; -import pro.taskana.task.internal.builder.TaskCommentBuilder; import pro.taskana.task.internal.models.TaskCommentImpl; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.TaskCommentBuilder; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; @TaskanaIntegrationTest class UpdateTaskCommentAccTest { diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java index c3fb33db4..44ea59c45 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java @@ -15,11 +15,11 @@ import pro.taskana.testapi.DefaultTestEntities; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; import pro.taskana.testapi.WithServiceProvider; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; /** Acceptance test for "task preprocessing" scenario. */ @TaskanaIntegrationTest diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java index 945eb0e5c..19dcc8258 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java @@ -18,11 +18,11 @@ import pro.taskana.testapi.DefaultTestEntities; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; import pro.taskana.testapi.WithServiceProvider; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; @WithServiceProvider( serviceProviderInterface = TaskRoutingProvider.class, diff --git a/lib/taskana-test-api/pom.xml b/lib/taskana-test-api/pom.xml index 81b166572..9d6a1a206 100644 --- a/lib/taskana-test-api/pom.xml +++ b/lib/taskana-test-api/pom.xml @@ -59,8 +59,8 @@ - - + + org.assertj assertj-core test @@ -90,7 +90,7 @@ - + novatec public novatec-repository https://repository.novatec-gmbh.de/content/repositories/novatec/ diff --git a/lib/taskana-test-api/src/main/java/pro/taskana/testapi/DefaultTestEntities.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/DefaultTestEntities.java index ba61d7678..743cfe1bd 100644 --- a/lib/taskana-test-api/src/main/java/pro/taskana/testapi/DefaultTestEntities.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/DefaultTestEntities.java @@ -2,10 +2,10 @@ package pro.taskana.testapi; import java.util.UUID; -import pro.taskana.classification.internal.builder.ClassificationBuilder; -import pro.taskana.task.internal.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.ClassificationBuilder; +import pro.taskana.testapi.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.WorkbasketBuilder; import pro.taskana.workbasket.api.WorkbasketType; -import pro.taskana.workbasket.internal.builder.WorkbasketBuilder; public class DefaultTestEntities { diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationBuilder.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ClassificationBuilder.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationBuilder.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ClassificationBuilder.java index 4b7583d02..b71cb0200 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationBuilder.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ClassificationBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.classification.internal.builder; +package pro.taskana.testapi.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationTestImpl.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ClassificationTestImpl.java similarity index 94% rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationTestImpl.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ClassificationTestImpl.java index 2cbcbd824..1b021a60a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/builder/ClassificationTestImpl.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ClassificationTestImpl.java @@ -1,4 +1,4 @@ -package pro.taskana.classification.internal.builder; +package pro.taskana.testapi.builder; import java.time.Instant; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/ObjectReferenceBuilder.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ObjectReferenceBuilder.java similarity index 96% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/ObjectReferenceBuilder.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ObjectReferenceBuilder.java index 71c2b11ed..e0fc75105 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/ObjectReferenceBuilder.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/ObjectReferenceBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal.builder; +package pro.taskana.testapi.builder; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.internal.models.ObjectReferenceImpl; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskAttachmentBuilder.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskAttachmentBuilder.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskAttachmentBuilder.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskAttachmentBuilder.java index cc4da4b35..0be544e95 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskAttachmentBuilder.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskAttachmentBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal.builder; +package pro.taskana.testapi.builder; import java.time.Instant; import java.util.Map; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskBuilder.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskBuilder.java similarity index 99% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskBuilder.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskBuilder.java index 1066c88d1..c35b6dec0 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskBuilder.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal.builder; +package pro.taskana.testapi.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentBuilder.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskCommentBuilder.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentBuilder.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskCommentBuilder.java index da0209bab..3e828fe50 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentBuilder.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskCommentBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal.builder; +package pro.taskana.testapi.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentTestImpl.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskCommentTestImpl.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentTestImpl.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskCommentTestImpl.java index 0bc8fbdec..022e2da59 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskCommentTestImpl.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskCommentTestImpl.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal.builder; +package pro.taskana.testapi.builder; import java.time.Instant; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskTestImpl.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskTestImpl.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskTestImpl.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskTestImpl.java index 0235eb6d4..1ff5a4bd5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/builder/TaskTestImpl.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/TaskTestImpl.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal.builder; +package pro.taskana.testapi.builder; import java.time.Instant; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketAccessItemBuilder.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketAccessItemBuilder.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketAccessItemBuilder.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketAccessItemBuilder.java index 617e19571..6f0aaef34 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketAccessItemBuilder.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketAccessItemBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.workbasket.internal.builder; +package pro.taskana.testapi.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketBuilder.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketBuilder.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketBuilder.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketBuilder.java index f7d0cab30..ef8e97def 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketBuilder.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketBuilder.java @@ -1,4 +1,4 @@ -package pro.taskana.workbasket.internal.builder; +package pro.taskana.testapi.builder; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketTestImpl.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketTestImpl.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketTestImpl.java rename to lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketTestImpl.java index 8c2b695dc..3129a254a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/builder/WorkbasketTestImpl.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/builder/WorkbasketTestImpl.java @@ -1,4 +1,4 @@ -package pro.taskana.workbasket.internal.builder; +package pro.taskana.testapi.builder; import java.time.Instant; diff --git a/lib/taskana-core/src/test/java/acceptance/DefaultTestEntities.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/DefaultTestEntities.java similarity index 79% rename from lib/taskana-core/src/test/java/acceptance/DefaultTestEntities.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/DefaultTestEntities.java index f55fb91a8..bf6faea0b 100644 --- a/lib/taskana-core/src/test/java/acceptance/DefaultTestEntities.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/DefaultTestEntities.java @@ -1,11 +1,11 @@ -package acceptance; +package pro.taskana.testapi.tests; import java.util.UUID; -import pro.taskana.classification.internal.builder.ClassificationBuilder; -import pro.taskana.task.internal.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.ClassificationBuilder; +import pro.taskana.testapi.builder.ObjectReferenceBuilder; +import pro.taskana.testapi.builder.WorkbasketBuilder; import pro.taskana.workbasket.api.WorkbasketType; -import pro.taskana.workbasket.internal.builder.WorkbasketBuilder; public class DefaultTestEntities { diff --git a/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ClassificationBuilderTest.java similarity index 96% rename from lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ClassificationBuilderTest.java index 2e74551aa..30ddd51cb 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/ClassificationBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ClassificationBuilderTest.java @@ -1,8 +1,8 @@ -package acceptance.builder; +package pro.taskana.testapi.tests.builder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import static pro.taskana.classification.internal.builder.ClassificationBuilder.newClassification; +import static pro.taskana.testapi.builder.ClassificationBuilder.newClassification; import java.time.Instant; import java.util.List; @@ -13,18 +13,18 @@ import org.junit.jupiter.api.DynamicContainer; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestFactory; -import testapi.TaskanaInject; -import testapi.TaskanaIntegrationTest; import pro.taskana.classification.api.ClassificationCustomField; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.api.models.ClassificationSummary; -import pro.taskana.classification.internal.builder.ClassificationBuilder; import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.classification.internal.models.ClassificationSummaryImpl; import pro.taskana.common.internal.util.Quadruple; -import pro.taskana.common.test.security.WithAccessId; +import pro.taskana.testapi.TaskanaInject; +import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.ClassificationBuilder; +import pro.taskana.testapi.security.WithAccessId; @TaskanaIntegrationTest class ClassificationBuilderTest { diff --git a/lib/taskana-core/src/test/java/acceptance/builder/ObjectReferenceBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ObjectReferenceBuilderTest.java similarity index 89% rename from lib/taskana-core/src/test/java/acceptance/builder/ObjectReferenceBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ObjectReferenceBuilderTest.java index 9b7f15164..e7468585d 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/ObjectReferenceBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ObjectReferenceBuilderTest.java @@ -1,7 +1,7 @@ -package acceptance.builder; +package pro.taskana.testapi.tests.builder; import static org.assertj.core.api.Assertions.assertThat; -import static pro.taskana.task.internal.builder.ObjectReferenceBuilder.newObjectReference; +import static pro.taskana.testapi.builder.ObjectReferenceBuilder.newObjectReference; import org.junit.jupiter.api.Test; diff --git a/lib/taskana-core/src/test/java/acceptance/builder/TaskAttachmentBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskAttachmentBuilderTest.java similarity index 88% rename from lib/taskana-core/src/test/java/acceptance/builder/TaskAttachmentBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskAttachmentBuilderTest.java index b87314285..be4aace1b 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/TaskAttachmentBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskAttachmentBuilderTest.java @@ -1,22 +1,22 @@ -package acceptance.builder; +package pro.taskana.testapi.tests.builder; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import acceptance.DefaultTestEntities; import java.time.Instant; import java.util.Map; import org.junit.jupiter.api.Test; -import testapi.TaskanaInject; -import testapi.TaskanaIntegrationTest; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; -import pro.taskana.classification.internal.builder.ClassificationBuilder; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Attachment; import pro.taskana.task.api.models.ObjectReference; -import pro.taskana.task.internal.builder.TaskAttachmentBuilder; import pro.taskana.task.internal.models.AttachmentImpl; +import pro.taskana.testapi.TaskanaInject; +import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.ClassificationBuilder; +import pro.taskana.testapi.builder.TaskAttachmentBuilder; +import pro.taskana.testapi.tests.DefaultTestEntities; @TaskanaIntegrationTest class TaskAttachmentBuilderTest { diff --git a/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskBuilderTest.java similarity index 95% rename from lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskBuilderTest.java index 5223befa9..53aa7a02e 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/TaskBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskBuilderTest.java @@ -1,13 +1,13 @@ -package acceptance.builder; +package pro.taskana.testapi.tests.builder; -import static acceptance.DefaultTestEntities.defaultTestObjectReference; -import static acceptance.DefaultTestEntities.defaultTestWorkbasket; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import static pro.taskana.classification.internal.builder.ClassificationBuilder.newClassification; import static pro.taskana.common.internal.util.CheckedSupplier.wrap; -import static pro.taskana.task.internal.builder.TaskBuilder.newTask; -import static pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.testapi.builder.ClassificationBuilder.newClassification; +import static pro.taskana.testapi.builder.TaskBuilder.newTask; +import static pro.taskana.testapi.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.testapi.tests.DefaultTestEntities.defaultTestObjectReference; +import static pro.taskana.testapi.tests.DefaultTestEntities.defaultTestWorkbasket; import java.time.Instant; import java.util.List; @@ -20,14 +20,11 @@ import org.junit.jupiter.api.DynamicContainer; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestFactory; -import testapi.TaskanaInject; -import testapi.TaskanaIntegrationTest; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.util.Quadruple; -import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.CallbackState; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; @@ -35,10 +32,13 @@ import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.Attachment; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; -import pro.taskana.task.internal.builder.TaskAttachmentBuilder; -import pro.taskana.task.internal.builder.TaskBuilder; import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.task.internal.models.TaskSummaryImpl; +import pro.taskana.testapi.TaskanaInject; +import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.TaskAttachmentBuilder; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; diff --git a/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskCommentBuilderTest.java similarity index 91% rename from lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskCommentBuilderTest.java index 4ed09d41d..512eadd7c 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/TaskCommentBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskCommentBuilderTest.java @@ -1,13 +1,13 @@ -package acceptance.builder; +package pro.taskana.testapi.tests.builder; -import static acceptance.DefaultTestEntities.defaultTestObjectReference; -import static acceptance.DefaultTestEntities.defaultTestWorkbasket; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import static pro.taskana.classification.internal.builder.ClassificationBuilder.newClassification; import static pro.taskana.common.internal.util.CheckedSupplier.wrap; -import static pro.taskana.task.internal.builder.TaskCommentBuilder.newTaskComment; -import static pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.testapi.builder.ClassificationBuilder.newClassification; +import static pro.taskana.testapi.builder.TaskCommentBuilder.newTaskComment; +import static pro.taskana.testapi.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.testapi.tests.DefaultTestEntities.defaultTestObjectReference; +import static pro.taskana.testapi.tests.DefaultTestEntities.defaultTestWorkbasket; import java.time.Instant; import java.util.List; @@ -19,21 +19,21 @@ import org.junit.jupiter.api.DynamicContainer; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestFactory; -import testapi.TaskanaInject; -import testapi.TaskanaIntegrationTest; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.util.Quadruple; -import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskComment; -import pro.taskana.task.internal.builder.TaskBuilder; -import pro.taskana.task.internal.builder.TaskCommentBuilder; import pro.taskana.task.internal.models.TaskCommentImpl; +import pro.taskana.testapi.TaskanaInject; +import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.TaskBuilder; +import pro.taskana.testapi.builder.TaskCommentBuilder; +import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.Workbasket; diff --git a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketAccessItemBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketAccessItemBuilderTest.java similarity index 93% rename from lib/taskana-core/src/test/java/acceptance/builder/WorkbasketAccessItemBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketAccessItemBuilderTest.java index a430fdb63..043aa13a1 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketAccessItemBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketAccessItemBuilderTest.java @@ -1,23 +1,23 @@ -package acceptance.builder; +package pro.taskana.testapi.tests.builder; -import static acceptance.DefaultTestEntities.defaultTestWorkbasket; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static pro.taskana.common.internal.util.CheckedSupplier.wrap; -import static pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.testapi.builder.WorkbasketAccessItemBuilder.newWorkbasketAccessItem; +import static pro.taskana.testapi.tests.DefaultTestEntities.defaultTestWorkbasket; import java.util.List; import org.junit.jupiter.api.Test; -import testapi.TaskanaInject; -import testapi.TaskanaIntegrationTest; import pro.taskana.common.api.TaskanaEngine; -import pro.taskana.common.test.security.WithAccessId; +import pro.taskana.testapi.TaskanaInject; +import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder; +import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.Workbasket; import pro.taskana.workbasket.api.models.WorkbasketAccessItem; -import pro.taskana.workbasket.internal.builder.WorkbasketAccessItemBuilder; import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; @TaskanaIntegrationTest diff --git a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketBuilderTest.java similarity index 96% rename from lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketBuilderTest.java index 2dd48c397..b0bd0f484 100644 --- a/lib/taskana-core/src/test/java/acceptance/builder/WorkbasketBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketBuilderTest.java @@ -1,9 +1,9 @@ -package acceptance.builder; +package pro.taskana.testapi.tests.builder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static pro.taskana.common.internal.util.CheckedSupplier.wrap; -import static pro.taskana.workbasket.internal.builder.WorkbasketBuilder.newWorkbasket; +import static pro.taskana.testapi.builder.WorkbasketBuilder.newWorkbasket; import java.time.Instant; import java.util.List; @@ -14,18 +14,18 @@ import org.junit.jupiter.api.DynamicContainer; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestFactory; -import testapi.TaskanaInject; -import testapi.TaskanaIntegrationTest; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.util.Quadruple; -import pro.taskana.common.test.security.WithAccessId; +import pro.taskana.testapi.TaskanaInject; +import pro.taskana.testapi.TaskanaIntegrationTest; +import pro.taskana.testapi.builder.WorkbasketBuilder; +import pro.taskana.testapi.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketCustomField; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.models.Workbasket; import pro.taskana.workbasket.api.models.WorkbasketSummary; -import pro.taskana.workbasket.internal.builder.WorkbasketBuilder; import pro.taskana.workbasket.internal.models.WorkbasketImpl; import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; diff --git a/lib/taskana-test-api/src/test/resources/simplelogger.properties b/lib/taskana-test-api/src/test/resources/simplelogger.properties index 70d8c16b3..74b475e18 100644 --- a/lib/taskana-test-api/src/test/resources/simplelogger.properties +++ b/lib/taskana-test-api/src/test/resources/simplelogger.properties @@ -1,35 +1,28 @@ # SLF4J's SimpleLogger configuration file # Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err. - # Default logging detail level for all instances of SimpleLogger. # Must be one of ("trace", "debug", "info", "warn", or "error"). # If not specified, defaults to "info". org.slf4j.simpleLogger.defaultLogLevel=info - # Logging detail level for a SimpleLogger instance named "xxxxx". # Must be one of ("trace", "debug", "info", "warn", or "error"). # If not specified, the default logging detail level is used. org.slf4j.simpleLogger.log.pro.taskana=info org.slf4j.simpleLogger.log.org.apache.ibatis=info - # Set to true if you want the current date and time to be included in output messages. # Default is false, and will output the number of milliseconds elapsed since startup. org.slf4j.simpleLogger.showDateTime=true - # The date and time format to be used in the output messages. # The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat. # If the format is not specified or is invalid, the default format is used. # The default format is yyyy-MM-dd HH:mm:ss:SSS Z. org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z - # Set to true if you want to output the current thread name. # Defaults to true. org.slf4j.simpleLogger.showThreadName=true - # Set to true if you want the Logger instance name to be included in output messages. # Defaults to true. #org.slf4j.simpleLogger.showLogName=true - # Set to true if you want the last component of the name to be included in output messages. # Defaults to false. org.slf4j.simpleLogger.showShortLogName=false