diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/DefaultTestEntities.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/DefaultTestEntities.java similarity index 96% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/DefaultTestEntities.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/DefaultTestEntities.java index bf6faea0b..9b9118dba 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/DefaultTestEntities.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/DefaultTestEntities.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests; +package pro.taskana.testapi; import java.util.UUID; diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TaskanaDependencyInjectionExtensionTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/TaskanaDependencyInjectionExtensionTest.java similarity index 98% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TaskanaDependencyInjectionExtensionTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/TaskanaDependencyInjectionExtensionTest.java index 7957ff5c5..611dfa0b2 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TaskanaDependencyInjectionExtensionTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/TaskanaDependencyInjectionExtensionTest.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests; +package pro.taskana.testapi; import static org.assertj.core.api.Assertions.assertThat; @@ -22,8 +22,6 @@ import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.internal.MonitorServiceImpl; import pro.taskana.task.api.TaskService; import pro.taskana.task.internal.TaskServiceImpl; -import pro.taskana.testapi.TaskanaInject; -import pro.taskana.testapi.TaskanaIntegrationTest; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.internal.WorkbasketServiceImpl; diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TaskanaInitializationExtensionTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/TaskanaInitializationExtensionTest.java similarity index 92% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TaskanaInitializationExtensionTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/TaskanaInitializationExtensionTest.java index ce5dc7ca8..7b9667947 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TaskanaInitializationExtensionTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/TaskanaInitializationExtensionTest.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests; +package pro.taskana.testapi; import static org.assertj.core.api.Assertions.assertThat; @@ -10,11 +10,6 @@ import org.junit.jupiter.api.TestInstance.Lifecycle; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.spi.priority.api.PriorityServiceProvider; -import pro.taskana.testapi.CleanTaskanaContext; -import pro.taskana.testapi.TaskanaEngineConfigurationModifier; -import pro.taskana.testapi.TaskanaInject; -import pro.taskana.testapi.TaskanaIntegrationTest; -import pro.taskana.testapi.WithServiceProvider; @TaskanaIntegrationTest class TaskanaInitializationExtensionTest { diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TestContainerExtensionTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/TestContainerExtensionTest.java similarity index 96% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TestContainerExtensionTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/TestContainerExtensionTest.java index dd4d73e40..c70a01340 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TestContainerExtensionTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/TestContainerExtensionTest.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests; +package pro.taskana.testapi; import static org.assertj.core.api.Assertions.assertThat; @@ -10,11 +10,6 @@ import org.junit.jupiter.api.TestInstance.Lifecycle; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.spi.priority.api.PriorityServiceProvider; -import pro.taskana.testapi.CleanTaskanaContext; -import pro.taskana.testapi.TaskanaEngineConfigurationModifier; -import pro.taskana.testapi.TaskanaInject; -import pro.taskana.testapi.TaskanaIntegrationTest; -import pro.taskana.testapi.WithServiceProvider; @TaskanaIntegrationTest class TestContainerExtensionTest { diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TestPriorityServiceProvider.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/TestPriorityServiceProvider.java similarity index 97% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TestPriorityServiceProvider.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/TestPriorityServiceProvider.java index 3d5fa1a3e..802a3d0e8 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/TestPriorityServiceProvider.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/TestPriorityServiceProvider.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests; +package pro.taskana.testapi; import java.time.Duration; import java.time.Instant; diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ClassificationBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/ClassificationBuilderTest.java similarity index 98% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ClassificationBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/ClassificationBuilderTest.java index 30ddd51cb..87c833001 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ClassificationBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/ClassificationBuilderTest.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests.builder; +package pro.taskana.testapi.builder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -23,7 +23,6 @@ import pro.taskana.classification.internal.models.ClassificationSummaryImpl; import pro.taskana.common.internal.util.Quadruple; import pro.taskana.testapi.TaskanaInject; import pro.taskana.testapi.TaskanaIntegrationTest; -import pro.taskana.testapi.builder.ClassificationBuilder; import pro.taskana.testapi.security.WithAccessId; @TaskanaIntegrationTest diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ObjectReferenceBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/ObjectReferenceBuilderTest.java similarity index 96% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ObjectReferenceBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/ObjectReferenceBuilderTest.java index e7468585d..f67904b75 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/ObjectReferenceBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/ObjectReferenceBuilderTest.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests.builder; +package pro.taskana.testapi.builder; import static org.assertj.core.api.Assertions.assertThat; import static pro.taskana.testapi.builder.ObjectReferenceBuilder.newObjectReference; diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskAttachmentBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskAttachmentBuilderTest.java similarity index 91% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskAttachmentBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskAttachmentBuilderTest.java index be4aace1b..036172226 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskAttachmentBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskAttachmentBuilderTest.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests.builder; +package pro.taskana.testapi.builder; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,11 +12,9 @@ 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.models.AttachmentImpl; +import pro.taskana.testapi.DefaultTestEntities; 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-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskBuilderTest.java similarity index 97% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskBuilderTest.java index 0537bcd77..29aed7ad6 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskBuilderTest.java @@ -1,13 +1,13 @@ -package pro.taskana.testapi.tests.builder; +package pro.taskana.testapi.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.testapi.DefaultTestEntities.defaultTestObjectReference; +import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket; 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; @@ -37,8 +37,6 @@ 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; diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskCommentBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskCommentBuilderTest.java similarity index 96% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskCommentBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskCommentBuilderTest.java index 512eadd7c..e0bd80855 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/TaskCommentBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/TaskCommentBuilderTest.java @@ -1,13 +1,13 @@ -package pro.taskana.testapi.tests.builder; +package pro.taskana.testapi.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.testapi.DefaultTestEntities.defaultTestObjectReference; +import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket; 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; @@ -31,8 +31,6 @@ import pro.taskana.task.api.models.TaskComment; 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; diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketAccessItemBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/WorkbasketAccessItemBuilderTest.java similarity index 97% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketAccessItemBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/WorkbasketAccessItemBuilderTest.java index 043aa13a1..b57ebbec5 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketAccessItemBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/WorkbasketAccessItemBuilderTest.java @@ -1,10 +1,10 @@ -package pro.taskana.testapi.tests.builder; +package pro.taskana.testapi.builder; 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.testapi.DefaultTestEntities.defaultTestWorkbasket; 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; @@ -12,7 +12,6 @@ import org.junit.jupiter.api.Test; import pro.taskana.common.api.TaskanaEngine; 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; diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketBuilderTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/WorkbasketBuilderTest.java similarity index 98% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketBuilderTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/WorkbasketBuilderTest.java index b0bd0f484..270f7b0f7 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/builder/WorkbasketBuilderTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/WorkbasketBuilderTest.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests.builder; +package pro.taskana.testapi.builder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -19,7 +19,6 @@ import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.util.Quadruple; 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; diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/security/JaasExtensionTest.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/security/JaasExtensionTest.java similarity index 98% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/security/JaasExtensionTest.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/security/JaasExtensionTest.java index 6c42fc146..db2927775 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/security/JaasExtensionTest.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/security/JaasExtensionTest.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests.security; +package pro.taskana.testapi.security; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.DynamicContainer.dynamicContainer; @@ -25,10 +25,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.security.CurrentUserContext; import pro.taskana.common.internal.security.CurrentUserContextImpl; -import pro.taskana.testapi.security.JaasExtension; -import pro.taskana.testapi.security.WithAccessId; -import pro.taskana.testapi.tests.security.JaasExtensionTestExtensions.ShouldThrowJunitException; -import pro.taskana.testapi.tests.security.JaasExtensionTestExtensions.ShouldThrowParameterResolutionException; +import pro.taskana.testapi.security.JaasExtensionTestExtensions.ShouldThrowJunitException; +import pro.taskana.testapi.security.JaasExtensionTestExtensions.ShouldThrowParameterResolutionException; @ExtendWith(JaasExtension.class) class JaasExtensionTest { diff --git a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/security/JaasExtensionTestExtensions.java b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/security/JaasExtensionTestExtensions.java similarity index 96% rename from lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/security/JaasExtensionTestExtensions.java rename to lib/taskana-test-api/src/test/java/pro/taskana/testapi/security/JaasExtensionTestExtensions.java index 2a407b25c..299af33b1 100644 --- a/lib/taskana-test-api/src/test/java/pro/taskana/testapi/tests/security/JaasExtensionTestExtensions.java +++ b/lib/taskana-test-api/src/test/java/pro/taskana/testapi/security/JaasExtensionTestExtensions.java @@ -1,4 +1,4 @@ -package pro.taskana.testapi.tests.security; +package pro.taskana.testapi.security; import static org.assertj.core.api.Assertions.assertThat; diff --git a/qa/intellij/taskana_formatter_intellij.xml b/qa/intellij/taskana_formatter_intellij.xml index d11717196..77250dda7 100644 --- a/qa/intellij/taskana_formatter_intellij.xml +++ b/qa/intellij/taskana_formatter_intellij.xml @@ -27,7 +27,6 @@