From c686da8ba22e9d9498bd50b1266c2d21c0114898 Mon Sep 17 00:00:00 2001 From: Benjamin Eckstein <13351939+benjamineckstein@users.noreply.github.com> Date: Wed, 6 Nov 2019 12:29:36 +0100 Subject: [PATCH] TSK-719: Upgrade from JUnit 4 to JUnit5 --- .../taskana-simplehistory-provider/pom.xml | 19 +- .../taskana-simplehistory-spring-test/pom.xml | 18 +- lib/taskana-cdi/pom.xml | 18 +- lib/taskana-core/pom.xml | 18 +- .../test/java/acceptance/AbstractAccTest.java | 2 + .../CreateClassificationAccTest.java | 119 +++++----- .../DeleteClassificationAccTest.java | 65 +++--- .../GetClassificationAccTest.java | 30 +-- .../QueryClassificationAccTest.java | 209 +++++++++--------- ...ryClassificationWithPaginationAccTest.java | 23 +- .../UpdateClassificationAccTest.java | 61 ++--- .../config/TaskanaConfigAccTest.java | 2 +- .../config/TaskanaRoleConfigAccTest.java | 2 +- .../history/TaskEventProducerTest.java | 6 +- .../jobs/TaskCleanupJobAccTest.java | 12 +- .../jobs/WorkbasketCleanupJobAccTest.java | 16 +- .../QueryObjectReferenceAccTest.java | 3 +- ...ObjectreferencesWithPaginationAccTest.java | 22 +- .../report/AbstractReportAccTest.java | 2 + ...CustomAttributeValuesForReportAccTest.java | 18 +- .../GetTaskIdsOfCategoryReportAccTest.java | 29 ++- ...tTaskIdsOfClassificationReportAccTest.java | 24 +- ...askIdsOfCustomFieldValueReportAccTest.java | 43 ++-- .../GetTaskIdsOfWorkbasketReportAccTest.java | 14 +- .../report/ProvideCategoryReportAccTest.java | 16 +- .../ProvideClassificationReportAccTest.java | 14 +- .../ProvideCustomFieldValueReportAccTest.java | 17 +- ...deDetailedClassificationReportAccTest.java | 19 +- .../ProvideTaskStatusReportAccTest.java | 16 +- .../report/ProvideTimestampReportAccTest.java | 8 +- .../ProvideWorkbasketReportAccTest.java | 17 +- .../security/ClassificationQueryAccTest.java | 8 +- .../security/TaskEngineAccTest.java | 21 +- .../acceptance/security/TaskQueryAccTest.java | 8 +- .../security/WorkbasketQueryAccTest.java | 8 +- .../acceptance/task/CompleteTaskAccTest.java | 45 ++-- .../acceptance/task/CreateTaskAccTest.java | 61 ++--- .../acceptance/task/DeleteTaskAccTest.java | 40 ++-- .../java/acceptance/task/GetTaskAccTest.java | 14 +- .../QueryTaskByClassificationNameAccTest.java | 12 +- .../task/QueryTaskWithAttachment.java | 8 +- .../acceptance/task/QueryTasksAccTest.java | 192 ++++++++-------- .../QueryTasksByObjectReferenceAccTest.java | 8 +- .../QueryTasksByTimeIntervalsAccTest.java | 8 +- .../task/QueryTasksByWorkbasketAccTest.java | 28 ++- .../task/QueryTasksWithPaginationAccTest.java | 23 +- .../task/QueryTasksWithSortingAccTest.java | 8 +- .../acceptance/task/TransferTaskAccTest.java | 72 +++--- .../acceptance/task/UpdateTaskAccTest.java | 28 ++- .../task/UpdateTaskAttachmentsAccTest.java | 16 +- .../acceptance/task/WorkOnTaskAccTest.java | 41 ++-- .../workbasket/CreateWorkbasketAccTest.java | 48 ++-- .../workbasket/DeleteWorkbasketAccTest.java | 78 ++++--- .../DistributionTargetsAccTest.java | 40 ++-- .../workbasket/GetWorkbasketAccTest.java | 50 +++-- .../workbasket/QueryWorkbasketAccTest.java | 117 +++++----- .../QueryWorkbasketAccessItemsAccTest.java | 24 +- .../QueryWorkbasketByPermissionAccTest.java | 25 +-- ...QueryWorkbasketsWithPaginationAccTest.java | 23 +- .../workbasket/UpdateWorkbasketAccTest.java | 15 +- ...UpdateWorkbasketAuthorizationsAccTest.java | 8 +- ...sketQueryWithOrderedPaginationAccTest.java | 14 +- .../pro/taskana/security/JAASExtension.java | 53 +++++ lib/taskana-spring-example/pom.xml | 18 +- .../taskana/TaskanaTransactionIntTest.java | 34 +-- lib/taskana-spring/pom.xml | 18 ++ pom.xml | 8 +- rest/taskana-rest-spring-test/pom.xml | 18 ++ .../pro/taskana/TaskanaSpringBootTest.java | 27 +++ ...ractPagingControllerRestDocumentation.java | 12 +- .../doc/api/BaseRestDocumentation.java | 34 +-- ...sificationControllerRestDocumentation.java | 20 +- ...DefinitionControllerRestDocumentation.java | 14 +- .../doc/api/CommonRestDocumentation.java | 12 +- .../MonitorControllerRestDocumentation.java | 18 +- .../api/TaskControllerRestDocumentation.java | 26 +-- ...kanaEngineControllerRestDocumentation.java | 20 +- ...AccessItemControllerRestDocumentation.java | 19 +- ...WorkbasketControllerRestDocumentation.java | 30 +-- ...DefinitionControllerRestDocumentation.java | 14 +- .../taskana/jobs/AsyncUpdateJobIntTest.java | 22 +- .../test/java/pro/taskana/ldap/LdapTest.java | 17 +- .../AccessIdValidationControllerIntTest.java | 20 +- .../rest/ClassificationControllerIntTest.java | 60 +++-- ...sificationDefinitionControllerIntTest.java | 50 ++--- .../rest/GenenalExceptionHandlingTest.java | 32 ++- .../taskana/rest/TaskControllerIntTest.java | 53 +++-- .../rest/TaskanaEngineControllerIntTest.java | 22 +- .../rest/TestSchemaNameCustomizable.java | 16 +- ...WorkbasketAccessItemControllerIntTest.java | 37 ++-- .../rest/WorkbasketControllerIntTest.java | 34 ++- ...WorkbasketDefinitionControllerIntTest.java | 33 ++- .../pom.xml | 17 +- rest/taskana-rest-spring/pom.xml | 18 +- .../resource/ClassificationAssemblerTest.java | 14 +- .../rest/resource/ConfigurationTest.java | 11 +- .../rest/resource/ReportResourceTest.java | 26 +-- .../resource/TaskResourceAssemberTest.java | 18 +- ...basketAccessItemResourceAssemblerTest.java | 16 +- .../WorkbasketResourceAssemblerTest.java | 18 +- .../WorkbasketSummaryAssemblerTest.java | 12 +- 101 files changed, 1567 insertions(+), 1347 deletions(-) create mode 100644 lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java create mode 100644 rest/taskana-rest-spring-test/src/test/java/pro/taskana/TaskanaSpringBootTest.java diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml index 3899bc0c0..4910afc96 100644 --- a/history/taskana-simplehistory-provider/pom.xml +++ b/history/taskana-simplehistory-provider/pom.xml @@ -44,9 +44,22 @@ ${version.mybatis} - junit - junit - ${version.junit} + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} + test org.powermock diff --git a/history/taskana-simplehistory-spring-test/pom.xml b/history/taskana-simplehistory-spring-test/pom.xml index 48a107f56..d449bd90e 100644 --- a/history/taskana-simplehistory-spring-test/pom.xml +++ b/history/taskana-simplehistory-spring-test/pom.xml @@ -51,9 +51,21 @@ spring-plugin-core - junit - junit - ${version.junit} + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} test diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml index ed426b436..a9618bae7 100644 --- a/lib/taskana-cdi/pom.xml +++ b/lib/taskana-cdi/pom.xml @@ -26,9 +26,21 @@ - junit - junit - ${version.junit} + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} test diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml index 5b6e5b1ef..f9e8726fc 100644 --- a/lib/taskana-core/pom.xml +++ b/lib/taskana-core/pom.xml @@ -37,9 +37,21 @@ - junit - junit - ${version.junit} + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} test diff --git a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java index b4c9f2ad8..bb967a33f 100644 --- a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java @@ -14,6 +14,7 @@ import java.util.Map; import javax.sql.DataSource; import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import pro.taskana.Attachment; import pro.taskana.ObjectReference; @@ -36,6 +37,7 @@ public abstract class AbstractAccTest { private static DBCleaner cleaner = new DBCleaner(); protected static TestDataGenerator testDataGenerator = new TestDataGenerator(); + @BeforeAll @BeforeClass public static void setupTest() throws Exception { resetDb(false); 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 e07f45ee8..fa4de5a6a 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java @@ -6,8 +6,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Classification; @@ -19,20 +20,20 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskanaException; import pro.taskana.impl.ClassificationImpl; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "create classification" scenarios. */ -@RunWith(JAASRunner.class) -public class CreateClassificationAccTest extends AbstractAccTest { +@ExtendWith(JAASExtension.class) +class CreateClassificationAccTest extends AbstractAccTest { private static final String ID_PREFIX_CLASSIFICATION = "CLI"; private ClassificationService classificationService; - public CreateClassificationAccTest() { + CreateClassificationAccTest() { super(); classificationService = taskanaEngine.getClassificationService(); } @@ -41,7 +42,7 @@ public class CreateClassificationAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) @Test - public void testCreateMasterClassification() + void testCreateMasterClassification() throws ClassificationAlreadyExistException, ClassificationNotFoundException, NotAuthorizedException, DomainNotFoundException, InvalidArgumentException { long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); @@ -66,7 +67,7 @@ public class CreateClassificationAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) @Test - public void testCreateClassificationWithMasterCopy() + void testCreateClassificationWithMasterCopy() throws ClassificationAlreadyExistException, ClassificationNotFoundException, NotAuthorizedException, DomainNotFoundException, InvalidArgumentException { long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); @@ -110,12 +111,12 @@ public class CreateClassificationAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) @Test - public void testCreateClassificationWithExistingMaster() + void testCreateClassificationWithExistingMaster() throws DomainNotFoundException, ClassificationAlreadyExistException, NotAuthorizedException, InvalidArgumentException { classificationService.createClassification( - classificationService.newClassification("Key0815", "", "TASK")); + classificationService.newClassification("Key0815", "", "TASK")); long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); Classification expected = classificationService.newClassification("Key0815", "DOMAIN_B", "TASK"); @@ -132,9 +133,8 @@ public class CreateClassificationAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) @Test - public void testCreateChildInDomainAndCopyInMaster() - throws DomainNotFoundException, ClassificationAlreadyExistException, - TaskanaException, InvalidArgumentException { + void testCreateChildInDomainAndCopyInMaster() + throws TaskanaException { Classification parent = classificationService.newClassification("Key0816", "DOMAIN_A", "TASK"); Classification actualParent = classificationService.createClassification(parent); assertNotNull(actualParent); @@ -154,109 +154,98 @@ public class CreateClassificationAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) @Test - public void testCreateClassificationWithInvalidValues() + void testCreateClassificationWithInvalidValues() throws ClassificationAlreadyExistException, NotAuthorizedException, DomainNotFoundException { - long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); + classificationService.createClassificationQuery().count(); // Check key NULL - try { - Classification classification = classificationService.newClassification(null, "DOMAIN_A", "TASK"); - classification = classificationService.createClassification(classification); - } catch (InvalidArgumentException e) { - // nothing to do - } + Classification classification = classificationService.newClassification(null, "DOMAIN_A", "TASK"); + Assertions.assertThrows(InvalidArgumentException.class, () -> + classificationService.createClassification(classification)); // Check invalid ServiceLevel - try { - Classification classification = classificationService.newClassification("Key2", "DOMAIN_B", "TASK"); - classification.setServiceLevel("abc"); - classification = classificationService.createClassification(classification); - } catch (InvalidArgumentException e) { - // nothing to do - } + + Classification classification2 = classificationService.newClassification("Key2", "DOMAIN_B", "TASK"); + classification2.setServiceLevel("abc"); + Assertions.assertThrows(InvalidArgumentException.class, + () -> classificationService.createClassification(classification2)); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = ClassificationAlreadyExistException.class) - public void testCreateClassificationAlreadyExisting() - throws ClassificationAlreadyExistException, NotAuthorizedException, DomainNotFoundException, - InvalidArgumentException { + @Test + void testCreateClassificationAlreadyExisting() + throws TaskanaException { Classification classification = classificationService.newClassification("Key3", "", "TASK"); - classification = classificationService.createClassification(classification); - classification = classificationService.createClassification(classification); + Classification classificationCreated = classificationService.createClassification(classification); + Assertions.assertThrows(ClassificationAlreadyExistException.class, + () -> classificationService.createClassification(classificationCreated)); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = DomainNotFoundException.class) - public void testCreateClassificationInUnknownDomain() - throws ClassificationAlreadyExistException, NotAuthorizedException, DomainNotFoundException, - InvalidArgumentException { + @Test + void testCreateClassificationInUnknownDomain() { Classification classification = classificationService.newClassification("Key3", "UNKNOWN_DOMAIN", "TASK"); - classification = classificationService.createClassification(classification); + Assertions.assertThrows(DomainNotFoundException.class, + () -> classificationService.createClassification(classification)); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = InvalidArgumentException.class) - public void testCreateClassificationOfUnknownType() - throws ClassificationAlreadyExistException, NotAuthorizedException, DomainNotFoundException, - InvalidArgumentException { + @Test + void testCreateClassificationOfUnknownType() { Classification classification = classificationService.newClassification("Key3", "DOMAIN_A", "UNKNOWN_TYPE"); - classification = classificationService.createClassification(classification); + Assertions.assertThrows(InvalidArgumentException.class, + () -> classificationService.createClassification(classification)); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = InvalidArgumentException.class) - public void testCreateClassificationOfUnknownCategory() - throws ClassificationAlreadyExistException, NotAuthorizedException, DomainNotFoundException, - InvalidArgumentException { + @Test + void testCreateClassificationOfUnknownCategory() { Classification classification = classificationService.newClassification("Key4", "DOMAIN_A", "TASK"); classification.setCategory("UNKNOWN_CATEGORY"); - classification = classificationService.createClassification(classification); + Assertions.assertThrows(InvalidArgumentException.class, + () -> classificationService.createClassification(classification)); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = InvalidArgumentException.class) - public void testCreateClassificationWithInvalidParentId() - throws ClassificationAlreadyExistException, NotAuthorizedException, DomainNotFoundException, - InvalidArgumentException { + @Test + void testCreateClassificationWithInvalidParentId() { Classification classification = classificationService.newClassification("Key5", "", "TASK"); classification.setParentId("ID WHICH CANT BE FOUND"); - classification = classificationService.createClassification(classification); + Assertions.assertThrows(InvalidArgumentException.class, + () -> classificationService.createClassification(classification)); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = InvalidArgumentException.class) - public void testCreateClassificationWithInvalidParentKey() - throws ClassificationAlreadyExistException, NotAuthorizedException, DomainNotFoundException, - InvalidArgumentException { + @Test + void testCreateClassificationWithInvalidParentKey() { Classification classification = classificationService.newClassification("Key5", "", "TASK"); classification.setParentKey("KEY WHICH CANT BE FOUND"); - classification = classificationService.createClassification(classification); + Assertions.assertThrows(InvalidArgumentException.class, + () -> classificationService.createClassification(classification)); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = InvalidArgumentException.class) - public void testCreateClassificationWithExplicitId() - throws DomainNotFoundException, ClassificationAlreadyExistException, - NotAuthorizedException, InvalidArgumentException { + @Test + void testCreateClassificationWithExplicitId() { ClassificationImpl classification = (ClassificationImpl) classificationService - .newClassification("Key0818", "", "TASK"); + .newClassification("Key0818", "", "TASK"); classification.setId("EXPLICIT ID"); - classificationService.createClassification(classification); + Assertions.assertThrows(InvalidArgumentException.class, + () -> classificationService.createClassification(classification)); } } 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 92bcdff80..c62fb46d0 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java @@ -4,10 +4,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Classification; @@ -15,13 +15,13 @@ import pro.taskana.ClassificationService; import pro.taskana.exceptions.ClassificationInUseException; import pro.taskana.exceptions.ClassificationNotFoundException; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "delete classification" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class DeleteClassificationAccTest extends AbstractAccTest { private ClassificationService classificationService; @@ -47,29 +47,29 @@ public class DeleteClassificationAccTest extends AbstractAccTest { @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "group_2"}) - @Test(expected = NotAuthorizedException.class) + @Test public void testDeleteClassificationInDomainUserIsNotAuthorized() throws ClassificationNotFoundException, NotAuthorizedException, ClassificationInUseException { - classificationService.deleteClassification("L140101", "DOMAIN_A"); - fail("NotAuthorizedException should have been thrown"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + classificationService.deleteClassification("L140101", "DOMAIN_A")); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = ClassificationInUseException.class) - public void testThrowExeptionIfDeleteClassificationWithExistingTasks() - throws ClassificationNotFoundException, NotAuthorizedException, ClassificationInUseException { - classificationService.deleteClassification("L1050", "DOMAIN_A"); + @Test + public void testThrowExeptionIfDeleteClassificationWithExistingTasks() { + Assertions.assertThrows(ClassificationInUseException.class, () -> + classificationService.deleteClassification("L1050", "DOMAIN_A")); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = ClassificationInUseException.class) - public void testThrowExeptionIfDeleteMasterClassificationWithExistingTasks() - throws ClassificationNotFoundException, NotAuthorizedException, ClassificationInUseException { - classificationService.deleteClassification("L1050", ""); + @Test + public void testThrowExeptionIfDeleteMasterClassificationWithExistingTasks() { + Assertions.assertThrows(ClassificationInUseException.class, () -> + classificationService.deleteClassification("L1050", "")); } @WithAccessId( @@ -93,19 +93,10 @@ public class DeleteClassificationAccTest extends AbstractAccTest { @WithAccessId( userName = "dummy", groupNames = {"businessadmin"}) - @Test(expected = ClassificationInUseException.class) - public void testDeleteMasterClassificationWithExistingAttachment() - throws ClassificationNotFoundException, NotAuthorizedException, ClassificationInUseException { - - classificationService.deleteClassification("L12010", ""); - - boolean classificationNotFound = false; - try { - classificationService.getClassification("L12010", "DOMAIN_A"); - } catch (ClassificationNotFoundException e) { - classificationNotFound = true; - } - assertTrue(classificationNotFound); + @Test + public void testDeleteMasterClassificationWithExistingAttachment() { + Assertions.assertThrows(ClassificationInUseException.class, () -> + classificationService.deleteClassification("L12010", "")); } @WithAccessId( @@ -140,19 +131,19 @@ public class DeleteClassificationAccTest extends AbstractAccTest { @WithAccessId( userName = "dummy", groupNames = {"businessadmin"}) - @Test(expected = ClassificationNotFoundException.class) - public void testThrowClassificationNotFoundIfClassificationNotExists() - throws ClassificationNotFoundException, ClassificationInUseException, NotAuthorizedException { - classificationService.deleteClassification("not existing classification key", ""); + @Test + public void testThrowClassificationNotFoundIfClassificationNotExists() { + Assertions.assertThrows(ClassificationNotFoundException.class, () -> + classificationService.deleteClassification("not existing classification key", "")); } @WithAccessId( userName = "dummy", groupNames = {"businessadmin"}) - @Test(expected = ClassificationNotFoundException.class) - public void testThrowClassificationNotFoundIfClassificationNotExistsInDomain() - throws ClassificationNotFoundException, ClassificationInUseException, NotAuthorizedException { - classificationService.deleteClassification("L10000", "DOMAIN_B"); + @Test + public void testThrowClassificationNotFoundIfClassificationNotExistsInDomain() { + Assertions.assertThrows(ClassificationNotFoundException.class, () -> + classificationService.deleteClassification("L10000", "DOMAIN_B")); } } diff --git a/lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java index 02347814f..d8d8e2b57 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java @@ -2,11 +2,12 @@ package acceptance.classification; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import acceptance.AbstractAccTest; import pro.taskana.Classification; import pro.taskana.ClassificationService; @@ -96,22 +97,23 @@ public class GetClassificationAccTest extends AbstractAccTest { assertEquals("P2D", classification.getServiceLevel()); } - @Test(expected = ClassificationNotFoundException.class) - public void testGetOneClassificationByIdFails() throws ClassificationNotFoundException { - classificationService.getClassification("CLI:100000000470000000000000000000000011"); - fail("ClassificationNotFoundException was expected"); + @Test + public void testGetOneClassificationByIdFails() { + + Assertions.assertThrows(ClassificationNotFoundException.class, () -> + classificationService.getClassification("CLI:100000000470000000000000000000000011")); } - @Test(expected = ClassificationNotFoundException.class) - public void testGetClassificationByNullKeyFails() throws ClassificationNotFoundException { - classificationService.getClassification(null, ""); - fail("ClassificationNotFoundException was expected"); + @Test + public void testGetClassificationByNullKeyFails() { + Assertions.assertThrows(ClassificationNotFoundException.class, () -> + classificationService.getClassification(null, "")); } - @Test(expected = ClassificationNotFoundException.class) - public void testGetClassificationByInvalidKeyAndDomain() throws ClassificationNotFoundException { - classificationService.getClassification("Key0815", "NOT_EXISTING"); - fail("ClassificationNotFoundException was expected"); + @Test + public void testGetClassificationByInvalidKeyAndDomain() { + Assertions.assertThrows(ClassificationNotFoundException.class, () -> + classificationService.getClassification("Key0815", "NOT_EXISTING")); } @Test diff --git a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java index 0c782ac76..ed899acf7 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java @@ -2,35 +2,34 @@ package acceptance.classification; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; - +import static pro.taskana.ClassificationQueryColumnName.CREATED; import static pro.taskana.ClassificationQueryColumnName.NAME; import static pro.taskana.ClassificationQueryColumnName.TYPE; -import static pro.taskana.ClassificationQueryColumnName.CREATED; import static pro.taskana.ClassificationQueryColumnName.VALID_IN_DOMAIN; import java.time.Instant; import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; +import pro.taskana.BaseQuery.SortDirection; import pro.taskana.ClassificationService; import pro.taskana.ClassificationSummary; import pro.taskana.TimeInterval; -import pro.taskana.BaseQuery.SortDirection; import pro.taskana.exceptions.ClassificationNotFoundException; import pro.taskana.exceptions.ConcurrencyException; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "get classification" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryClassificationAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; @@ -256,10 +255,10 @@ public class QueryClassificationAccTest extends AbstractAccTest { String clId = "CLI:200000000000000000000000000000000015"; classificationService.updateClassification(classificationService.getClassification(clId)); List list = classificationService.createClassificationQuery() - .modifiedWithin(new TimeInterval( - classificationService.getClassification(clId).getModified(), - Instant.now())) - .list(); + .modifiedWithin(new TimeInterval( + classificationService.getClassification(clId).getModified(), + Instant.now())) + .list(); assertEquals(1, list.size()); assertEquals(clId, list.get(0).getId()); } @@ -268,8 +267,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForNameLike() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .nameLike("Dynamik%") - .list(); + .nameLike("Dynamik%") + .list(); assertEquals(8, results.size()); } @@ -277,8 +276,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForNameIn() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .nameIn("Widerruf", "OLD-Leistungsfall") - .list(); + .nameIn("Widerruf", "OLD-Leistungsfall") + .list(); assertEquals(6, results.size()); } @@ -286,8 +285,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForDescriptionLike() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .descriptionLike("Widerruf%") - .list(); + .descriptionLike("Widerruf%") + .list(); assertEquals(9, results.size()); } @@ -295,8 +294,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForServiceLevelIn() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .serviceLevelIn("P2D") - .list(); + .serviceLevelIn("P2D") + .list(); assertEquals(5, results.size()); } @@ -304,8 +303,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForServiceLevelLike() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .serviceLevelLike("PT%") - .list(); + .serviceLevelLike("PT%") + .list(); assertEquals(0, results.size()); } @@ -313,8 +312,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForApplicationEntryPointIn() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .applicationEntryPointIn("specialPoint", "point0815") - .list(); + .applicationEntryPointIn("specialPoint", "point0815") + .list(); assertEquals(3, results.size()); } @@ -322,8 +321,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForApplicationEntryPointLike() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .applicationEntryPointLike("point%") - .list(); + .applicationEntryPointLike("point%") + .list(); assertEquals(3, results.size()); } @@ -331,8 +330,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom1In() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeIn("1", "VNR,RVNR,KOLVNR, ANR", "VNR") - .list(); + .customAttributeIn("1", "VNR,RVNR,KOLVNR, ANR", "VNR") + .list(); assertEquals(17, results.size()); } @@ -340,8 +339,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom2In() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeIn("2", "CUSTOM2", "custom2") - .list(); + .customAttributeIn("2", "CUSTOM2", "custom2") + .list(); assertEquals(3, results.size()); } @@ -349,8 +348,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom3In() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeIn("3", "Custom3", "custom3") - .list(); + .customAttributeIn("3", "Custom3", "custom3") + .list(); assertEquals(3, results.size()); } @@ -358,8 +357,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom4In() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeIn("4", "custom4") - .list(); + .customAttributeIn("4", "custom4") + .list(); assertEquals(3, results.size()); } @@ -367,8 +366,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom5In() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeIn("5", "custom5") - .list(); + .customAttributeIn("5", "custom5") + .list(); assertEquals(3, results.size()); } @@ -376,8 +375,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom6In() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeIn("6", "custom6") - .list(); + .customAttributeIn("6", "custom6") + .list(); assertEquals(3, results.size()); } @@ -385,8 +384,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom7In() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeIn("7", "custom7", "custom_7") - .list(); + .customAttributeIn("7", "custom7", "custom_7") + .list(); assertEquals(3, results.size()); } @@ -394,8 +393,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom8In() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeIn("8", "custom_8", "custom8") - .list(); + .customAttributeIn("8", "custom_8", "custom8") + .list(); assertEquals(3, results.size()); } @@ -403,8 +402,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom2Like() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeLike("2", "cus%") - .list(); + .customAttributeLike("2", "cus%") + .list(); assertEquals(4, results.size()); } @@ -412,8 +411,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom3Like() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeLike("3", "cus%") - .list(); + .customAttributeLike("3", "cus%") + .list(); assertEquals(4, results.size()); } @@ -421,8 +420,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom4Like() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeLike("4", "cus%") - .list(); + .customAttributeLike("4", "cus%") + .list(); assertEquals(4, results.size()); } @@ -430,8 +429,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom5Like() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeLike("5", "cus%") - .list(); + .customAttributeLike("5", "cus%") + .list(); assertEquals(4, results.size()); } @@ -439,8 +438,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom6Like() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeLike("6", "cus%") - .list(); + .customAttributeLike("6", "cus%") + .list(); assertEquals(4, results.size()); } @@ -448,8 +447,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom7Like() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeLike("7", "cus%") - .list(); + .customAttributeLike("7", "cus%") + .list(); assertEquals(4, results.size()); } @@ -457,8 +456,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForCustom8Like() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .customAttributeLike("8", "cus%") - .list(); + .customAttributeLike("8", "cus%") + .list(); assertEquals(4, results.size()); } @@ -466,8 +465,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByKeyAsc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByKey(asc) - .list(); + .orderByKey(asc) + .list(); assertEquals("A12", results.get(0).getKey()); } @@ -475,9 +474,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByParentIdDesc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByDomain(asc) - .orderByParentId(desc) - .list(); + .orderByDomain(asc) + .orderByParentId(desc) + .list(); assertEquals("CLI:000000000000000000000000000000000020", results.get(0).getParentId()); } @@ -485,8 +484,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByParentKeyDesc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByParentKey(desc) - .list(); + .orderByParentKey(desc) + .list(); assertEquals("T6310", results.get(0).getParentKey()); } @@ -494,8 +493,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCategoryDesc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCategory(desc) - .list(); + .orderByCategory(desc) + .list(); assertEquals("MANUAL", results.get(0).getCategory()); } @@ -503,8 +502,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByDomainAsc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByDomain(asc) - .list(); + .orderByDomain(asc) + .list(); assertEquals("", results.get(0).getDomain()); } @@ -512,8 +511,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByPriorityDesc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByPriority(desc) - .list(); + .orderByPriority(desc) + .list(); assertEquals(999, results.get(0).getPriority()); } @@ -521,8 +520,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByNameAsc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByName(asc) - .list(); + .orderByName(asc) + .list(); assertEquals("Beratungsprotokoll", results.get(0).getName()); } @@ -530,8 +529,8 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByServiceLevelDesc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByServiceLevel(desc) - .list(); + .orderByServiceLevel(desc) + .list(); assertEquals("P8D", results.get(0).getServiceLevel()); } @@ -539,9 +538,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByApplicationEntryPointAsc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByApplicationEntryPoint(asc) - .orderByName(asc) - .list(); + .orderByApplicationEntryPoint(asc) + .orderByName(asc) + .list(); assertEquals("CLI:100000000000000000000000000000000007", results.get(results.size() - 6).getId()); } @@ -549,9 +548,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByParentKeyAsc() { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByParentKey(asc) - .orderByDomain(asc) - .list(); + .orderByParentKey(asc) + .orderByDomain(asc) + .list(); assertEquals("CLI:000000000000000000000000000000000019", results.get(results.size() - 5).getId()); } @@ -559,10 +558,10 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCustom1Desc() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCustomAttribute("1", desc) - .orderByDomain(asc) - .orderByServiceLevel(desc) - .list(); + .orderByCustomAttribute("1", desc) + .orderByDomain(asc) + .orderByServiceLevel(desc) + .list(); assertEquals("CLI:000000000000000000000000000000000002", results.get(0).getId()); } @@ -570,11 +569,11 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCustom2Asc() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCustomAttribute("2", asc) - .orderByName(asc) - .orderByParentKey(asc) - .orderByDomain(asc) - .list(); + .orderByCustomAttribute("2", asc) + .orderByName(asc) + .orderByParentKey(asc) + .orderByDomain(asc) + .list(); assertEquals("CLI:000000000000000000000000000000000002", results.get(0).getId()); } @@ -582,9 +581,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCustom3Desc() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCustomAttribute("3", desc) - .orderByName(asc) - .list(); + .orderByCustomAttribute("3", desc) + .orderByName(asc) + .list(); assertEquals("CLI:100000000000000000000000000000000014", results.get(0).getId()); } @@ -592,9 +591,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCustom4Asc() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCustomAttribute("4", asc) - .orderByName(asc) - .list(); + .orderByCustomAttribute("4", asc) + .orderByName(asc) + .list(); assertEquals("CLI:100000000000000000000000000000000010", results.get(results.size() - 5).getId()); } @@ -602,9 +601,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCustom5Desc() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCustomAttribute("5", desc) - .orderByName(asc) - .list(); + .orderByCustomAttribute("5", desc) + .orderByName(asc) + .list(); assertEquals("CLI:100000000000000000000000000000000011", results.get(0).getId()); } @@ -612,9 +611,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCustom6Asc() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCustomAttribute("6", asc) - .orderByName(asc) - .list(); + .orderByCustomAttribute("6", asc) + .orderByName(asc) + .list(); assertEquals("CLI:100000000000000000000000000000000010", results.get(results.size() - 4).getId()); } @@ -622,9 +621,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCustom7Desc() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCustomAttribute("7", desc) - .orderByName(asc) - .list(); + .orderByCustomAttribute("7", desc) + .orderByName(asc) + .list(); assertEquals("CLI:100000000000000000000000000000000011", results.get(0).getId()); } @@ -632,9 +631,9 @@ public class QueryClassificationAccTest extends AbstractAccTest { public void testQueryForOrderByCustom8Asc() throws InvalidArgumentException { ClassificationService classificationService = taskanaEngine.getClassificationService(); List results = classificationService.createClassificationQuery() - .orderByCustomAttribute("8", asc) - .orderByName(asc) - .list(); + .orderByCustomAttribute("8", asc) + .orderByName(asc) + .list(); assertEquals("CLI:100000000000000000000000000000000010", results.get(results.size() - 4).getId()); } } diff --git a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java index cd5c68195..7257c585d 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java @@ -5,20 +5,21 @@ import static org.junit.Assert.assertThat; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.ClassificationService; import pro.taskana.ClassificationSummary; import pro.taskana.exceptions.TaskanaRuntimeException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; /** * Acceptance test for all "query classifications with pagination" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryClassificationWithPaginationAccTest extends AbstractAccTest { public QueryClassificationWithPaginationAccTest() { @@ -136,17 +137,19 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest { * Testcase only for DB2 users, because H2 doesn´t throw a Exception when the offset is set to high.
* Using DB2 should throw a unchecked RuntimeException for a offset which is out of bounds. */ - @Ignore - @Test(expected = TaskanaRuntimeException.class) + @Disabled + @Test public void testPaginationThrowingExceptionWhenPageOutOfBounds() { ClassificationService classificationService = taskanaEngine.getClassificationService(); // entrypoint set outside result amount int pageNumber = 5; int pageSize = 10; - classificationService.createClassificationQuery() - .domainIn("DOMAIN_A") - .listPage(pageNumber, pageSize); + + Assertions.assertThrows(TaskanaRuntimeException.class, () -> + classificationService.createClassificationQuery() + .domainIn("DOMAIN_A") + .listPage(pageNumber, pageSize)); } @Test 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 1dc007529..d270ac7c1 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java @@ -5,7 +5,6 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.time.Duration; import java.time.Instant; @@ -14,8 +13,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Classification; @@ -33,13 +33,13 @@ import pro.taskana.impl.DaysToWorkingDaysConverter; import pro.taskana.impl.TaskImpl; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.jobs.JobRunner; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "update classification" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class UpdateClassificationAccTest extends AbstractAccTest { private ClassificationService classificationService; @@ -91,9 +91,9 @@ public class UpdateClassificationAccTest extends AbstractAccTest { assertTrue(modifiedBefore.isBefore(updatedClassification.getModified())); } - @Test(expected = NotAuthorizedException.class) + @Test public void testUpdateClassificationFails() - throws ClassificationNotFoundException, NotAuthorizedException, ConcurrencyException, + throws ClassificationNotFoundException, ConcurrencyException, InvalidArgumentException { String newName = "updated Name"; String newEntryPoint = "updated EntryPoint"; @@ -116,7 +116,8 @@ public class UpdateClassificationAccTest extends AbstractAccTest { classification.setPriority(1000); classification.setServiceLevel("P2DT3H4M"); - classificationService.updateClassification(classification); + Assertions.assertThrows(NotAuthorizedException.class, () -> + classificationService.updateClassification(classification)); } @WithAccessId( @@ -152,7 +153,7 @@ public class UpdateClassificationAccTest extends AbstractAccTest { @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = ConcurrencyException.class) + @Test public void testUpdateClassificationNotLatestAnymore() throws ClassificationNotFoundException, NotAuthorizedException, ConcurrencyException, InterruptedException, InvalidArgumentException { @@ -168,32 +169,36 @@ public class UpdateClassificationAccTest extends AbstractAccTest { classification.setName("NOW IT´S MY TURN"); classification.setDescription("IT SHOULD BE TO LATE..."); - classificationService.updateClassification(classification); - fail("The Classification should not be updated, because it was modified while editing."); + Assertions.assertThrows(ConcurrencyException.class, () -> + classificationService.updateClassification(classification), + "The Classification should not be updated, because it was modified while editing."); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = ClassificationNotFoundException.class) + @Test public void testUpdateClassificationParentIdToInvalid() throws NotAuthorizedException, ClassificationNotFoundException, ConcurrencyException, InvalidArgumentException { Classification classification = classificationService.getClassification("T2100", "DOMAIN_A"); classification.setParentId("ID WHICH CANT BE FOUND"); - classification = classificationService.updateClassification(classification); + Assertions.assertThrows(ClassificationNotFoundException.class, () -> + classificationService.updateClassification(classification)); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1", "businessadmin"}) - @Test(expected = ClassificationNotFoundException.class) + @Test public void testUpdateClassificationParentKeyToInvalid() throws NotAuthorizedException, ClassificationNotFoundException, ConcurrencyException, InvalidArgumentException { Classification classification = classificationService.getClassification("T2100", "DOMAIN_A"); classification.setParentKey("KEY WHICH CANT BE FOUND"); - classification = classificationService.updateClassification(classification); + + Assertions.assertThrows(ClassificationNotFoundException.class, () -> + classificationService.updateClassification(classification)); } @WithAccessId( @@ -232,23 +237,23 @@ public class UpdateClassificationAccTest extends AbstractAccTest { DaysToWorkingDaysConverter converter = DaysToWorkingDaysConverter .initialize(Collections.singletonList(new TimeIntervalColumnHeader(0)), Instant.now()); - List tasksWithP1D = new ArrayList<>(Arrays.asList( + List tasksWithP1D = new ArrayList<>(Arrays.asList( "TKI:000000000000000000000000000000000054", "TKI:000000000000000000000000000000000055", "TKI:000000000000000000000000000000000000", "TKI:000000000000000000000000000000000011", "TKI:000000000000000000000000000000000053" - )); + )); validateNewTaskProperties(before, tasksWithP1D, taskService, converter, 1); - List tasksWithP8D = new ArrayList<>(Arrays.asList( + List tasksWithP8D = new ArrayList<>(Arrays.asList( "TKI:000000000000000000000000000000000008" - )); + )); validateNewTaskProperties(before, tasksWithP8D, taskService, converter, 8); - List tasksWithP14D = new ArrayList<>(Arrays.asList( + List tasksWithP14D = new ArrayList<>(Arrays.asList( "TKI:000000000000000000000000000000000010" - )); + )); validateNewTaskProperties(before, tasksWithP14D, taskService, converter, 14); List tasksWithP15D = new ArrayList<>( @@ -270,7 +275,7 @@ public class UpdateClassificationAccTest extends AbstractAccTest { "TKI:000000000000000000000000000000000035", "TKI:000000000000000000000000000000000100", "TKI:000000000000000000000000000000000101", "TKI:000000000000000000000000000000000102", "TKI:000000000000000000000000000000000103" - )); + )); validateNewTaskProperties(before, tasksWithP15D, taskService, converter, 15); } @@ -278,14 +283,15 @@ public class UpdateClassificationAccTest extends AbstractAccTest { @WithAccessId( userName = "dummy", groupNames = {"businessadmin"}) - @Test(expected = InvalidArgumentException.class) + @Test public void testUpdateClassificationWithSameKeyAndParentKey() throws ClassificationNotFoundException, NotAuthorizedException, ConcurrencyException, InvalidArgumentException { Classification classification = classificationService.getClassification("T2100", "DOMAIN_A"); classification.setParentKey(classification.getKey()); - classificationService.updateClassification(classification); + Assertions.assertThrows(InvalidArgumentException.class, () -> + classificationService.updateClassification(classification)); } @WithAccessId( @@ -310,9 +316,10 @@ public class UpdateClassificationAccTest extends AbstractAccTest { assertTrue(task.getPriority() == 1000); long calendarDays = converter.convertWorkingDaysToDays(task.getPlanned(), serviceLevel); - assertTrue("Task: " + taskId + ": Due Date " + task.getDue() + " does not match planned " + task.getPlanned() - + " + calendar days " + calendarDays, - task.getDue().equals(task.getPlanned().plus(Duration.ofDays(calendarDays)))); + assertTrue( + "Task: " + taskId + ": Due Date " + task.getDue() + " does not match planned " + task.getPlanned() + + " + calendar days " + calendarDays, + task.getDue().equals(task.getPlanned().plus(Duration.ofDays(calendarDays)))); } } diff --git a/lib/taskana-core/src/test/java/acceptance/config/TaskanaConfigAccTest.java b/lib/taskana-core/src/test/java/acceptance/config/TaskanaConfigAccTest.java index da85a607c..115162b8a 100644 --- a/lib/taskana-core/src/test/java/acceptance/config/TaskanaConfigAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/config/TaskanaConfigAccTest.java @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.List; import org.h2.store.fs.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import pro.taskana.configuration.TaskanaEngineConfiguration; import pro.taskana.impl.TaskanaEngineImpl; diff --git a/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java b/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java index ec916bfd6..544b25def 100644 --- a/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java @@ -9,7 +9,7 @@ import java.sql.SQLException; import java.util.Set; import org.h2.store.fs.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import pro.taskana.TaskanaRole; import pro.taskana.configuration.TaskanaEngineConfiguration; diff --git a/lib/taskana-core/src/test/java/acceptance/history/TaskEventProducerTest.java b/lib/taskana-core/src/test/java/acceptance/history/TaskEventProducerTest.java index 82ea69b27..c78fd92d0 100644 --- a/lib/taskana-core/src/test/java/acceptance/history/TaskEventProducerTest.java +++ b/lib/taskana-core/src/test/java/acceptance/history/TaskEventProducerTest.java @@ -2,17 +2,17 @@ package acceptance.history; import static org.junit.Assert.assertFalse; -import org.junit.Test; +import org.junit.jupiter.api.Test; import acceptance.AbstractAccTest; /** * Acceptance test for historyEventProducer class. */ -public class TaskEventProducerTest extends AbstractAccTest { +class TaskEventProducerTest extends AbstractAccTest { @Test - public void testHistoryEventProducerIsNotEnabled() { + void testHistoryEventProducerIsNotEnabled() { assertFalse(taskanaEngine.isHistoryEnabled()); } } diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java index a76b64e62..bf146fbac 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java @@ -6,9 +6,9 @@ import static org.junit.Assert.assertNotNull; import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Task; @@ -23,18 +23,18 @@ import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.jobs.TaskCleanupJob; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "jobs tasks runner" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class TaskCleanupJobAccTest extends AbstractAccTest { TaskService taskService; - @Before + @BeforeEach public void before() { taskService = taskanaEngine.getTaskService(); } diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java index 2eb63d6fd..ef58683ef 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java @@ -5,10 +5,10 @@ import static org.junit.Assert.assertNotEquals; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BaseQuery; @@ -19,25 +19,25 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.TaskanaException; import pro.taskana.jobs.TaskCleanupJob; import pro.taskana.jobs.WorkbasketCleanupJob; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "jobs workbasket runner" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class WorkbasketCleanupJobAccTest extends AbstractAccTest { WorkbasketService workbasketService; TaskService taskService; - @Before + @BeforeEach public void before() { workbasketService = taskanaEngine.getWorkbasketService(); taskService = taskanaEngine.getTaskService(); } - @After + @AfterEach public void after() throws Exception { resetDb(true); } diff --git a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java index 27e850a38..373bdf267 100644 --- a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java @@ -2,13 +2,12 @@ package acceptance.objectreference; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; - import static pro.taskana.ObjectReferenceQueryColumnName.COMPANY; import static pro.taskana.ObjectReferenceQueryColumnName.SYSTEM; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import acceptance.AbstractAccTest; import pro.taskana.ObjectReference; diff --git a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java index 45fe4cba9..0d4bc8e5d 100644 --- a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java @@ -5,10 +5,11 @@ import static org.junit.Assert.assertThat; import java.util.List; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.ObjectReference; @@ -16,12 +17,12 @@ import pro.taskana.ObjectReferenceQuery; import pro.taskana.TaskQuery; import pro.taskana.TaskService; import pro.taskana.exceptions.TaskanaRuntimeException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; /** * Acceptance test for all "query classifications with pagination" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryObjectreferencesWithPaginationAccTest extends AbstractAccTest { private TaskService taskService; @@ -32,7 +33,7 @@ public class QueryObjectreferencesWithPaginationAccTest extends AbstractAccTest super(); } - @Before + @BeforeEach public void before() { taskService = taskanaEngine.getTaskService(); taskQuery = taskService.createTaskQuery(); @@ -119,13 +120,14 @@ public class QueryObjectreferencesWithPaginationAccTest extends AbstractAccTest * Testcase only for DB2 users, because H2 doesn´t throw a Exception when the offset is set to high.
* Using DB2 should throw a unchecked RuntimeException for a offset which is out of bounds. */ - @Ignore - @Test(expected = TaskanaRuntimeException.class) + @Disabled + @Test public void testPaginationThrowingExceptionWhenPageOutOfBounds() { // entrypoint set outside result amount int pageNumber = 6; int pageSize = 10; - objRefQuery.listPage(pageNumber, pageSize); + Assertions.assertThrows(TaskanaRuntimeException.class, () -> + objRefQuery.listPage(pageNumber, pageSize)); } @Test diff --git a/lib/taskana-core/src/test/java/acceptance/report/AbstractReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/AbstractReportAccTest.java index a527f607e..4e933a0b7 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/AbstractReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/AbstractReportAccTest.java @@ -6,6 +6,7 @@ import java.sql.SQLException; import javax.sql.DataSource; import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import pro.taskana.TaskanaEngine; import pro.taskana.configuration.TaskanaEngineConfiguration; @@ -26,6 +27,7 @@ public class AbstractReportAccTest { } @BeforeClass + @BeforeAll public static void setupTest() throws Exception { resetDb(); } diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java index 2d6527294..edbee5d73 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java @@ -10,27 +10,29 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.CustomField; import pro.taskana.TaskMonitorService; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "classification report" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest { - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() throws NotAuthorizedException { + @Test + public void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - taskMonitorService.createWorkbasketReportBuilder() - .listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_2); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createWorkbasketReportBuilder() + .listCustomAttributeValuesForCustomAttributeName(CustomField.CUSTOM_2)); } diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java index 343aa6328..fae7c74c3 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java @@ -10,8 +10,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.CustomField; import pro.taskana.TaskMonitorService; @@ -20,24 +21,25 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.SelectedItem; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "get task ids of category report" scenarios. */ -@RunWith(JAASRunner.class) -public class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { +@ExtendWith(JAASExtension.class) +class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException { + @Test + void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); List columnHeaders = getListOfColumnHeaders(); List selectedItems = new ArrayList<>(); - taskMonitorService.createCategoryReportBuilder().listTaskIdsForSelectedItems(selectedItems); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createCategoryReportBuilder().listTaskIdsForSelectedItems(selectedItems)); } @WithAccessId( @@ -306,8 +308,8 @@ public class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @WithAccessId( userName = "monitor") - @Test(expected = InvalidArgumentException.class) - public void testThrowsExceptionIfSubKeysAreUsed() throws InvalidArgumentException, NotAuthorizedException { + @Test + public void testThrowsExceptionIfSubKeysAreUsed() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); List columnHeaders = getListOfColumnHeaders(); @@ -321,8 +323,11 @@ public class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { s1.setUpperAgeLimit(-2); selectedItems.add(s1); - taskMonitorService.createCategoryReportBuilder().withColumnHeaders(columnHeaders).listTaskIdsForSelectedItems( - selectedItems); + Assertions.assertThrows(InvalidArgumentException.class, () -> + taskMonitorService.createCategoryReportBuilder() + .withColumnHeaders(columnHeaders) + .listTaskIdsForSelectedItems( + selectedItems)); } private List getListOfColumnHeaders() { diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java index 4bcd20221..d4a1b6271 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java @@ -6,25 +6,26 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.TaskMonitorService; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.SelectedItem; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "get task ids of classification report" scenarios. */ -@RunWith(JAASRunner.class) -public class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { +@ExtendWith(JAASExtension.class) +class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException { + @Test + void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); List selectedItems = new ArrayList<>(); @@ -47,13 +48,14 @@ public class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTe s3.setUpperAgeLimit(-11); selectedItems.add(s3); - taskMonitorService.createClassificationReportBuilder().listTaskIdsForSelectedItems(selectedItems); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createClassificationReportBuilder().listTaskIdsForSelectedItems(selectedItems)); } @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfClassificationReport() throws InvalidArgumentException, NotAuthorizedException { + void testGetTaskIdsOfClassificationReport() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); List columnHeaders = getListOfColumnHeaders(); @@ -95,7 +97,7 @@ public class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTe @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfClassificationReportWithAttachments() + void testGetTaskIdsOfClassificationReportWithAttachments() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); @@ -136,7 +138,7 @@ public class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTe @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfClassificationReportWithDomainFilter() + void testGetTaskIdsOfClassificationReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java index d692bef21..62d7d5331 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java @@ -10,8 +10,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.CustomField; import pro.taskana.TaskMonitorService; @@ -20,31 +21,32 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.SelectedItem; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "get task ids of category report" scenarios. */ -@RunWith(JAASRunner.class) -public class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { +@ExtendWith(JAASExtension.class) +class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException { + @Test + void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); List columnHeaders = getListOfColumnHeaders(); List selectedItems = new ArrayList<>(); - taskMonitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1) - .listTaskIdsForSelectedItems(selectedItems); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1) + .listTaskIdsForSelectedItems(selectedItems)); } @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfCustomFieldValueReport() throws InvalidArgumentException, NotAuthorizedException { + void testGetTaskIdsOfCustomFieldValueReport() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); List columnHeaders = getListOfColumnHeaders(); @@ -88,7 +90,7 @@ public class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAcc @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfCustomFieldValueReportWithWorkbasketFilter() + void testGetTaskIdsOfCustomFieldValueReportWithWorkbasketFilter() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); @@ -130,7 +132,7 @@ public class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAcc @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfCustomFieldValueReportWithStateFilter() + void testGetTaskIdsOfCustomFieldValueReportWithStateFilter() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); @@ -176,7 +178,7 @@ public class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAcc @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfCustomFieldValueReportWithCategoryFilter() + void testGetTaskIdsOfCustomFieldValueReportWithCategoryFilter() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); @@ -218,7 +220,7 @@ public class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAcc @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfCustomFieldValueReportWithDomainFilter() + void testGetTaskIdsOfCustomFieldValueReportWithDomainFilter() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); @@ -259,7 +261,7 @@ public class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAcc @WithAccessId( userName = "monitor") @Test - public void testGetTaskIdsOfCustomFieldValueReportWithCustomFieldValueFilter() + void testGetTaskIdsOfCustomFieldValueReportWithCustomFieldValueFilter() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); @@ -302,8 +304,8 @@ public class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAcc @WithAccessId( userName = "monitor") - @Test(expected = InvalidArgumentException.class) - public void testThrowsExceptionIfSubKeysAreUsed() throws InvalidArgumentException, NotAuthorizedException { + @Test + void testThrowsExceptionIfSubKeysAreUsed() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); List columnHeaders = getListOfColumnHeaders(); @@ -317,8 +319,11 @@ public class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAcc s1.setUpperAgeLimit(-2); selectedItems.add(s1); - taskMonitorService.createCategoryReportBuilder().withColumnHeaders(columnHeaders).listTaskIdsForSelectedItems( - selectedItems); + Assertions.assertThrows(InvalidArgumentException.class, () -> + taskMonitorService.createCategoryReportBuilder() + .withColumnHeaders(columnHeaders) + .listTaskIdsForSelectedItems( + selectedItems)); } private List getListOfColumnHeaders() { diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java index 84b8d776f..589c0cd9d 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -7,24 +7,25 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.TaskMonitorService; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.SelectedItem; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "get task ids of workbasket report" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { - @Test(expected = NotAuthorizedException.class) + @Test public void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); @@ -32,7 +33,8 @@ public class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { List selectedItems = new ArrayList<>(); - taskMonitorService.createWorkbasketReportBuilder().listTaskIdsForSelectedItems(selectedItems); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createWorkbasketReportBuilder().listTaskIdsForSelectedItems(selectedItems)); } @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java index c771497b5..07f637cf3 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java @@ -12,8 +12,9 @@ import java.util.List; import java.util.Map; import java.util.stream.IntStream; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,22 +25,23 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.report.CategoryReport; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "category report" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class ProvideCategoryReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = LoggerFactory.getLogger(ProvideCategoryReportAccTest.class); - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException { + @Test + public void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - taskMonitorService.createCategoryReportBuilder().buildReport(); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createCategoryReportBuilder().buildReport()); } @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java index 722e66fe0..f54778bd6 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -12,8 +12,9 @@ import java.util.List; import java.util.Map; import java.util.stream.IntStream; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,23 +25,24 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.report.ClassificationReport; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "classification report" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class ProvideClassificationReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = LoggerFactory.getLogger(ProvideClassificationReportAccTest.class); - @Test(expected = NotAuthorizedException.class) + @Test public void testRoleCheck() throws InvalidArgumentException, NotAuthorizedException { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - taskMonitorService.createClassificationReportBuilder().buildReport(); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createClassificationReportBuilder().buildReport()); } @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java index 68b18690b..44d034c6e 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java @@ -11,8 +11,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,23 +24,23 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.report.CustomFieldValueReport; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "classification report" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = LoggerFactory.getLogger(ProvideCustomFieldValueReportAccTest.class); - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() - throws InvalidArgumentException, NotAuthorizedException { + @Test + public void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - taskMonitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1).buildReport(); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1).buildReport()); } @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java index b812f1265..5c4220a72 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java @@ -11,8 +11,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,25 +25,25 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.impl.report.item.DetailedMonitorQueryItem; import pro.taskana.impl.report.row.FoldableRow; -import pro.taskana.report.ClassificationReport.DetailedClassificationReport; import pro.taskana.impl.report.structure.Row; -import pro.taskana.security.JAASRunner; +import pro.taskana.report.ClassificationReport.DetailedClassificationReport; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "detailed classification report" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = LoggerFactory.getLogger(ProvideDetailedClassificationReportAccTest.class); - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() - throws InvalidArgumentException, NotAuthorizedException { + @Test + public void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - taskMonitorService.createClassificationReportBuilder().buildDetailedReport(); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createClassificationReportBuilder().buildDetailedReport()); } @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java index 4f7ee9ed2..f9d4f7dae 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java @@ -8,8 +8,9 @@ import static org.junit.Assert.assertNotNull; import java.util.Collections; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,21 +22,22 @@ import pro.taskana.impl.report.header.TaskStatusColumnHeader; import pro.taskana.impl.report.item.TaskQueryItem; import pro.taskana.impl.report.structure.Row; import pro.taskana.report.TaskStatusReport; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "task status report" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = LoggerFactory.getLogger(ProvideWorkbasketReportAccTest.class); - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() throws NotAuthorizedException, InvalidArgumentException { + @Test + public void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - taskMonitorService.createTaskStatusReportBuilder().buildReport(); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createTaskStatusReportBuilder().buildReport()); } @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java index abe7607ea..b463be824 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java @@ -10,8 +10,8 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.TaskMonitorService; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; @@ -19,13 +19,13 @@ import pro.taskana.impl.report.item.TimestampQueryItem; import pro.taskana.impl.report.row.SingleRow; import pro.taskana.impl.report.row.TimestampRow; import pro.taskana.report.TimestampReport; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Test class for {@link TimestampReport}. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class ProvideTimestampReportAccTest extends AbstractReportAccTest { /** diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java index d869cfcf6..d2edbfed2 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java @@ -12,8 +12,9 @@ import java.util.List; import java.util.Map; import java.util.stream.IntStream; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,23 +26,23 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.CombinedClassificationFilter; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.report.WorkbasketReport; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "workbasket level report" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = LoggerFactory.getLogger(ProvideWorkbasketReportAccTest.class); - @Test(expected = NotAuthorizedException.class) - public void testRoleCheck() - throws InvalidArgumentException, NotAuthorizedException { + @Test + public void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - taskMonitorService.createWorkbasketReportBuilder().buildReport(); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskMonitorService.createWorkbasketReportBuilder().buildReport()); } @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java index 17d928457..61da5a1be 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java @@ -5,13 +5,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.ClassificationService; import pro.taskana.ClassificationSummary; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** @@ -19,7 +19,7 @@ import pro.taskana.security.WithAccessId; * * @author bbr */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class ClassificationQueryAccTest extends AbstractAccTest { public ClassificationQueryAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java index a97d0d39a..e0752d127 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java @@ -3,39 +3,42 @@ package acceptance.security; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.TaskanaRole; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for task queries and authorization. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class TaskEngineAccTest extends AbstractAccTest { public TaskEngineAccTest() { super(); } - @Test(expected = NotAuthorizedException.class) - public void testUnauthenticated() throws NotAuthorizedException { + @Test + public void testUnauthenticated() { assertFalse(taskanaEngine.isUserInRole(TaskanaRole.BUSINESS_ADMIN)); assertFalse(taskanaEngine.isUserInRole(TaskanaRole.ADMIN)); - taskanaEngine.checkRoleMembership(TaskanaRole.BUSINESS_ADMIN); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskanaEngine.checkRoleMembership(TaskanaRole.BUSINESS_ADMIN)); } @WithAccessId( userName = "user_1_1") // , groupNames = {"businessadmin"}) - @Test(expected = NotAuthorizedException.class) + @Test public void testUser() throws NotAuthorizedException { assertFalse(taskanaEngine.isUserInRole(TaskanaRole.BUSINESS_ADMIN)); assertFalse(taskanaEngine.isUserInRole(TaskanaRole.ADMIN)); - taskanaEngine.checkRoleMembership(TaskanaRole.BUSINESS_ADMIN); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskanaEngine.checkRoleMembership(TaskanaRole.BUSINESS_ADMIN)); } @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java index 5f91d8f0b..1723e4357 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java @@ -5,19 +5,19 @@ import static org.junit.Assert.assertThat; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.TaskService; import pro.taskana.TaskSummary; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for task queries and authorization. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class TaskQueryAccTest extends AbstractAccTest { public TaskQueryAccTest() { 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 0cdd37e42..485df38d0 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java @@ -3,8 +3,8 @@ package acceptance.security; import java.util.List; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.WorkbasketPermission; @@ -12,13 +12,13 @@ import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for workbasket queries and authorization. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class WorkbasketQueryAccTest extends AbstractAccTest { public WorkbasketQueryAccTest() { 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 c7e70fc32..024a4b2f6 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -10,8 +10,9 @@ import java.time.Instant; import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Task; @@ -27,14 +28,14 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance tests for all claim and complete scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class CompleteTaskAccTest extends AbstractAccTest { public CompleteTaskAccTest() { @@ -225,49 +226,48 @@ public class CompleteTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = TaskNotFoundException.class) - public void testClaimTaskNotExisting() - throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, - NotAuthorizedException { + @Test + public void testClaimTaskNotExisting() { TaskService taskService = taskanaEngine.getTaskService(); - taskService.claim("NOT_EXISTING"); + Assertions.assertThrows(TaskNotFoundException.class, () -> taskService.claim("NOT_EXISTING")); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = InvalidStateException.class) - public void testClaimTaskWithInvalidState() - throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, - NotAuthorizedException { + @Test + public void testClaimTaskWithInvalidState() { TaskService taskService = taskanaEngine.getTaskService(); - taskService.forceClaim("TKI:000000000000000000000000000000000036"); + Assertions.assertThrows(InvalidStateException.class, () -> + taskService.forceClaim("TKI:000000000000000000000000000000000036")); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = InvalidOwnerException.class) + @Test public void testClaimTaskWithInvalidOwner() throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, NotAuthorizedException { TaskService taskService = taskanaEngine.getTaskService(); - taskService.claim("TKI:000000000000000000000000000000000100"); + Assertions.assertThrows(InvalidOwnerException.class, () -> + taskService.claim("TKI:000000000000000000000000000000000100")); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = InvalidStateException.class) + @Test public void testCancelClaimForcedWithInvalidState() throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, NotAuthorizedException { TaskService taskService = taskanaEngine.getTaskService(); - taskService.forceCancelClaim("TKI:000000000000000000000000000000000036"); + Assertions.assertThrows(InvalidStateException.class, () -> + taskService.forceCancelClaim("TKI:000000000000000000000000000000000036")); } @WithAccessId( @@ -327,13 +327,12 @@ public class CompleteTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = InvalidOwnerException.class) - public void testCancelClaimWithInvalidOwner() - throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, - NotAuthorizedException { + @Test + public void testCancelClaimWithInvalidOwner() { TaskService taskService = taskanaEngine.getTaskService(); - taskService.cancelClaim("TKI:000000000000000000000000000000000100"); + Assertions.assertThrows(InvalidOwnerException.class, () -> + taskService.cancelClaim("TKI:000000000000000000000000000000000100")); } private void waitAMillisecond() { 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 97c512b4b..f5331f852 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java @@ -16,8 +16,9 @@ import java.util.Map; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSession; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.ObjectReference; @@ -38,13 +39,13 @@ import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.mappings.AttachmentMapper; import pro.taskana.mappings.TaskTestMapper; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "create task" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class CreateTaskAccTest extends AbstractAccTest { public CreateTaskAccTest() { @@ -114,7 +115,7 @@ public class CreateTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = TaskAlreadyExistException.class) + @Test public void testIdempotencyOfTaskCreation() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, WorkbasketNotFoundException, TaskAlreadyExistException { @@ -144,11 +145,13 @@ public class CreateTaskAccTest extends AbstractAccTest { assertEquals(false, createdTask.isRead()); assertEquals(false, createdTask.isTransferred()); - newTask = taskService.newTask("USER_1_1", "DOMAIN_A"); - newTask.setExternalId("MyExternalId"); - newTask.setClassificationKey("T2100"); - newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567")); - taskService.createTask(newTask); + Task newTask2 = taskService.newTask("USER_1_1", "DOMAIN_A"); + newTask2.setExternalId("MyExternalId"); + newTask2.setClassificationKey("T2100"); + newTask2.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567")); + + Assertions.assertThrows(TaskAlreadyExistException.class, () -> + taskService.createTask(newTask2)); } @WithAccessId( @@ -488,31 +491,31 @@ public class CreateTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = WorkbasketNotFoundException.class) - public void testGetExceptionIfWorkbasketDoesNotExist() - throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, - WorkbasketNotFoundException, TaskAlreadyExistException { + @Test + public void testGetExceptionIfWorkbasketDoesNotExist() { TaskService taskService = taskanaEngine.getTaskService(); Task newTask = taskService.newTask("UNKNOWN"); newTask.setClassificationKey("T2100"); newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567")); - taskService.createTask(newTask); + + Assertions.assertThrows(WorkbasketNotFoundException.class, () -> + taskService.createTask(newTask)); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = NotAuthorizedException.class) - public void testGetExceptionIfAppendIsNotPermitted() - throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, - WorkbasketNotFoundException, TaskAlreadyExistException { + @Test + public void testGetExceptionIfAppendIsNotPermitted() { TaskService taskService = taskanaEngine.getTaskService(); Task newTask = taskService.newTask("GPK_KSC", "DOMAIN_A"); newTask.setClassificationKey("T2100"); newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567")); - taskService.createTask(newTask); + + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskService.createTask(newTask)); } @WithAccessId( @@ -681,7 +684,7 @@ public class CreateTaskAccTest extends AbstractAccTest { } - @Test(expected = NotAuthorizedException.class) + @Test public void testCreateTaskWithSecurityButNoUserId() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, TaskAlreadyExistException, InvalidArgumentException { @@ -690,33 +693,39 @@ public class CreateTaskAccTest extends AbstractAccTest { Task newTask = taskService.newTask("USER_1_1", "DOMAIN_A"); newTask.setClassificationKey("T2100"); newTask.setPrimaryObjRef(createObjectReference("COMPANY_B", "SYSTEM_B", "INSTANCE_B", "VNR", "1234567")); - taskService.createTask(newTask); + + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskService.createTask(newTask)); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = TaskAlreadyExistException.class) + @Test public void testCreateTaskAlreadyExisting() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, TaskAlreadyExistException, InvalidArgumentException, TaskNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); Task existingTask = taskService.getTask("TKI:000000000000000000000000000000000000"); - taskService.createTask(existingTask); + + Assertions.assertThrows(TaskAlreadyExistException.class, () -> + taskService.createTask(existingTask)); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = NotAuthorizedException.class) + @Test public void testCreateTaskNotAuthorizedOnWorkbasket() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, TaskAlreadyExistException, InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.newTask("TEAMLEAD_2", "DOMAIN_A"); - taskService.createTask(task); + + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskService.createTask(task)); } private Task makeNewTask(TaskService taskService) { 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 23e4097e2..25197857a 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java @@ -7,8 +7,9 @@ import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BulkOperationResults; @@ -19,13 +20,13 @@ import pro.taskana.exceptions.InvalidStateException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.TaskanaException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "delete task" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class DeleteTaskAccTest extends AbstractAccTest { public DeleteTaskAccTest() { @@ -35,19 +36,19 @@ public class DeleteTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_2", groupNames = {"group_1"}) - @Test(expected = NotAuthorizedException.class) + @Test public void testDeleteSingleTaskNotAuthorized() throws TaskNotFoundException, InvalidStateException, NotAuthorizedException { TaskService taskService = taskanaEngine.getTaskService(); - taskService.deleteTask("TKI:000000000000000000000000000000000037"); - fail("NotAuthorizedException should have been thrown"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskService.deleteTask("TKI:000000000000000000000000000000000037")); } @WithAccessId( userName = "user_1_2", groupNames = {"group_1", "admin"}) - @Test(expected = TaskNotFoundException.class) + @Test public void testDeleteSingleTask() throws TaskNotFoundException, InvalidStateException, NotAuthorizedException { @@ -56,25 +57,27 @@ public class DeleteTaskAccTest extends AbstractAccTest { taskService.deleteTask(task.getId()); - taskService.getTask("TKI:000000000000000000000000000000000036"); + Assertions.assertThrows(TaskNotFoundException.class, () -> + taskService.getTask("TKI:000000000000000000000000000000000036")); } @WithAccessId( userName = "user_1_2", groupNames = {"group_1", "admin"}) - @Test(expected = InvalidStateException.class) + @Test public void testThrowsExceptionIfTaskIsNotCompleted() throws TaskNotFoundException, InvalidStateException, NotAuthorizedException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.getTask("TKI:000000000000000000000000000000000029"); - taskService.deleteTask(task.getId()); + Assertions.assertThrows(InvalidStateException.class, () -> + taskService.deleteTask(task.getId())); } @WithAccessId( userName = "user_1_2", groupNames = {"group_1", "admin"}) - @Test(expected = TaskNotFoundException.class) + @Test public void testForceDeleteTaskIfNotCompleted() throws TaskNotFoundException, InvalidStateException, NotAuthorizedException { TaskService taskService = taskanaEngine.getTaskService(); @@ -86,13 +89,14 @@ public class DeleteTaskAccTest extends AbstractAccTest { taskService.forceDeleteTask(task.getId()); } - taskService.getTask("TKI:000000000000000000000000000000000027"); + Assertions.assertThrows(TaskNotFoundException.class, () -> + taskService.getTask("TKI:000000000000000000000000000000000027")); } @WithAccessId( userName = "user_1_2", groupNames = {"group_1"}) - @Test(expected = TaskNotFoundException.class) + @Test public void testBulkDeleteTask() throws TaskNotFoundException, InvalidArgumentException, NotAuthorizedException { @@ -104,13 +108,14 @@ public class DeleteTaskAccTest extends AbstractAccTest { BulkOperationResults results = taskService.deleteTasks(taskIdList); assertFalse(results.containsErrors()); - taskService.getTask("TKI:000000000000000000000000000000000038"); + Assertions.assertThrows(TaskNotFoundException.class, () -> + taskService.getTask("TKI:000000000000000000000000000000000038")); } @WithAccessId( userName = "user_1_2", groupNames = {"group_1"}) - @Test(expected = TaskNotFoundException.class) + @Test public void testBulkDeleteTasksWithException() throws TaskNotFoundException, InvalidArgumentException, NotAuthorizedException { @@ -131,7 +136,8 @@ public class DeleteTaskAccTest extends AbstractAccTest { Task notDeletedTask = taskService.getTask("TKI:000000000000000000000000000000000028"); assertTrue(notDeletedTask != null); - taskService.getTask("TKI:000000000000000000000000000000000040"); + Assertions.assertThrows(TaskNotFoundException.class, () -> + taskService.getTask("TKI:000000000000000000000000000000000040")); } 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 2b3d6b57b..6361f16b8 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java @@ -4,8 +4,9 @@ import static org.junit.Assert.assertEquals; import java.util.HashMap; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Task; @@ -14,14 +15,14 @@ import pro.taskana.TaskState; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "get task" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class GetTaskAccTest extends AbstractAccTest { public GetTaskAccTest() { @@ -84,12 +85,13 @@ public class GetTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = TaskNotFoundException.class) + @Test public void testGetTaskByIdNotExisting() throws TaskNotFoundException, NotAuthorizedException { TaskService taskService = taskanaEngine.getTaskService(); - taskService.getTask("INVALID"); + Assertions.assertThrows(TaskNotFoundException.class, () -> + taskService.getTask("INVALID")); } } 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 f416be456..23dffbd70 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java @@ -6,23 +6,23 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.AttachmentSummary; -import pro.taskana.TaskQuery; import pro.taskana.BaseQuery.SortDirection; +import pro.taskana.TaskQuery; import pro.taskana.TaskQueryColumnName; import pro.taskana.TaskService; import pro.taskana.TaskSummary; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for the usecase of adding/removing an attachment of a task and update the result correctly. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryTaskByClassificationNameAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; @@ -179,7 +179,5 @@ public class QueryTaskByClassificationNameAccTest extends AbstractAccTest { // therefore, task 001 is counted only once. } - - } diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java index b7d4c042b..d975a56d6 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java @@ -7,8 +7,8 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Attachment; @@ -19,13 +19,13 @@ import pro.taskana.TaskSummary; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for the usecase of adding/removing an attachment of a task and update the result correctly. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryTaskWithAttachment extends AbstractAccTest { public QueryTaskWithAttachment() { 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 446e75751..479e6d8d6 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java @@ -21,8 +21,9 @@ import org.apache.ibatis.exceptions.PersistenceException; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSession; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Attachment; @@ -44,19 +45,19 @@ import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; import pro.taskana.impl.TaskanaEngineProxyForTest; import pro.taskana.mappings.TaskTestMapper; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query tasks with sorting" scenarios. */ -@RunWith(JAASRunner.class) -public class QueryTasksAccTest extends AbstractAccTest { +@ExtendWith(JAASExtension.class) +class QueryTasksAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; private static SortDirection desc = SortDirection.DESCENDING; - public QueryTasksAccTest() { + QueryTasksAccTest() { super(); } @@ -64,7 +65,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"admin"}) @Test - public void testQueryTaskValuesForEveryColumn() { + void testQueryTaskValuesForEveryColumn() { TaskService taskService = taskanaEngine.getTaskService(); List notWorkingColumns = new ArrayList<>(); for (TaskQueryColumnName columnName : TaskQueryColumnName.values()) { @@ -81,7 +82,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"admin"}) @Test - public void testQueryTaskValuesForColumnName() { + void testQueryTaskValuesForColumnName() { TaskService taskService = taskanaEngine.getTaskService(); List columnValueList = taskService.createTaskQuery() .ownerLike("%user%") @@ -100,7 +101,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"admin"}) @Test - public void testQueryTaskValuesForColumnNameOnAttachments() { + void testQueryTaskValuesForColumnNameOnAttachments() { TaskService taskService = taskanaEngine.getTaskService(); List columnValueList = taskService.createTaskQuery() .attachmentReferenceValueIn("val4") @@ -131,7 +132,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "group_2"}) @Test - public void testQueryForOwnerLike() { + void testQueryForOwnerLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -153,7 +154,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "group_2"}) @Test - public void testQueryForParentBusinessProcessId() { + void testQueryForParentBusinessProcessId() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -179,7 +180,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "group_2"}) @Test - public void testQueryForName() { + void testQueryForName() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -202,7 +203,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "group_2"}) @Test - public void testQueryForClassificationKey() { + void testQueryForClassificationKey() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -235,7 +236,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForAttachmentInSummary() + void testQueryForAttachmentInSummary() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, TaskNotFoundException, ConcurrencyException, AttachmentPersistenceException { TaskService taskService = taskanaEngine.getTaskService(); @@ -261,7 +262,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"admin"}) @Test - public void testQueryForExternalId() { + void testQueryForExternalId() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -285,7 +286,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom1() + void testQueryForCustom1() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -316,7 +317,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom2() + void testQueryForCustom2() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -347,7 +348,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom3() + void testQueryForCustom3() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -378,7 +379,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom4() + void testQueryForCustom4() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -409,7 +410,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom5() + void testQueryForCustom5() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -440,7 +441,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom6() + void testQueryForCustom6() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -470,22 +471,23 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "teamlead_1", groupNames = {"group_1"}) - @Test(expected = InvalidArgumentException.class) - public void testQueryForCustom7WithExceptionInLike() - throws InvalidArgumentException { + @Test + void testQueryForCustom7WithExceptionInLike() { TaskService taskService = taskanaEngine.getTaskService(); - List results = taskService.createTaskQuery() - .customAttributeLike("7") - .list(); - assertThat(results.size(), equalTo(0)); + Assertions.assertThrows(InvalidArgumentException.class, () -> { + List results = taskService.createTaskQuery() + .customAttributeLike("7") + .list(); + assertThat(results.size(), equalTo(0)); + }); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1"}) - @Test(expected = InvalidArgumentException.class) - public void testQueryForCustom7WithExceptionInIn() + @Test + void testQueryForCustom7WithExceptionInIn() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -506,17 +508,19 @@ public class QueryTasksAccTest extends AbstractAccTest { .collect(Collectors.toList()) .toArray(new String[0]); - List result2 = taskService.createTaskQuery() - .customAttributeIn("7", ids) - .list(); - assertThat(result2.size(), equalTo(0)); + Assertions.assertThrows(InvalidArgumentException.class, () -> { + List result2 = taskService.createTaskQuery() + .customAttributeIn("7", ids) + .list(); + assertThat(result2.size(), equalTo(0)); + }); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom7WithException() + void testQueryForCustom7WithException() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -547,7 +551,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom8() + void testQueryForCustom8() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -578,7 +582,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom9() + void testQueryForCustom9() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -609,7 +613,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom10() + void testQueryForCustom10() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -640,7 +644,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom11() + void testQueryForCustom11() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -670,7 +674,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom12() + void testQueryForCustom12() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -700,7 +704,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom13() + void testQueryForCustom13() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -730,7 +734,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom14() + void testQueryForCustom14() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -760,7 +764,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom15() + void testQueryForCustom15() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -790,7 +794,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1"}) @Test - public void testQueryForCustom16() + void testQueryForCustom16() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); @@ -820,7 +824,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "user_1_1", groupNames = {"group_1"}) @Test - public void testQueryTaskByCustomAttributes() + void testQueryTaskByCustomAttributes() throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, WorkbasketNotFoundException, TaskAlreadyExistException, NoSuchFieldException, IllegalAccessException { @@ -865,7 +869,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "user_1_1", groupNames = {"group_1"}) @Test - public void testQueryAndCountMatch() { + void testQueryAndCountMatch() { TaskService taskService = taskanaEngine.getTaskService(); TaskQuery taskQuery = taskService.createTaskQuery(); List tasks = taskQuery @@ -882,7 +886,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"businessadmin"}) @Test - public void testQueryAllPaged() { + void testQueryAllPaged() { TaskService taskService = taskanaEngine.getTaskService(); TaskQuery taskQuery = taskService.createTaskQuery(); long numberOfTasks = taskQuery.count(); @@ -904,7 +908,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForCreatorIn() { + void testQueryForCreatorIn() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .creatorIn("creator_user_id2", "creator_user_id3") @@ -915,7 +919,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForCreatorLike() { + void testQueryForCreatorLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .creatorLike("ersTeLlEr%") @@ -926,7 +930,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForNoteLike() { + void testQueryForNoteLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .noteLike("Some%") @@ -937,7 +941,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForClassificationCategoryIn() { + void testQueryForClassificationCategoryIn() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .classificationCategoryIn("MANUAL", "AUTOMATIC") @@ -948,7 +952,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForClassificationCategoryLike() { + void testQueryForClassificationCategoryLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .classificationCategoryLike("AUTO%") @@ -959,7 +963,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForPrimaryObjectReferenceCompanyLike() { + void testQueryForPrimaryObjectReferenceCompanyLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .primaryObjectReferenceCompanyLike("My%") @@ -970,7 +974,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForPrimaryObjectReferenceSystemLike() { + void testQueryForPrimaryObjectReferenceSystemLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .primaryObjectReferenceSystemLike("My%") @@ -981,7 +985,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForPrimaryObjectReferenceSystemInstanceLike() { + void testQueryForPrimaryObjectReferenceSystemInstanceLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .primaryObjectReferenceSystemInstanceLike("My%") @@ -992,7 +996,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForPrimaryObjectReferenceTypeLike() { + void testQueryForPrimaryObjectReferenceTypeLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .primaryObjectReferenceTypeLike("My%") @@ -1003,7 +1007,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForReadEquals() { + void testQueryForReadEquals() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .readEquals(true) @@ -1014,7 +1018,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForTransferredEquals() { + void testQueryForTransferredEquals() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .transferredEquals(true) @@ -1025,7 +1029,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForBusinessProcessIdIn() { + void testQueryForBusinessProcessIdIn() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .businessProcessIdIn("PI_0000000000003", "BPI21") @@ -1036,7 +1040,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForBusinessProcessIdLike() { + void testQueryForBusinessProcessIdLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .businessProcessIdLike("pI_%") @@ -1047,7 +1051,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForAttachmentClassificationKeyIn() { + void testQueryForAttachmentClassificationKeyIn() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .attachmentClassificationKeyIn("L110102") @@ -1060,7 +1064,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForAttachmentClassificationKeyLike() { + void testQueryForAttachmentClassificationKeyLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .attachmentClassificationKeyLike("%10102") @@ -1073,7 +1077,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForAttachmentclassificationIdIn() { + void testQueryForAttachmentclassificationIdIn() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .attachmentClassificationIdIn("CLI:000000000000000000000000000000000002") @@ -1086,7 +1090,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForAttachmentChannelLike() { + void testQueryForAttachmentChannelLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .attachmentChannelLike("%6") @@ -1097,7 +1101,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForAttachmentReferenceIn() { + void testQueryForAttachmentReferenceIn() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .attachmentReferenceValueIn("val4") @@ -1109,7 +1113,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForAttachmentReceivedIn() { + void testQueryForAttachmentReceivedIn() { TaskService taskService = taskanaEngine.getTaskService(); TimeInterval interval = new TimeInterval( getInstant("2018-01-30T12:00:00"), @@ -1126,7 +1130,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCreatorDesc() { + void testQueryForOrderByCreatorDesc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .orderByCreator(desc) @@ -1137,7 +1141,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByWorkbasketIdDesc() { + void testQueryForOrderByWorkbasketIdDesc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .orderByWorkbasketId(desc) @@ -1149,7 +1153,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom1Asc() throws InvalidArgumentException { + void testQueryForOrderByCustom1Asc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("1", "%") @@ -1161,7 +1165,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom2Desc() throws InvalidArgumentException { + void testQueryForOrderByCustom2Desc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("2", "%") @@ -1173,7 +1177,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom3Asc() throws InvalidArgumentException { + void testQueryForOrderByCustom3Asc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("3", "%") @@ -1185,7 +1189,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom4Desc() throws InvalidArgumentException { + void testQueryForOrderByCustom4Desc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("4", "%") @@ -1199,7 +1203,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom5Asc() throws InvalidArgumentException { + void testQueryForOrderByCustom5Asc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("5", "%") @@ -1211,7 +1215,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom6Desc() throws InvalidArgumentException { + void testQueryForOrderByCustom6Desc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("6", "%") @@ -1223,7 +1227,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom7Asc() throws InvalidArgumentException { + void testQueryForOrderByCustom7Asc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .orderByCustomAttribute("7", asc) @@ -1235,7 +1239,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom8Desc() throws InvalidArgumentException { + void testQueryForOrderByCustom8Desc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .orderByCustomAttribute("8", desc) @@ -1247,7 +1251,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom9Asc() throws InvalidArgumentException { + void testQueryForOrderByCustom9Asc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("9", "%") @@ -1259,7 +1263,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom10Desc() throws InvalidArgumentException { + void testQueryForOrderByCustom10Desc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("10", "%") @@ -1271,7 +1275,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom11Desc() throws InvalidArgumentException { + void testQueryForOrderByCustom11Desc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .orderByCustomAttribute("11", desc) @@ -1286,7 +1290,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom12Asc() throws InvalidArgumentException { + void testQueryForOrderByCustom12Asc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("12", "%") @@ -1298,7 +1302,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom13Desc() throws InvalidArgumentException { + void testQueryForOrderByCustom13Desc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("13", "%") @@ -1312,7 +1316,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom14Asc() throws InvalidArgumentException { + void testQueryForOrderByCustom14Asc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("14", "%") @@ -1324,7 +1328,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom15Desc() throws InvalidArgumentException { + void testQueryForOrderByCustom15Desc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("15", "%") @@ -1338,7 +1342,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByCustom16Asc() throws InvalidArgumentException { + void testQueryForOrderByCustom16Asc() throws InvalidArgumentException { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .customAttributeLike("16", "%") @@ -1350,7 +1354,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderWithDirectionNull() { + void testQueryForOrderWithDirectionNull() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .orderByPrimaryObjectReferenceSystemInstance(null) @@ -1361,7 +1365,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByAttachmentClassificationIdAsc() { + void testQueryForOrderByAttachmentClassificationIdAsc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .idIn("TKI:000000000000000000000000000000000010", "TKI:000000000000000000000000000000000011", @@ -1375,7 +1379,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByAttachmentClassificationIdDesc() { + void testQueryForOrderByAttachmentClassificationIdDesc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() .idIn("TKI:000000000000000000000000000000000010", "TKI:000000000000000000000000000000000011", @@ -1389,7 +1393,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByAttachmentClassificationKeyAsc() { + void testQueryForOrderByAttachmentClassificationKeyAsc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -1405,7 +1409,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByAttachmentClassificationKeyDesc() { + void testQueryForOrderByAttachmentClassificationKeyDesc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -1421,7 +1425,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByAttachmentRefValueDesc() { + void testQueryForOrderByAttachmentRefValueDesc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -1437,7 +1441,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForOrderByAttachmentChannelAscAndReferenceDesc() { + void testQueryForOrderByAttachmentChannelAscAndReferenceDesc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -1454,7 +1458,7 @@ public class QueryTasksAccTest extends AbstractAccTest { @WithAccessId( userName = "admin") @Test - public void testQueryForAttachmentLikeCHAndOrderByClassificationKeyDescAndAsc() { + void testQueryForAttachmentLikeCHAndOrderByClassificationKeyDescAndAsc() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -1478,7 +1482,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "group_2"}) @Test - public void testQueryForExternalIdIn() { + void testQueryForExternalIdIn() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() @@ -1505,7 +1509,7 @@ public class QueryTasksAccTest extends AbstractAccTest { userName = "teamlead_1", groupNames = {"group_1", "group_2"}) @Test - public void testQueryForExternalIdLike() { + void testQueryForExternalIdLike() { TaskService taskService = taskanaEngine.getTaskService(); List results = taskService.createTaskQuery() 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 53f787a54..09b0d2325 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java @@ -3,20 +3,20 @@ package acceptance.task; import java.util.List; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.TaskService; import pro.taskana.TaskSummary; import pro.taskana.exceptions.SystemException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query tasks by object reference" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryTasksByObjectReferenceAccTest extends AbstractAccTest { public QueryTasksByObjectReferenceAccTest() { 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 02e937138..0209ea640 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java @@ -7,21 +7,21 @@ import java.time.Instant; import java.util.List; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BaseQuery.SortDirection; import pro.taskana.TaskService; import pro.taskana.TaskSummary; import pro.taskana.TimeInterval; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query tasks with sorting" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; 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 f60d3d2e3..23d2ed9df 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java @@ -7,21 +7,22 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.KeyDomain; import pro.taskana.TaskService; import pro.taskana.TaskSummary; import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query tasks by workbasket" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryTasksByWorkbasketAccTest extends AbstractAccTest { public QueryTasksByWorkbasketAccTest() { @@ -56,23 +57,26 @@ public class QueryTasksByWorkbasketAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = NotAuthorizedToQueryWorkbasketException.class) + @Test public void testThrowsExceptionIfNoOpenerPermissionOnQueriedWorkbasket() { TaskService taskService = taskanaEngine.getTaskService(); - taskService.createTaskQuery() - .workbasketKeyDomainIn(new KeyDomain("USER_2_1", "DOMAIN_A")) - .list(); + + Assertions.assertThrows(NotAuthorizedToQueryWorkbasketException.class, () -> + taskService.createTaskQuery() + .workbasketKeyDomainIn(new KeyDomain("USER_2_1", "DOMAIN_A")) + .list()); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = NotAuthorizedToQueryWorkbasketException.class) + @Test public void testThrowsExceptionIfNoOpenerPermissionOnAtLeastOneQueriedWorkbasket() { TaskService taskService = taskanaEngine.getTaskService(); - taskService.createTaskQuery() - .workbasketKeyDomainIn(new KeyDomain("USER_1_1", "DOMAIN_A"), new KeyDomain("USER_2_1", "DOMAIN_A")) - .list(); + Assertions.assertThrows(NotAuthorizedToQueryWorkbasketException.class, () -> + taskService.createTaskQuery() + .workbasketKeyDomainIn(new KeyDomain("USER_1_1", "DOMAIN_A"), new KeyDomain("USER_2_1", "DOMAIN_A")) + .list()); } } 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 d79630e71..651bba424 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java @@ -5,22 +5,23 @@ import static org.junit.Assert.assertThat; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.KeyDomain; import pro.taskana.TaskService; import pro.taskana.TaskSummary; import pro.taskana.exceptions.TaskanaRuntimeException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query tasks by workbasket with pagination" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryTasksWithPaginationAccTest extends AbstractAccTest { public QueryTasksWithPaginationAccTest() { @@ -153,20 +154,22 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest { * Testcase only for DB2 users, because H2 doesn´t throw a Exception when the offset is set to high.
* Using DB2 should throw a unchecked RuntimeException for a offset which is out of bounds. */ - @Ignore + @Disabled @WithAccessId( userName = "teamlead_1", groupNames = {"group_1"}) - @Test(expected = TaskanaRuntimeException.class) + @Test public void testPaginationThrowingExceptionWhenPageOutOfBounds() { TaskService taskService = taskanaEngine.getTaskService(); // entrypoint set outside result amount int pageNumber = 6; int pageSize = 10; - taskService.createTaskQuery() - .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A")) - .listPage(pageNumber, pageSize); + + Assertions.assertThrows(TaskanaRuntimeException.class, () -> + taskService.createTaskQuery() + .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A")) + .listPage(pageNumber, pageSize)); } @WithAccessId( 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 c9e59a520..a6bfb5b59 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java @@ -6,8 +6,8 @@ import static org.junit.Assert.assertThat; import java.util.List; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BaseQuery.SortDirection; @@ -15,13 +15,13 @@ import pro.taskana.KeyDomain; import pro.taskana.TaskService; import pro.taskana.TaskState; import pro.taskana.TaskSummary; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query tasks with sorting" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryTasksWithSortingAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; 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 3aaf4f40c..2afb659af 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java @@ -15,8 +15,9 @@ import java.util.Collections; import java.util.List; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BulkOperationResults; @@ -31,13 +32,13 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.TaskanaException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "transfer task" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class TransferTaskAccTest extends AbstractAccTest { public TransferTaskAccTest() { @@ -105,74 +106,79 @@ public class TransferTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = NotAuthorizedException.class) + @Test public void testThrowsExceptionIfTransferWithNoTransferAuthorization() throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, InvalidStateException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.getTask("TKI:000000000000000000000000000000000001"); - taskService.transfer(task.getId(), "WBI:100000000000000000000000000000000005"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskService.transfer(task.getId(), "WBI:100000000000000000000000000000000005")); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1"}) - @Test(expected = WorkbasketNotFoundException.class) + @Test public void testTransferDestinationWorkbasketDoesNotExist() - throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, InvalidStateException, + throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, InvalidOwnerException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.getTask("TKI:000000000000000000000000000000000003"); taskService.claim(task.getId()); taskService.setTaskRead(task.getId(), true); - taskService.transfer(task.getId(), "INVALID"); + Assertions.assertThrows(WorkbasketNotFoundException.class, () -> + taskService.transfer(task.getId(), "INVALID")); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1"}) - @Test(expected = TaskNotFoundException.class) - public void testTransferTaskDoesNotExist() - throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, InvalidStateException { + @Test + public void testTransferTaskDoesNotExist() { TaskService taskService = taskanaEngine.getTaskService(); - taskService.transfer("Invalid", "WBI:100000000000000000000000000000000006"); + Assertions.assertThrows(TaskNotFoundException.class, () -> + taskService.transfer("Invalid", "WBI:100000000000000000000000000000000006")); } @WithAccessId( userName = "teamlead_1", groupNames = {"teamlead_1"}) - @Test(expected = NotAuthorizedException.class) - public void testTransferNotAuthorizationOnWorkbasketTransfer() - throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, InvalidStateException { + @Test + public void testTransferNotAuthorizationOnWorkbasketTransfer() { TaskService taskService = taskanaEngine.getTaskService(); - taskService.transfer("TKI:200000000000000000000000000000000007", "WBI:100000000000000000000000000000000006"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskService.transfer("TKI:200000000000000000000000000000000007", + "WBI:100000000000000000000000000000000006")); } @WithAccessId( userName = "teamlead_1", groupNames = {"group_1"}) - @Test(expected = InvalidStateException.class) + @Test public void testThrowsExceptionIfTaskIsAlreadyCompleted() - throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, InvalidStateException { + throws NotAuthorizedException, TaskNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.getTask("TKI:100000000000000000000000000000000006"); - taskService.transfer(task.getId(), "WBI:100000000000000000000000000000000005"); + Assertions.assertThrows(InvalidStateException.class, () -> + taskService.transfer(task.getId(), "WBI:100000000000000000000000000000000005")); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = NotAuthorizedException.class) + @Test public void testThrowsExceptionIfTransferWithNoAppendAuthorization() - throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, InvalidStateException { + throws NotAuthorizedException, TaskNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.getTask("TKI:000000000000000000000000000000000002"); - taskService.transfer(task.getId(), "WBI:100000000000000000000000000000000008"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + taskService.transfer(task.getId(), "WBI:100000000000000000000000000000000008")); } @WithAccessId( @@ -271,21 +277,18 @@ public class TransferTaskAccTest extends AbstractAccTest { } @WithAccessId(userName = "teamlead_1") - @Test(expected = NotAuthorizedException.class) - public void testBulkTransferTaskWithoutAppendPermissionOnTarget() - throws InvalidArgumentException, WorkbasketNotFoundException, NotAuthorizedException { + @Test + public void testBulkTransferTaskWithoutAppendPermissionOnTarget() { TaskService taskService = taskanaEngine.getTaskService(); ArrayList taskIdList = new ArrayList<>(); taskIdList.add("TKI:000000000000000000000000000000000006"); // working taskIdList.add("TKI:000000000000000000000000000000000041"); // NotAuthorized READ - try { + Throwable t = Assertions.assertThrows(NotAuthorizedException.class, () -> taskService - .transferTasks("WBI:100000000000000000000000000000000010", taskIdList); - } catch (NotAuthorizedException e) { - assertTrue(e.getMessage().contains("APPEND")); - throw e; - } + .transferTasks("WBI:100000000000000000000000000000000010", taskIdList)); + + assertTrue(t.getMessage().contains("APPEND")); } @WithAccessId( @@ -326,12 +329,13 @@ public class TransferTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "teamlead_1", groupNames = {"group_1"}) - @Test(expected = InvalidArgumentException.class) + @Test public void testThrowsExceptionIfEmptyListIsSupplied() throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); List taskIds = new ArrayList<>(); - taskService.transferTasks("WBI:100000000000000000000000000000000006", taskIds); + Assertions.assertThrows(InvalidArgumentException.class, () -> + taskService.transferTasks("WBI:100000000000000000000000000000000006", taskIds)); } @WithAccessId( 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 5aa2395c8..661272280 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java @@ -17,8 +17,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.ClassificationSummary; @@ -35,13 +36,13 @@ import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "update task" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class UpdateTaskAccTest extends AbstractAccTest { public UpdateTaskAccTest() { @@ -207,7 +208,8 @@ public class UpdateTaskAccTest extends AbstractAccTest { try { taskService.setTaskRead("INVALID", true); fail("TaskNotFoundException should have been thrown."); - } catch (TaskNotFoundException e) { } + } catch (TaskNotFoundException e) { + } } @WithAccessId( @@ -229,15 +231,17 @@ public class UpdateTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = InvalidArgumentException.class) + @Test public void testUpdateOfWorkbasketKeyWhatIsNotAllowed() - throws NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException, - TaskNotFoundException, ConcurrencyException, AttachmentPersistenceException { + throws NotAuthorizedException, + TaskNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.getTask("TKI:000000000000000000000000000000000000"); ((TaskImpl) task).setWorkbasketKey("USER_2_2"); - taskService.updateTask(task); + + Assertions.assertThrows(InvalidArgumentException.class, () -> + taskService.updateTask(task)); } @WithAccessId( @@ -302,9 +306,9 @@ public class UpdateTaskAccTest extends AbstractAccTest { public void testUpdateTasksById() throws InvalidArgumentException, TaskNotFoundException, NotAuthorizedException { List taskIds = Arrays.asList( - "TKI:000000000000000000000000000000000008", - "TKI:000000000000000000000000000000000009", - "TKI:000000000000000000000000000000000010"); + "TKI:000000000000000000000000000000000008", + "TKI:000000000000000000000000000000000009", + "TKI:000000000000000000000000000000000010"); Map customProperties = new HashMap<>(); customProperties.put("1", "This is modifiedValue 1"); customProperties.put("5", "This is modifiedValue 5"); 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 e705ca558..9ac3e76b3 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java @@ -14,8 +14,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Attachment; @@ -36,13 +37,13 @@ import pro.taskana.impl.DaysToWorkingDaysConverter; import pro.taskana.impl.TaskImpl; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for the usecase of adding/removing an attachment of a task and update the result correctly. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class UpdateTaskAttachmentsAccTest extends AbstractAccTest { private Task task; @@ -125,7 +126,7 @@ public class UpdateTaskAttachmentsAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = AttachmentPersistenceException.class) + @Test public void testAddNewAttachmentTwiceWithoutTaskanaMethodWillThrowAttachmentPersistenceException() throws TaskNotFoundException, ClassificationNotFoundException, InvalidArgumentException, ConcurrencyException, NotAuthorizedException, @@ -142,7 +143,8 @@ public class UpdateTaskAttachmentsAccTest extends AbstractAccTest { task.getAttachments().add(attachment); task.getAttachments().add(attachment); task.getAttachments().add(attachment); - task = taskService.updateTask(task); + Assertions.assertThrows(AttachmentPersistenceException.class, () -> + task = taskService.updateTask(task)); } @WithAccessId( @@ -529,7 +531,7 @@ public class UpdateTaskAttachmentsAccTest extends AbstractAccTest { taskService.updateTask(task); Task updatedTask = taskService.getTask("TKI:000000000000000000000000000000000000"); Attachment updatedAttachment = updatedTask.getAttachments().stream() - .filter(a -> attachment.getId().equals(a.getId())).findFirst().orElse(null); + .filter(a -> attachment.getId().equals(a.getId())).findFirst().orElse(null); assertNotNull(updatedAttachment); assertEquals("TEST_VALUE", updatedAttachment.getCustomAttributes().get("TEST_KEY")); } 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 6447b56df..32ec86b53 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java @@ -14,8 +14,9 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BulkOperationResults; @@ -28,13 +29,13 @@ import pro.taskana.exceptions.InvalidStateException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.TaskanaException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "work on task" scenarios. This includes claim, complete... */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class WorkOnTaskAccTest extends AbstractAccTest { public WorkOnTaskAccTest() { @@ -66,14 +67,14 @@ public class WorkOnTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_2", groupNames = {"group_1"}) - @Test(expected = InvalidOwnerException.class) + @Test public void testThrowsExceptionIfTaskIsAlreadyClaimed() - throws NotAuthorizedException, TaskNotFoundException, - InvalidStateException, InvalidOwnerException { + throws NotAuthorizedException, TaskNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.getTask("TKI:000000000000000000000000000000000026"); - taskService.claim(task.getId()); + Assertions.assertThrows(InvalidOwnerException.class, () -> + taskService.claim(task.getId())); } @WithAccessId( @@ -92,14 +93,14 @@ public class WorkOnTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_2", groupNames = {"group_1"}) - @Test(expected = InvalidOwnerException.class) + @Test public void testForceClaimTaskWhichIsAlreadyClaimedByAnotherUser() - throws NotAuthorizedException, TaskNotFoundException, - InvalidStateException, InvalidOwnerException { + throws NotAuthorizedException, TaskNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); Task task = taskService.getTask("TKI:000000000000000000000000000000000028"); - taskService.claim(task.getId()); + Assertions.assertThrows(InvalidOwnerException.class, () -> + taskService.claim(task.getId())); } @WithAccessId( @@ -125,14 +126,14 @@ public class WorkOnTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_2", groupNames = {"group_1"}) - @Test(expected = InvalidOwnerException.class) + @Test public void testThrowsExceptionIfCancelClaimOfTaskFromAnotherUser() - throws NotAuthorizedException, TaskNotFoundException, - InvalidStateException, InvalidOwnerException { + throws NotAuthorizedException, TaskNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); Task claimedTask = taskService.getTask("TKI:000000000000000000000000000000000030"); - taskService.cancelClaim(claimedTask.getId()); + Assertions.assertThrows(InvalidOwnerException.class, () -> + taskService.cancelClaim(claimedTask.getId())); } @WithAccessId( @@ -203,14 +204,14 @@ public class WorkOnTaskAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_2", groupNames = {"group_1"}) - @Test(expected = InvalidOwnerException.class) + @Test public void testThrowsExceptionIfCompletingClaimedTaskOfAnotherUser() - throws NotAuthorizedException, TaskNotFoundException, - InvalidStateException, InvalidOwnerException { + throws NotAuthorizedException, TaskNotFoundException { TaskService taskService = taskanaEngine.getTaskService(); Task claimedTask = taskService.getTask("TKI:000000000000000000000000000000000034"); - taskService.completeTask(claimedTask.getId()); + Assertions.assertThrows(InvalidOwnerException.class, () -> + taskService.completeTask(claimedTask.getId())); } @WithAccessId( 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 b2ea36cb2..8ac4c4a50 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java @@ -7,8 +7,9 @@ import static org.junit.Assert.fail; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Workbasket; @@ -21,13 +22,13 @@ import pro.taskana.exceptions.InvalidWorkbasketException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "create workbasket" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class CreateWorkbasketAccTest extends AbstractAccTest { public CreateWorkbasketAccTest() { @@ -67,37 +68,33 @@ public class CreateWorkbasketAccTest extends AbstractAccTest { @WithAccessId( userName = "dummy") - @Test(expected = NotAuthorizedException.class) - public void testCreateWorkbasketNotAuthorized() - throws NotAuthorizedException, InvalidWorkbasketException, WorkbasketAlreadyExistException, - DomainNotFoundException { + @Test + public void testCreateWorkbasketNotAuthorized() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); Workbasket workbasket = workbasketService.newWorkbasket("key3", "DOMAIN_A"); workbasket.setName("Megabasket"); workbasket.setType(WorkbasketType.GROUP); workbasket.setOrgLevel1("company"); - workbasketService.createWorkbasket(workbasket); - fail("NotAuthorizedException should have been thrown"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService.createWorkbasket(workbasket)); + } @WithAccessId( userName = "user_1_2", groupNames = {"businessadmin"}) - @Test(expected = DomainNotFoundException.class) - public void testCreateWorkbasketWithInvalidDomain() - throws NotAuthorizedException, InvalidWorkbasketException, WorkbasketAlreadyExistException, - DomainNotFoundException { + @Test + public void testCreateWorkbasketWithInvalidDomain() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); Workbasket workbasket = workbasketService.newWorkbasket("key3", "UNKNOWN_DOMAIN"); workbasket.setName("Megabasket"); workbasket.setType(WorkbasketType.GROUP); workbasket.setOrgLevel1("company"); - workbasketService.createWorkbasket(workbasket); - - fail("DomainNotFoundException should have been thrown"); + Assertions.assertThrows(DomainNotFoundException.class, () -> + workbasketService.createWorkbasket(workbasket)); } @WithAccessId( @@ -171,7 +168,7 @@ public class CreateWorkbasketAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_2", groupNames = {"businessadmin"}) - @Test(expected = WorkbasketAlreadyExistException.class) + @Test public void testThrowsExceptionIfWorkbasketWithCaseInsensitiveSameKeyDomainIsCreated() throws NotAuthorizedException, InvalidWorkbasketException, WorkbasketAlreadyExistException, DomainNotFoundException { @@ -185,15 +182,18 @@ public class CreateWorkbasketAccTest extends AbstractAccTest { Workbasket duplicateWorkbasketWithSmallX = workbasketService.newWorkbasket("x123456", "DOMAIN_A"); duplicateWorkbasketWithSmallX.setName("Personal Workbasket for UID X123456"); duplicateWorkbasketWithSmallX.setType(WorkbasketType.PERSONAL); - duplicateWorkbasketWithSmallX = workbasketService.createWorkbasket(duplicateWorkbasketWithSmallX); + + Assertions.assertThrows(WorkbasketAlreadyExistException.class, () -> + workbasketService.createWorkbasket(duplicateWorkbasketWithSmallX)); } @WithAccessId( userName = "user_1_2", groupNames = {"businessadmin"}) - @Test(expected = WorkbasketAlreadyExistException.class) + @Test public void testCreateWorkbasketWithAlreadyExistingKeyAndDomainAndEmptyIdUpdatesOlderWorkbasket() - throws DomainNotFoundException, InvalidWorkbasketException, NotAuthorizedException, WorkbasketAlreadyExistException { + throws DomainNotFoundException, InvalidWorkbasketException, + NotAuthorizedException, WorkbasketAlreadyExistException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); // First create a new Workbasket. Workbasket wb = workbasketService.newWorkbasket("newKey", "DOMAIN_A"); @@ -205,11 +205,9 @@ public class CreateWorkbasketAccTest extends AbstractAccTest { Workbasket sameKeyAndDomain = workbasketService.newWorkbasket("newKey", "DOMAIN_A"); sameKeyAndDomain.setType(WorkbasketType.TOPIC); sameKeyAndDomain.setName("new name"); - sameKeyAndDomain = workbasketService.createWorkbasket(sameKeyAndDomain); - assertEquals(wb.getId(), sameKeyAndDomain.getId()); - assertEquals(WorkbasketType.TOPIC, sameKeyAndDomain.getType()); - assertEquals("new name", sameKeyAndDomain.getName()); + Assertions.assertThrows(WorkbasketAlreadyExistException.class, () -> + workbasketService.createWorkbasket(sameKeyAndDomain)); } @WithAccessId( 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 8fe162ae4..9f56c7b33 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java @@ -9,9 +9,10 @@ import static org.junit.Assert.fail; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.TaskService; @@ -28,32 +29,28 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketInUseException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test which does test the deletion of a workbasket and all wanted failures. */ -@RunWith(JAASRunner.class) -public class DeleteWorkbasketAccTest extends AbstractAccTest { +@ExtendWith(JAASExtension.class) +class DeleteWorkbasketAccTest extends AbstractAccTest { private WorkbasketService workbasketService; private TaskService taskService; - public DeleteWorkbasketAccTest() { - super(); - } - - @Before - public void setUpMethod() { + @BeforeEach + void setUpMethod() { workbasketService = taskanaEngine.getWorkbasketService(); taskService = taskanaEngine.getTaskService(); } @WithAccessId(userName = "admin", groupNames = {"businessadmin"}) @Test - public void testDeleteWorkbasket() + void testDeleteWorkbasket() throws WorkbasketNotFoundException, NotAuthorizedException, InvalidArgumentException { Workbasket wb = workbasketService.getWorkbasket("USER_2_2", "DOMAIN_A"); @@ -67,19 +64,27 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest { } @WithAccessId(userName = "elena") - @Test(expected = NotAuthorizedException.class) - public void testDeleteWorkbasketNotAuthorized() - throws WorkbasketNotFoundException, NotAuthorizedException, WorkbasketInUseException, InvalidArgumentException { - Workbasket wb = workbasketService.getWorkbasket("TEAMLEAD_2", "DOMAIN_A"); - workbasketService.deleteWorkbasket(wb.getId()); + @Test + void testDeleteWorkbasketNotAuthorized() { + + Assertions.assertThrows(NotAuthorizedException.class, () -> { + Workbasket wb = workbasketService.getWorkbasket("TEAMLEAD_2", "DOMAIN_A"); + workbasketService.deleteWorkbasket(wb.getId()); + }); + } + + @WithAccessId(userName = "elena") + @Test + void testGetWorkbasketNotAuthorized() { + + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService.getWorkbasket("TEAMLEAD_2", "DOMAIN_A")); - workbasketService.getWorkbasket("TEAMLEAD_2", "DOMAIN_A"); - fail("NotAuthorizedException was expected."); } @WithAccessId(userName = "user_1_1", groupNames = {"teamlead_1", "group_1", "businessadmin"}) @Test - public void testDeleteWorkbasketAlsoAsDistributionTarget() + void testDeleteWorkbasketAlsoAsDistributionTarget() throws WorkbasketNotFoundException, NotAuthorizedException, InvalidArgumentException { Workbasket wb = workbasketService.getWorkbasket("GPK_KSC_1", "DOMAIN_A"); int distTargets = workbasketService.getDistributionTargets("WBI:100000000000000000000000000000000001") @@ -104,7 +109,7 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest { userName = "dummy", groupNames = {"businessadmin"}) @Test - public void testDeleteWorkbasketWithNullOrEmptyParam() + void testDeleteWorkbasketWithNullOrEmptyParam() throws WorkbasketNotFoundException, NotAuthorizedException, WorkbasketInUseException { // Test Null-Value try { @@ -126,40 +131,41 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest { @WithAccessId( userName = "dummy", groupNames = {"businessadmin"}) - @Test(expected = WorkbasketNotFoundException.class) - public void testDeleteWorkbasketButNotExisting() - throws WorkbasketNotFoundException, NotAuthorizedException, WorkbasketInUseException, InvalidArgumentException { - workbasketService.deleteWorkbasket("SOME NOT EXISTING ID"); + @Test + void testDeleteWorkbasketButNotExisting() { + Assertions.assertThrows(WorkbasketNotFoundException.class, () -> + workbasketService.deleteWorkbasket("SOME NOT EXISTING ID")); } @WithAccessId(userName = "user_1_2", groupNames = {"businessadmin"}) - @Test(expected = WorkbasketInUseException.class) - public void testDeleteWorkbasketWhichIsUsed() + @Test + void testDeleteWorkbasketWhichIsUsed() throws WorkbasketNotFoundException, NotAuthorizedException, WorkbasketInUseException, InvalidArgumentException { Workbasket wb = workbasketService.getWorkbasket("USER_1_2", "DOMAIN_A"); // all rights, DOMAIN_A with Tasks - workbasketService.deleteWorkbasket(wb.getId()); + Assertions.assertThrows(WorkbasketInUseException.class, () -> + workbasketService.deleteWorkbasket(wb.getId())); } @WithAccessId( userName = "user_1_2", groupNames = {"businessadmin"}) - @Test(expected = NotAuthorizedToQueryWorkbasketException.class) - public void testCreateAndDeleteWorkbasket() throws Exception { + @Test + void testCreateAndDeleteWorkbasket() throws Exception { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); Workbasket workbasket = workbasketService.newWorkbasket("NT1234", "DOMAIN_A"); workbasket.setName("TheUltimate"); workbasket.setType(WorkbasketType.GROUP); workbasket.setOrgLevel1("company"); - workbasket = workbasketService.createWorkbasket(workbasket); - - workbasketService.deleteWorkbasket(workbasket.getId()); + Workbasket workbasket2 = workbasketService.createWorkbasket(workbasket); + Assertions.assertThrows(NotAuthorizedToQueryWorkbasketException.class, () -> + workbasketService.deleteWorkbasket(workbasket2.getId())); } @WithAccessId(userName = "teamlead_2", groupNames = {"businessadmin"}) @Test - public void testCascadingDeleteOfAccessItems() + void testCascadingDeleteOfAccessItems() throws WorkbasketNotFoundException, NotAuthorizedException, InvalidArgumentException { Workbasket wb = workbasketService.getWorkbasket("WBI:100000000000000000000000000000000008"); String wbId = wb.getId(); @@ -190,7 +196,7 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest { @WithAccessId(userName = "admin", groupNames = {"businessadmin"}) @Test - public void testMarkWorkbasketForDeletion() + void testMarkWorkbasketForDeletion() throws WorkbasketInUseException, NotAuthorizedException, WorkbasketNotFoundException, InvalidArgumentException, InvalidOwnerException, InvalidStateException, TaskNotFoundException { Workbasket wb = workbasketService.getWorkbasket("WBI:100000000000000000000000000000000006"); 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 2fbd7aae0..59e6e20fe 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java @@ -2,7 +2,6 @@ package acceptance.workbasket; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.io.IOException; import java.sql.SQLException; @@ -11,8 +10,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Workbasket; @@ -20,13 +20,13 @@ import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "get workbasket" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class DistributionTargetsAccTest extends AbstractAccTest { public DistributionTargetsAccTest() { @@ -224,7 +224,7 @@ public class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( userName = "user_2_2", groupNames = {"group_1", "group_2"}) - @Test(expected = NotAuthorizedException.class) + @Test public void testAddDistributionTargetsFailsNotAuthorized() throws NotAuthorizedException, WorkbasketNotFoundException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -235,8 +235,10 @@ public class DistributionTargetsAccTest extends AbstractAccTest { // add a new distribution target Workbasket newTarget = workbasketService.getWorkbasket("GPK_B_KSC_2", "DOMAIN_B"); - workbasketService.addDistributionTarget(workbasket.getId(), newTarget.getId()); - fail("NotAuthorizedException should have been thrown"); + + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService.addDistributionTarget(workbasket.getId(), newTarget.getId())); + } @WithAccessId( @@ -315,29 +317,25 @@ public class DistributionTargetsAccTest extends AbstractAccTest { @WithAccessId( userName = "henry", groupNames = {"undefinedgroup"}) - @Test(expected = NotAuthorizedException.class) - public void testQueryDistributionSourcesThrowsNotAuthorized() - throws NotAuthorizedException, WorkbasketNotFoundException { + @Test + public void testQueryDistributionSourcesThrowsNotAuthorized() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - List distributionSources = workbasketService - .getDistributionSources("WBI:100000000000000000000000000000000004"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService + .getDistributionSources("WBI:100000000000000000000000000000000004")); - assertEquals(2, distributionSources.size()); } @WithAccessId( userName = "user_2_2", groupNames = {"group_1", "group_2"}) - @Test(expected = WorkbasketNotFoundException.class) - public void testQueryDistributionSourcesThrowsWorkbasketNotFound() - throws NotAuthorizedException, WorkbasketNotFoundException { + @Test + public void testQueryDistributionSourcesThrowsWorkbasketNotFound() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - List distributionSources = workbasketService - .getDistributionSources("WBI:10dasgibtsdochnicht00000000000000004"); - - assertEquals(2, distributionSources.size()); + Assertions.assertThrows(WorkbasketNotFoundException.class, () -> workbasketService + .getDistributionSources("WBI:10dasgibtsdochnicht00000000000000004")); } } 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 1b0517556..da31698dd 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java @@ -5,8 +5,9 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Workbasket; @@ -16,13 +17,13 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.WorkbasketType; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "get workbasket" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class GetWorkbasketAccTest extends AbstractAccTest { public GetWorkbasketAccTest() { @@ -136,42 +137,43 @@ public class GetWorkbasketAccTest extends AbstractAccTest { assertEquals(false, workbasketSummary.isMarkedForDeletion()); } - @Test(expected = WorkbasketNotFoundException.class) - public void testThrowsExceptionIfIdIsInvalid() - throws NotAuthorizedException, WorkbasketNotFoundException { + @Test + public void testThrowsExceptionIfIdIsInvalid() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - workbasketService.getWorkbasket("INVALID_ID"); + Assertions.assertThrows(WorkbasketNotFoundException.class, () -> + workbasketService.getWorkbasket("INVALID_ID")); } - @Test(expected = WorkbasketNotFoundException.class) - public void testThrowsExceptionIfKeyOrDomainIsInvalid() - throws NotAuthorizedException, WorkbasketNotFoundException { + @Test + public void testThrowsExceptionIfKeyOrDomainIsInvalid() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - workbasketService.getWorkbasket("INVALID_KEY", "INVALID_DOMAIN"); + + Assertions.assertThrows(WorkbasketNotFoundException.class, () -> + workbasketService.getWorkbasket("INVALID_KEY", "INVALID_DOMAIN")); } - @Test(expected = NotAuthorizedException.class) - public void testGetByIdNotAuthorized() - throws NotAuthorizedException, WorkbasketNotFoundException { + @Test + public void testGetByIdNotAuthorized() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - workbasketService.getWorkbasket("WBI:100000000000000000000000000000000001"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService.getWorkbasket("WBI:100000000000000000000000000000000001")); } - @Test(expected = NotAuthorizedException.class) - public void testGetByKeyDomainNotAuthorized() - throws NotAuthorizedException, WorkbasketNotFoundException { + @Test + public void testGetByKeyDomainNotAuthorized() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - workbasketService.getWorkbasket("GPK_KSC", "DOMAIN_A"); + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService.getWorkbasket("GPK_KSC", "DOMAIN_A")); } @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = WorkbasketNotFoundException.class) - public void testGetWorkbasketByIdNotExisting() - throws NotAuthorizedException, WorkbasketNotFoundException { + @Test + public void testGetWorkbasketByIdNotExisting() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - workbasketService.getWorkbasket("NOT EXISTING ID"); + Assertions.assertThrows(WorkbasketNotFoundException.class, () -> + workbasketService.getWorkbasket("NOT EXISTING ID")); } } 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 ec601137b..593cbe6a3 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -3,15 +3,14 @@ package acceptance.workbasket; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import static pro.taskana.WorkbasketQueryColumnName.NAME; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BaseQuery.SortDirection; @@ -22,13 +21,13 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.WorkbasketType; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query workbasket by permission" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryWorkbasketAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; @@ -432,14 +431,14 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryWorkbasketByDomainLike() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .domainLike("DOMAIN_%").orderByDomain(asc).list(); + .domainLike("DOMAIN_%").orderByDomain(asc).list(); ArrayList expectedIds = new ArrayList( - Arrays.asList("WBI:100000000000000000000000000000000001", "WBI:100000000000000000000000000000000002", - "WBI:100000000000000000000000000000000004", "WBI:100000000000000000000000000000000005", - "WBI:100000000000000000000000000000000006", "WBI:100000000000000000000000000000000007", - "WBI:100000000000000000000000000000000008", "WBI:100000000000000000000000000000000009", - "WBI:100000000000000000000000000000000010", "WBI:100000000000000000000000000000000012")); + Arrays.asList("WBI:100000000000000000000000000000000001", "WBI:100000000000000000000000000000000002", + "WBI:100000000000000000000000000000000004", "WBI:100000000000000000000000000000000005", + "WBI:100000000000000000000000000000000006", "WBI:100000000000000000000000000000000007", + "WBI:100000000000000000000000000000000008", "WBI:100000000000000000000000000000000009", + "WBI:100000000000000000000000000000000010", "WBI:100000000000000000000000000000000012")); assertEquals(10L, results.size()); for (String id : expectedIds) { assertTrue(results.stream().anyMatch(wbSummary -> wbSummary.getId().equals(id))); @@ -453,7 +452,7 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryWorkbasketByOwnerInOrderByDomainDesc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .ownerIn("owner0815").orderByDomain(desc).list(); + .ownerIn("owner0815").orderByDomain(desc).list(); assertEquals(2L, results.size()); assertEquals("WBI:100000000000000000000000000000000015", results.get(0).getId()); @@ -467,7 +466,7 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForCustom1In() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .custom1In("ABCQVW").list(); + .custom1In("ABCQVW").list(); assertEquals(1, results.size()); assertEquals("WBI:100000000000000000000000000000000001", results.get(0).getId()); @@ -479,8 +478,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForCustom1Like() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .custom1Like("custo%") - .list(); + .custom1Like("custo%") + .list(); assertEquals(2, results.size()); } @@ -490,8 +489,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForCustom2In() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .custom2In("cust2", "custom2") - .list(); + .custom2In("cust2", "custom2") + .list(); assertEquals(3, results.size()); } @@ -501,8 +500,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForCustom2Like() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .custom2Like("cusTo%") - .list(); + .custom2Like("cusTo%") + .list(); assertEquals(3, results.size()); } @@ -512,8 +511,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForCustom3In() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .custom3In("custom3") - .list(); + .custom3In("custom3") + .list(); assertEquals(2, results.size()); } @@ -523,8 +522,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForCustom3Like() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .custom3Like("cu%") - .list(); + .custom3Like("cu%") + .list(); assertEquals(3, results.size()); } @@ -534,8 +533,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForCustom4In() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .custom4In("custom4", "team") - .list(); + .custom4In("custom4", "team") + .list(); assertEquals(3, results.size()); } @@ -545,8 +544,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForCustom4Like() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .custom4Like("%u%") - .list(); + .custom4Like("%u%") + .list(); assertEquals(5, results.size()); } @@ -556,8 +555,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrgLevl1In() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orgLevel1In("orgl1", "") - .list(); + .orgLevel1In("orgl1", "") + .list(); assertEquals(24, results.size()); } @@ -567,8 +566,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrgLevel1Like() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orgLevel1Like("%1") - .list(); + .orgLevel1Like("%1") + .list(); assertEquals(2, results.size()); } @@ -578,8 +577,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrgLevel2In() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orgLevel2In("abteilung") - .list(); + .orgLevel2In("abteilung") + .list(); assertEquals(1, results.size()); } @@ -589,8 +588,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrgLevel2Like() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orgLevel2Like("ab%") - .list(); + .orgLevel2Like("ab%") + .list(); assertEquals(1, results.size()); } @@ -600,8 +599,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrgLevel3In() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orgLevel3In("orgl3") - .list(); + .orgLevel3In("orgl3") + .list(); assertEquals(2, results.size()); } @@ -611,8 +610,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrgLevel3Like() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orgLevel3Like("org%") - .list(); + .orgLevel3Like("org%") + .list(); assertEquals(2, results.size()); } @@ -622,8 +621,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrgLevel4In() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orgLevel4In("team", "orgl4") - .list(); + .orgLevel4In("team", "orgl4") + .list(); assertEquals(2, results.size()); } @@ -633,8 +632,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrgLevel4Like() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orgLevel4Like("%") - .list(); + .orgLevel4Like("%") + .list(); assertEquals(25, results.size()); } @@ -644,8 +643,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrderByOrgLevel1Desc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orderByOrgLevel1(desc) - .list(); + .orderByOrgLevel1(desc) + .list(); assertEquals("WBI:100000000000000000000000000000000007", results.get(0).getId()); } @@ -655,8 +654,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrderByOrgLevel2Asc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orderByOrgLevel2(asc) - .list(); + .orderByOrgLevel2(asc) + .list(); assertEquals("WBI:100000000000000000000000000000000007", results.get(results.size() - 3).getId()); } @@ -666,8 +665,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrderByOrgLevel3Desc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orderByOrgLevel3(desc) - .list(); + .orderByOrgLevel3(desc) + .list(); assertEquals("WBI:100000000000000000000000000000000007", results.get(0).getId()); } @@ -677,8 +676,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrderByOrgLevel4Asc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orderByOrgLevel4(asc) - .list(); + .orderByOrgLevel4(asc) + .list(); assertEquals("WBI:100000000000000000000000000000000012", results.get(results.size() - 3).getId()); } @@ -688,8 +687,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrderByCustom1Asc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orderByCustom1(asc) - .list(); + .orderByCustom1(asc) + .list(); assertEquals("WBI:100000000000000000000000000000000015", results.get(results.size() - 4).getId()); } @@ -699,8 +698,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrderByCustom2Desc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orderByCustom2(desc) - .list(); + .orderByCustom2(desc) + .list(); assertEquals("WBI:100000000000000000000000000000000014", results.get(0).getId()); } @@ -710,8 +709,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrderByCustom3Asc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orderByCustom3(asc) - .list(); + .orderByCustom3(asc) + .list(); assertEquals("WBI:100000000000000000000000000000000015", results.get(results.size() - 4).getId()); } @@ -721,8 +720,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest { public void testQueryForOrderByCustom4Desc() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); List results = workbasketService.createWorkbasketQuery() - .orderByCustom4(desc) - .list(); + .orderByCustom4(desc) + .list(); assertEquals("WBI:100000000000000000000000000000000006", results.get(0).getId()); } 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 f6fecac52..e857d2e6c 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java @@ -3,18 +3,17 @@ package acceptance.workbasket; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import static pro.taskana.AccessItemQueryColumnName.WORKBASKET_ID; import static pro.taskana.AccessItemQueryColumnName.ACCESS_ID; +import static pro.taskana.AccessItemQueryColumnName.WORKBASKET_ID; import static pro.taskana.AccessItemQueryColumnName.WORKBASKET_KEY; import java.util.Arrays; import java.util.List; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BaseQuery.SortDirection; @@ -22,13 +21,13 @@ import pro.taskana.WorkbasketAccessItem; import pro.taskana.WorkbasketAccessItemQuery; import pro.taskana.WorkbasketService; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query access items for workbaskets" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest { public QueryWorkbasketAccessItemsAccTest() { @@ -75,14 +74,15 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest { @WithAccessId( userName = "dummy") - @Test(expected = NotAuthorizedException.class) + @Test public void testQueryAccessItemsForAccessIdsNotAuthorized() throws NotAuthorizedException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - workbasketService.createWorkbasketAccessItemQuery() - .accessIdIn("user_1_1", "group_1") - .list(); - fail("NotAuthorizedException was expected."); + + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService.createWorkbasketAccessItemQuery() + .accessIdIn("user_1_1", "group_1") + .list()); } @WithAccessId( 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 93776b1c5..75a606a73 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -1,14 +1,13 @@ package acceptance.workbasket; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BaseQuery.SortDirection; @@ -18,13 +17,13 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.SystemException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query workbasket by permission" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; @@ -50,14 +49,14 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { @WithAccessId( userName = "dummy") - @Test(expected = NotAuthorizedException.class) - public void testQueryAllTransferTargetsForUserNotAuthorized() - throws NotAuthorizedException, InvalidArgumentException { + @Test + public void testQueryAllTransferTargetsForUserNotAuthorized() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - workbasketService.createWorkbasketQuery() - .accessIdsHavePermission(WorkbasketPermission.APPEND, "user_1_1") - .list(); - fail("NotAuthorizedException was expected"); + + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService.createWorkbasketQuery() + .accessIdsHavePermission(WorkbasketPermission.APPEND, "user_1_1") + .list()); } @WithAccessId( 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 dfbadde35..7a785ffb8 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java @@ -5,21 +5,22 @@ import static org.junit.Assert.assertThat; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.TaskanaRuntimeException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "query classifications with pagination" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { public QueryWorkbasketsWithPaginationAccTest() { @@ -152,17 +153,19 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { * Testcase only for DB2 users, because H2 doesn´t throw a Exception when the offset is set to high.
* Using DB2 should throw a unchecked RuntimeException for a offset which is out of bounds. */ - @Ignore - @Test(expected = TaskanaRuntimeException.class) + @Disabled + @Test public void testPaginationThrowingExceptionWhenPageOutOfBounds() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); // entrypoint set outside result amount int pageNumber = 6; int pageSize = 10; - workbasketService.createWorkbasketQuery() - .domainIn("DOMAIN_A") - .listPage(pageNumber, pageSize); + + Assertions.assertThrows(TaskanaRuntimeException.class, () -> + workbasketService.createWorkbasketQuery() + .domainIn("DOMAIN_A") + .listPage(pageNumber, pageSize)); } @WithAccessId( 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 e40e44646..9a487b69b 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java @@ -3,8 +3,9 @@ package acceptance.workbasket; import java.time.Instant; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.Workbasket; @@ -12,13 +13,13 @@ import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketType; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "update workbasket" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class UpdateWorkbasketAccTest extends AbstractAccTest { public UpdateWorkbasketAccTest() { @@ -60,14 +61,16 @@ public class UpdateWorkbasketAccTest extends AbstractAccTest { @WithAccessId( userName = "user_1_1", groupNames = {"group_1"}) - @Test(expected = NotAuthorizedException.class) + @Test public void testCheckAuthorizationToUpdateWorkbasket() throws NotAuthorizedException, WorkbasketNotFoundException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); Workbasket workbasket = workbasketService.getWorkbasket("USER_1_1", "DOMAIN_A"); workbasket.setName("new name"); - workbasketService.updateWorkbasket(workbasket); + + Assertions.assertThrows(NotAuthorizedException.class, () -> + workbasketService.updateWorkbasket(workbasket)); } } 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 10cd65b5d..0035cd475 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -12,8 +12,8 @@ import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.KeyDomain; @@ -30,13 +30,13 @@ import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.WorkbasketAccessItemImpl; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for all "update workbasket" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { public UpdateWorkbasketAuthorizationsAccTest() { 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 bcef7f409..9e2f364c6 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java @@ -5,20 +5,20 @@ import static org.junit.Assert.assertThat; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import acceptance.AbstractAccTest; import pro.taskana.BaseQuery.SortDirection; import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; -import pro.taskana.security.JAASRunner; +import pro.taskana.security.JAASExtension; /** * Acceptance test for all "query classifications with pagination" scenarios. */ -@RunWith(JAASRunner.class) +@ExtendWith(JAASExtension.class) public class WorkbasketQueryWithOrderedPaginationAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; @@ -28,7 +28,7 @@ public class WorkbasketQueryWithOrderedPaginationAccTest extends AbstractAccTest super(); } - @Ignore + @Disabled @Test public void testGetFirstPageOfTaskQueryWithOffset() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -49,7 +49,7 @@ public class WorkbasketQueryWithOrderedPaginationAccTest extends AbstractAccTest assertThat(results.get(4).getKey(), equalTo("TEAMLEAD_2")); } - @Ignore + @Disabled @Test public void testGetSecondPageOfTaskQueryWithOffset() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java b/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java new file mode 100644 index 000000000..e0e8897ab --- /dev/null +++ b/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java @@ -0,0 +1,53 @@ +package pro.taskana.security; + +import java.lang.reflect.Method; +import java.security.Principal; +import java.security.PrivilegedExceptionAction; +import java.util.ArrayList; +import java.util.List; + +import javax.security.auth.Subject; + +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.InvocationInterceptor; +import org.junit.jupiter.api.extension.ReflectiveInvocationContext; + +/** + * Runner for integration tests that enables JAAS subject. + */ +public class JAASExtension implements InvocationInterceptor { + + @Override + public void interceptTestMethod(Invocation invocation, + ReflectiveInvocationContext invocationContext, + ExtensionContext extensionContext) throws Throwable { + + //check for access + Subject subject = new Subject(); + List principalList = new ArrayList<>(); + + WithAccessId withAccessId = invocationContext.getExecutable().getAnnotation(WithAccessId.class); + if (withAccessId != null) { + if (withAccessId.userName() != null) { + principalList.add(new UserPrincipal(withAccessId.userName())); + } + for (String groupName : withAccessId.groupNames()) { + if (groupName != null) { + principalList.add(new GroupPrincipal(groupName)); + } + } + } + subject.getPrincipals().addAll(principalList); + Subject.doAs(subject, (PrivilegedExceptionAction) () -> { + + try { + invocation.proceed(); + } catch (Throwable e) { + throw new Exception(e); + } + return null; + }); + + } + +} diff --git a/lib/taskana-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml index d5a40671e..8da5862db 100644 --- a/lib/taskana-spring-example/pom.xml +++ b/lib/taskana-spring-example/pom.xml @@ -36,9 +36,21 @@ - junit - junit - ${version.junit} + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} test diff --git a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java index 6a0b0cd5f..9d771595f 100644 --- a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java +++ b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java @@ -18,9 +18,9 @@ import java.util.Optional; import javax.sql.DataSource; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Import; import org.springframework.http.ResponseEntity; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.LoggingEvent; @@ -54,12 +54,12 @@ import pro.taskana.transaction.TaskanaTransactionProvider; /** * */ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = TaskanaConfigTestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @ActiveProfiles({"inmemorydb", "dev"}) @Import({TransactionalJobsConfiguration.class}) -public class TaskanaTransactionIntTest { +class TaskanaTransactionIntTest { private static final int POOL_TIME_TO_WAIT = 50; @Autowired @@ -88,8 +88,8 @@ public class TaskanaTransactionIntTest { return objRef; } - @Before - public void before() { + @BeforeEach + void before() { JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.execute("DELETE FROM TASK"); jdbcTemplate.execute("DELETE FROM WORKBASKET"); @@ -97,13 +97,13 @@ public class TaskanaTransactionIntTest { } @Test - public void testTaskanaSchema() { + void testTaskanaSchema() { ResponseEntity responseEntity = restTemplate.getForEntity("/schema", String.class); assertThat(responseEntity.getBody(), is("TASKANA")); } @Test - public void testTransaction() { + void testTransaction() { assertBefore(0, 0); ResponseEntity responseEntity = restTemplate.getForEntity("/transaction", String.class); @@ -114,7 +114,7 @@ public class TaskanaTransactionIntTest { } @Test - public void testTransactionRollback() { + void testTransactionRollback() { assertBefore(0, 0); ResponseEntity responseEntity = restTemplate.getForEntity("/transaction?rollback={rollback}", @@ -126,7 +126,7 @@ public class TaskanaTransactionIntTest { } @Test - public void testTransactionCombined() { + void testTransactionCombined() { assertBefore(0, 0); ResponseEntity responseEntity = restTemplate.getForEntity("/transaction-many", String.class); @@ -137,7 +137,7 @@ public class TaskanaTransactionIntTest { } @Test - public void testTransactionCombinedRollback() { + void testTransactionCombinedRollback() { assertBefore(0, 0); ResponseEntity responseEntity = restTemplate.getForEntity("/transaction-many?rollback={rollback}", @@ -149,7 +149,7 @@ public class TaskanaTransactionIntTest { } @Test - public void testTransactionCustomdb() { + void testTransactionCustomdb() { assertBefore(0, 0); ResponseEntity responseEntity = restTemplate.getForEntity("/customdb", String.class); @@ -162,7 +162,7 @@ public class TaskanaTransactionIntTest { } @Test - public void testTransactionCustomdbRollback() { + void testTransactionCustomdbRollback() { assertBefore(0, 0); ResponseEntity responseEntity = restTemplate.getForEntity("/customdb?rollback={rollback}", @@ -175,7 +175,7 @@ public class TaskanaTransactionIntTest { } @Test - public void testTransactionCustomDbWithSchemaSetToTaskana() + void testTransactionCustomDbWithSchemaSetToTaskana() throws SQLException, NotAuthorizedException, WorkbasketNotFoundException, DomainNotFoundException, InvalidWorkbasketException, WorkbasketAlreadyExistException { @@ -196,7 +196,7 @@ public class TaskanaTransactionIntTest { } @Test - public void testWorkbasketCleanupJobTransaction() { + void testWorkbasketCleanupJobTransaction() { try { ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory .getLogger(WorkbasketCleanupJob.class); diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml index e2c70fd7c..05f3f6e6b 100644 --- a/lib/taskana-spring/pom.xml +++ b/lib/taskana-spring/pom.xml @@ -55,6 +55,24 @@ ${version.spring.boot} test + + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} + test + com.h2database h2 diff --git a/pom.xml b/pom.xml index 0c20fcf18..8c643708c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 1.1.10.Final - 4.12 + 5.5.2 2.8.1 2.8.47 1.7.1 @@ -266,6 +266,12 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.maven.surefire} + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/rest/taskana-rest-spring-test/pom.xml b/rest/taskana-rest-spring-test/pom.xml index 0c582e66c..b42f6c115 100644 --- a/rest/taskana-rest-spring-test/pom.xml +++ b/rest/taskana-rest-spring-test/pom.xml @@ -70,6 +70,24 @@ spring-restdocs-mockmvc test + + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} + test + diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/TaskanaSpringBootTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/TaskanaSpringBootTest.java new file mode 100644 index 000000000..216fd80c7 --- /dev/null +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/TaskanaSpringBootTest.java @@ -0,0 +1,27 @@ +package pro.taskana; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import pro.taskana.rest.RestConfiguration; + +/** + * Use this annotation to test with a spring context and a standardized configuration. + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Inherited +@ActiveProfiles({"test"}) +@ExtendWith(SpringExtension.class) +@SpringBootTest(classes = RestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public @interface TaskanaSpringBootTest { + +} diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/AbstractPagingControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/AbstractPagingControllerRestDocumentation.java index fa2e3254e..a35925e18 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/AbstractPagingControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/AbstractPagingControllerRestDocumentation.java @@ -6,8 +6,8 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.subsecti import java.util.HashMap; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -16,14 +16,14 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; /** * Generate Rest Docu for AbstractPagingController. */ -public class AbstractPagingControllerRestDocumentation extends BaseRestDocumentation { +class AbstractPagingControllerRestDocumentation extends BaseRestDocumentation { private HashMap pagingFieldDescriptionsMap = new HashMap(); private FieldDescriptor[] pagingFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { pagingFieldDescriptionsMap.put("page", "Contains metainfo if there are multiple pages, else it is null"); pagingFieldDescriptionsMap.put("page.size", "Number of items per page"); @@ -53,7 +53,7 @@ public class AbstractPagingControllerRestDocumentation extends BaseRestDocumenta } @Test - public void commonSummaryResourceFieldsDocTest() throws Exception { + void commonSummaryResourceFieldsDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/classifications?page=2&page-size=5") .header("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x")) diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java index 0068d7b8a..f448a7e64 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java @@ -1,56 +1,44 @@ package pro.taskana.doc.api; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; -import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration; import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest; import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse; import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint; -import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.restdocs.JUnitRestDocumentation; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import pro.taskana.rest.RestConfiguration; +import pro.taskana.TaskanaSpringBootTest; /** * Base class for Rest Documentation tests. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) + +@AutoConfigureMockMvc +@AutoConfigureRestDocs +@TaskanaSpringBootTest public abstract class BaseRestDocumentation { - @Rule - public JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation(); @LocalServerPort protected int port; + @Autowired protected WebApplicationContext context; + @Autowired protected MockMvc mockMvc; - @Before + @BeforeEach public void setUpMockMvc() { document("{methodName}", preprocessRequest(prettyPrint()), preprocessResponse(prettyPrint())); - this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context) - .apply(springSecurity()) - .apply(documentationConfiguration(this.restDocumentation) - .operationPreprocessors() - .withResponseDefaults(prettyPrint()) - .withRequestDefaults(prettyPrint())) - .build(); - } } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/ClassificationControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/ClassificationControllerRestDocumentation.java index 05a4e997d..a849564d4 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/ClassificationControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/ClassificationControllerRestDocumentation.java @@ -12,8 +12,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.HashMap; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -23,7 +23,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; /** * Generate REST Dokumentation for ClassificationController. */ -public class ClassificationControllerRestDocumentation extends BaseRestDocumentation { +class ClassificationControllerRestDocumentation extends BaseRestDocumentation { private HashMap classificationFieldDescriptionsMap = new HashMap(); @@ -32,8 +32,8 @@ public class ClassificationControllerRestDocumentation extends BaseRestDocumenta private FieldDescriptor[] classificationSubsetFieldDescriptors; private FieldDescriptor[] createClassificationFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { classificationFieldDescriptionsMap.put("classificationId", "Unique Id"); classificationFieldDescriptionsMap.put("key", @@ -198,7 +198,7 @@ public class ClassificationControllerRestDocumentation extends BaseRestDocumenta } @Test - public void getAllClassificationsDocTest() throws Exception { + void getAllClassificationsDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/classifications?domain=DOMAIN_B") .accept("application/hal+json") @@ -209,7 +209,7 @@ public class ClassificationControllerRestDocumentation extends BaseRestDocumenta } @Test - public void getSpecificClassificationDocTest() throws Exception { + void getSpecificClassificationDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/classifications/CLI:100000000000000000000000000000000009") .header("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x")) @@ -219,7 +219,7 @@ public class ClassificationControllerRestDocumentation extends BaseRestDocumenta } @Test - public void classificationSubsetDocTest() throws Exception { + void classificationSubsetDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/classifications/CLI:100000000000000000000000000000000009") .header("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x")) @@ -229,7 +229,7 @@ public class ClassificationControllerRestDocumentation extends BaseRestDocumenta } @Test - public void createAndDeleteClassificationDocTest() throws Exception { + void createAndDeleteClassificationDocTest() throws Exception { MvcResult result = this.mockMvc.perform(RestDocumentationRequestBuilders .post("http://127.0.0.1:" + port + "/api/v1/classifications") .contentType("application/hal+json") @@ -252,7 +252,7 @@ public class ClassificationControllerRestDocumentation extends BaseRestDocumenta } @Test - public void updateClassificationDocTest() throws Exception { + void updateClassificationDocTest() throws Exception { URL url = new URL( "http://127.0.0.1:" + port + "/api/v1/classifications/CLI:100000000000000000000000000000000009"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/ClassificationDefinitionControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/ClassificationDefinitionControllerRestDocumentation.java index 183672dd8..fdb054d0e 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/ClassificationDefinitionControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/ClassificationDefinitionControllerRestDocumentation.java @@ -7,8 +7,8 @@ import static org.springframework.restdocs.request.RequestDocumentation.partWith import static org.springframework.restdocs.request.RequestDocumentation.requestParts; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -17,12 +17,12 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; /** * Test ClassificationDefinitionControlller. */ -public class ClassificationDefinitionControllerRestDocumentation extends BaseRestDocumentation { +class ClassificationDefinitionControllerRestDocumentation extends BaseRestDocumentation { private FieldDescriptor[] classificationDefinitionsFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { classificationDefinitionsFieldDescriptors = new FieldDescriptor[] { subsectionWithPath("[]").description("An array of <>") @@ -30,7 +30,7 @@ public class ClassificationDefinitionControllerRestDocumentation extends BaseRes } @Test - public void exportAllClassificationDefinitions() throws Exception { + void exportAllClassificationDefinitions() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/classification-definitions") .accept("application/json") @@ -41,7 +41,7 @@ public class ClassificationDefinitionControllerRestDocumentation extends BaseRes } @Test - public void importClassificationDefinitions() throws Exception { + void importClassificationDefinitions() throws Exception { String definitionString = "[{\"key\":\"Key0815\", \"domain\":\"DOMAIN_B\"}]"; this.mockMvc.perform(multipart("http://127.0.0.1:" + port + "/api/v1/classification-definitions") diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/CommonRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/CommonRestDocumentation.java index 179c56087..c3a767c51 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/CommonRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/CommonRestDocumentation.java @@ -5,8 +5,8 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.response import java.util.HashMap; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -16,14 +16,14 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; * Generate common REST Documentation. * */ -public class CommonRestDocumentation extends BaseRestDocumentation { +class CommonRestDocumentation extends BaseRestDocumentation { private HashMap selfLinkFieldDescriptionsMap = new HashMap(); private FieldDescriptor[] selfLinkFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { selfLinkFieldDescriptionsMap.put("_links", "Links section"); selfLinkFieldDescriptionsMap.put("_links.self", "Link to self"); @@ -61,7 +61,7 @@ public class CommonRestDocumentation extends BaseRestDocumentation { } @Test - public void commonFieldsDocTest() throws Exception { + void commonFieldsDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/classifications/CLI:100000000000000000000000000000000009") .header("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x")) diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/MonitorControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/MonitorControllerRestDocumentation.java index 0b8c1b577..17e9d643c 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/MonitorControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/MonitorControllerRestDocumentation.java @@ -4,8 +4,8 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWit import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; import static org.springframework.restdocs.payload.PayloadDocumentation.subsectionWithPath; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -15,12 +15,12 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; * Generate REST docu for the monitor controller. * */ -public class MonitorControllerRestDocumentation extends BaseRestDocumentation { +class MonitorControllerRestDocumentation extends BaseRestDocumentation { private FieldDescriptor[] taskReportFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { taskReportFieldDescriptors = new FieldDescriptor[] { fieldWithPath("meta").description("Object holding metainfo on the report"), @@ -44,7 +44,7 @@ public class MonitorControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void getTaskStatusReport() throws Exception { + void getTaskStatusReport() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/monitor/tasks-status-report") .header("Authorization", "Basic YWRtaW46YWRtaW4=")) @@ -54,7 +54,7 @@ public class MonitorControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void tasksWorkbasketReport() throws Exception { + void tasksWorkbasketReport() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/monitor/tasks-workbasket-report?daysInPast=4&states=READY,CLAIMED,COMPLETED") @@ -66,7 +66,7 @@ public class MonitorControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void tasksClassificationReport() throws Exception { + void tasksClassificationReport() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/monitor/tasks-classification-report") .accept("application/hal+json") @@ -77,7 +77,7 @@ public class MonitorControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void getTimestampReport() throws Exception { + void getTimestampReport() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/monitor/timestamp-report") .accept("application/hal+json") diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java index 28d2bce55..8f89d70ed 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java @@ -12,8 +12,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.HashMap; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -23,7 +23,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; /** * Generate REST Documentation for the TaskController. */ -public class TaskControllerRestDocumentation extends BaseRestDocumentation { +class TaskControllerRestDocumentation extends BaseRestDocumentation { private HashMap taskFieldDescriptionsMap = new HashMap(); @@ -32,8 +32,8 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { private FieldDescriptor[] taskSubsetFieldDescriptors; private FieldDescriptor[] createTaskFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { taskFieldDescriptionsMap.put("taskId", "Unique ID"); taskFieldDescriptionsMap.put("externalId", @@ -288,7 +288,7 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void getAllTasksDocTest() throws Exception { + void getAllTasksDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/tasks?por.type=VNR&por.value=22334455") .accept("application/hal+json") @@ -299,7 +299,7 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void getSpecificTaskDocTest() throws Exception { + void getSpecificTaskDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/tasks/TKI:100000000000000000000000000000000000") .accept("application/hal+json") @@ -310,7 +310,7 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void taskSubSetDocTest() throws Exception { + void taskSubSetDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/tasks/TKI:100000000000000000000000000000000000") .accept("application/hal+json") @@ -321,7 +321,7 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void updateTaskDocTest() throws Exception { + void updateTaskDocTest() throws Exception { URL url = new URL("http://127.0.0.1:" + port + "/api/v1/tasks/TKI:100000000000000000000000000000000000"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("GET"); @@ -351,7 +351,7 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void createAndDeleteTaskDocTest() throws Exception { + void createAndDeleteTaskDocTest() throws Exception { MvcResult result = this.mockMvc.perform(RestDocumentationRequestBuilders .post("http://127.0.0.1:" + port + "/api/v1/tasks") @@ -377,7 +377,7 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void claimTaskDocTest() throws Exception { + void claimTaskDocTest() throws Exception { MvcResult result = this.mockMvc.perform(RestDocumentationRequestBuilders .post("http://127.0.0.1:" + port + "/api/v1/tasks") @@ -410,7 +410,7 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void completeTaskDocTest() throws Exception { + void completeTaskDocTest() throws Exception { MvcResult result = this.mockMvc.perform(RestDocumentationRequestBuilders .post("http://127.0.0.1:" + port + "/api/v1/tasks") .contentType("application/hal+json") @@ -442,7 +442,7 @@ public class TaskControllerRestDocumentation extends BaseRestDocumentation { } @Test - public void transferTaskDocTest() throws Exception { + void transferTaskDocTest() throws Exception { MvcResult result = this.mockMvc.perform(RestDocumentationRequestBuilders .post("http://127.0.0.1:" + port + "/api/v1/tasks") .contentType("application/hal+json") diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/TaskanaEngineControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/TaskanaEngineControllerRestDocumentation.java index e4a1ed800..70851ad85 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/TaskanaEngineControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/TaskanaEngineControllerRestDocumentation.java @@ -3,8 +3,8 @@ package pro.taskana.doc.api; import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -14,15 +14,15 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; * Generate REST Docu for the TaskanaEngineController. * */ -public class TaskanaEngineControllerRestDocumentation extends BaseRestDocumentation { +class TaskanaEngineControllerRestDocumentation extends BaseRestDocumentation { private FieldDescriptor[] allDomainsFieldDescriptors; private FieldDescriptor[] allClassificationCategoriesFieldDescriptors; private FieldDescriptor[] allClassificationTypesFieldDescriptors; private FieldDescriptor[] currentUserInfoFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { allDomainsFieldDescriptors = new FieldDescriptor[] { fieldWithPath("[]").description("An array with the domain-names as strings") @@ -44,7 +44,7 @@ public class TaskanaEngineControllerRestDocumentation extends BaseRestDocumentat } @Test - public void getAllDomainsDocTest() throws Exception { + void getAllDomainsDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/domains") .accept("application/json") @@ -55,7 +55,7 @@ public class TaskanaEngineControllerRestDocumentation extends BaseRestDocumentat } @Test - public void getAllClassificationCategoriesDocTest() throws Exception { + void getAllClassificationCategoriesDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/classification-categories") .accept("application/json") @@ -66,7 +66,7 @@ public class TaskanaEngineControllerRestDocumentation extends BaseRestDocumentat } @Test - public void getAllClassificationTypesDocTest() throws Exception { + void getAllClassificationTypesDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/classification-types") .accept("application/json") @@ -77,7 +77,7 @@ public class TaskanaEngineControllerRestDocumentation extends BaseRestDocumentat } @Test - public void getCurrentUserInfo() throws Exception { + void getCurrentUserInfo() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/current-user-info") .accept("application/json") @@ -88,7 +88,7 @@ public class TaskanaEngineControllerRestDocumentation extends BaseRestDocumentat } @Test - public void getHistoryProviderIsEnabled() throws Exception { + void getHistoryProviderIsEnabled() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/history-provider-enabled") .accept("application/json") diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketAccessItemControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketAccessItemControllerRestDocumentation.java index d85d332d7..974d812ad 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketAccessItemControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketAccessItemControllerRestDocumentation.java @@ -5,26 +5,24 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.response import java.util.HashMap; -import org.junit.Before; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; /** * Generate REST Docu for the WorkbasketAccessItemController. */ -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class WorkbasketAccessItemControllerRestDocumentation extends BaseRestDocumentation { +class WorkbasketAccessItemControllerRestDocumentation extends BaseRestDocumentation { private HashMap accessItemFieldDescriptionsMap = new HashMap(); private FieldDescriptor[] accessItemFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { accessItemFieldDescriptionsMap.put("accessItems.accessItemId", "Unique ID"); accessItemFieldDescriptionsMap.put("accessItems.workbasketId", "The workbasket id"); @@ -108,7 +106,7 @@ public class WorkbasketAccessItemControllerRestDocumentation extends BaseRestDoc } @Test - public void test01_getWorkbasketAccessItemsDocTest() throws Exception { + void getWorkbasketAccessItemsDocTest() throws Exception { this.mockMvc .perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port @@ -121,7 +119,8 @@ public class WorkbasketAccessItemControllerRestDocumentation extends BaseRestDoc } @Test - public void test02_removeWorkbasketAccessItemsDocTest() throws Exception { + @DirtiesContext + void removeWorkbasketAccessItemsDocTest() throws Exception { this.mockMvc .perform(RestDocumentationRequestBuilders .delete("http://127.0.0.1:" + port + "/api/v1/workbasket-access-items/?access-id=user_2_2") diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java index c1633880f..f804776e7 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java @@ -12,8 +12,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.HashMap; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -22,7 +22,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; /** * Generate REST Documentatioon for the WorkbasketController. */ -public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation { +class WorkbasketControllerRestDocumentation extends BaseRestDocumentation { // HashMaps to store the field descriptions centrally for multiple uses private HashMap workbasketFieldDescriptionsMap = new HashMap(); @@ -36,8 +36,8 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation private FieldDescriptor[] allDistributionTargetsFieldDescriptors; private FieldDescriptor[] createWorkbasketFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { workbasketFieldDescriptionsMap.put("workbasketId", "Unique ID"); workbasketFieldDescriptionsMap.put("key", ""); @@ -272,7 +272,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void getAllWorkbasketsDocTest() throws Exception { + void getAllWorkbasketsDocTest() throws Exception { this.mockMvc.perform( RestDocumentationRequestBuilders.get("http://127.0.0.1:" + port + "/api/v1/workbaskets?type=PERSONAL") .accept("application/hal+json") @@ -283,7 +283,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void getSpecificWorkbasketDocTest() throws Exception { + void getSpecificWorkbasketDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders.get( "http://127.0.0.1:" + port + "/api/v1/workbaskets/WBI:100000000000000000000000000000000001") .accept("application/hal+json") @@ -294,7 +294,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void getAllWorkbasketAccessItemsDocTest() throws Exception { + void getAllWorkbasketAccessItemsDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders.get("http://127.0.0.1:" + port + "/api/v1/workbaskets/WBI:100000000000000000000000000000000001/workbasketAccessItems") .accept("application/hal+json") @@ -305,7 +305,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void workbasketSubsetDocTest() throws Exception { + void workbasketSubsetDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders.get( "http://127.0.0.1:" + port + "/api/v1/workbaskets/WBI:100000000000000000000000000000000001") .accept("application/hal+json") @@ -316,7 +316,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void removeWorkbasketAsDistributionTargetDocTest() throws Exception { + void removeWorkbasketAsDistributionTargetDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders.delete("http://127.0.0.1:" + port + "/api/v1/workbaskets/distribution-targets/WBI:100000000000000000000000000000000007") .header("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x")) @@ -325,7 +325,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void getAllWorkbasketDistributionTargets() throws Exception { + void getAllWorkbasketDistributionTargets() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders.get("http://127.0.0.1:" + port + "/api/v1/workbaskets/WBI:100000000000000000000000000000000002/distribution-targets") .header("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x")) @@ -335,7 +335,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void createWorkbasketDocTest() throws Exception { + void createWorkbasketDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders.post("http://127.0.0.1:" + port + "/api/v1/workbaskets") .contentType("application/json") .header("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x") @@ -351,7 +351,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void updateWorkbasketDocTest() throws Exception { + void updateWorkbasketDocTest() throws Exception { URL url = new URL("http://127.0.0.1:" + port + "/api/v1/workbaskets/WBI:100000000000000000000000000000000002"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("GET"); @@ -382,7 +382,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void markWorkbasketForDeletionDocTest() throws Exception { + void markWorkbasketForDeletionDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders.delete( "http://127.0.0.1:" + port + "/api/v1/workbaskets/" + "WBI:100000000000000000000000000000000005") .header("Authorization", "Basic YWRtaW46YWRtaW4=")) @@ -391,7 +391,7 @@ public class WorkbasketControllerRestDocumentation extends BaseRestDocumentation } @Test - public void accessItemDocTest() throws Exception { + void accessItemDocTest() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders.get("http://127.0.0.1:" + port + "/api/v1/workbaskets/WBI:100000000000000000000000000000000001/workbasketAccessItems") .accept("application/hal+json") diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketDefinitionControllerRestDocumentation.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketDefinitionControllerRestDocumentation.java index 34ad4cdd4..1395010f5 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketDefinitionControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/doc/api/WorkbasketDefinitionControllerRestDocumentation.java @@ -7,8 +7,8 @@ import static org.springframework.restdocs.request.RequestDocumentation.partWith import static org.springframework.restdocs.request.RequestDocumentation.requestParts; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.FieldDescriptor; @@ -17,12 +17,12 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; /** * Generate Rest Documentation for Workbasket Definitions. */ -public class WorkbasketDefinitionControllerRestDocumentation extends BaseRestDocumentation { +class WorkbasketDefinitionControllerRestDocumentation extends BaseRestDocumentation { private FieldDescriptor[] workbasketDefinitionsFieldDescriptors; - @Before - public void setUp() { + @BeforeEach + void setUp() { workbasketDefinitionsFieldDescriptors = new FieldDescriptor[] { subsectionWithPath("[]").description("An array of <>") @@ -30,7 +30,7 @@ public class WorkbasketDefinitionControllerRestDocumentation extends BaseRestDoc } @Test - public void exportAllWorkbasketDefinitions() throws Exception { + void exportAllWorkbasketDefinitions() throws Exception { this.mockMvc.perform(RestDocumentationRequestBuilders .get("http://127.0.0.1:" + port + "/api/v1/workbasket-definitions") .accept("application/json") @@ -41,7 +41,7 @@ public class WorkbasketDefinitionControllerRestDocumentation extends BaseRestDoc } @Test - public void importWorkbasketDefinition() throws Exception { + void importWorkbasketDefinition() throws Exception { String definitionString = "[" + "{" + "\"distributionTargets\":[], " diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java index 961263212..9579daded 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java @@ -9,12 +9,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.env.Environment; @@ -27,7 +24,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -36,8 +32,8 @@ import com.fasterxml.jackson.databind.SerializationFeature; import pro.taskana.Classification; import pro.taskana.Task; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.exceptions.InvalidArgumentException; -import pro.taskana.rest.RestConfiguration; import pro.taskana.rest.resource.ClassificationResource; import pro.taskana.rest.resource.ClassificationResourceAssembler; import pro.taskana.rest.resource.TaskResource; @@ -46,10 +42,8 @@ import pro.taskana.rest.resource.TaskResourceAssembler; /** * Test async updates. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, - properties = {"devMode=true"}) -public class AsyncUpdateJobIntTest { +@TaskanaSpringBootTest +class AsyncUpdateJobIntTest { private static final String CLASSIFICATION_ID = "CLI:100000000000000000000000000000000003"; @@ -72,14 +66,14 @@ public class AsyncUpdateJobIntTest { private RestTemplate template; - @Before - public void before() { + @BeforeEach + void before() { template = getRestTemplate(); server = "http://127.0.0.1:" + port; } @Test - public void testUpdateClassificationPrioServiceLevel() + void testUpdateClassificationPrioServiceLevel() throws IOException, InvalidArgumentException { // 1st step: get old classification : diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/ldap/LdapTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/ldap/LdapTest.java index 49074ed43..181377a67 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/ldap/LdapTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/ldap/LdapTest.java @@ -4,33 +4,26 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.rest.RestConfiguration; import pro.taskana.rest.resource.AccessIdResource; /** * Test Ldap attachment. * */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"devMode=true"}) -@ContextConfiguration(classes = {RestConfiguration.class}) -public class LdapTest { +@TaskanaSpringBootTest +class LdapTest { @Autowired private LdapClient ldapClient; @Test - public void testFindUsers() throws InvalidArgumentException { + void testFindUsers() throws InvalidArgumentException { if (ldapClient.useLdap()) { List usersAndGroups = ldapClient.searchUsersAndGroups("ser0"); System.out.println("#### found " + LoggerUtils.listToString(usersAndGroups)); diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java index fc6e1b803..e6410eb72 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java @@ -9,10 +9,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.junit.jupiter.api.Test; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.hateoas.hal.Jackson2HalModule; @@ -24,29 +21,27 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.ldap.LdapCacheTestImpl; import pro.taskana.rest.resource.AccessIdResource; /** * Test AccessIdValidation. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = { - "devMode=true"}) -public class AccessIdValidationControllerIntTest { +@TaskanaSpringBootTest +class AccessIdValidationControllerIntTest { @LocalServerPort int port; @Test - public void testGetMatches() { + void testGetMatches() { AccessIdController.setLdapCache(new LdapCacheTestImpl()); RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); @@ -55,6 +50,7 @@ public class AccessIdValidationControllerIntTest { ResponseEntity> response = template.exchange( "http://127.0.0.1:" + port + "/api/v1/access-ids?search-for=ali", HttpMethod.GET, request, new ParameterizedTypeReference>() { + }); List body = response.getBody(); assertNotNull(body); @@ -66,7 +62,7 @@ public class AccessIdValidationControllerIntTest { } @Test - public void testBadRequestWhenSearchForIsTooShort() { + void testBadRequestWhenSearchForIsTooShort() { AccessIdController.setLdapCache(new LdapCacheTestImpl()); RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); @@ -97,7 +93,7 @@ public class AccessIdValidationControllerIntTest { converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/hal+json")); converter.setObjectMapper(mapper); - RestTemplate template = new RestTemplate(Collections.> singletonList(converter)); + RestTemplate template = new RestTemplate(Collections.>singletonList(converter)); return template; } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java index d3815a7fc..bc5ed7812 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java @@ -3,6 +3,7 @@ package pro.taskana.rest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.BufferedWriter; import java.io.IOException; @@ -12,12 +13,9 @@ import java.net.URL; import java.time.Instant; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.env.Environment; @@ -32,7 +30,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; @@ -40,6 +37,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import pro.taskana.Task; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.rest.resource.ClassificationSummaryListResource; import pro.taskana.rest.resource.ClassificationSummaryResource; @@ -51,10 +49,8 @@ import pro.taskana.rest.resource.TaskResourceAssembler; * * @author bbr */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, - properties = {"devMode=true"}) -public class ClassificationControllerIntTest { +@TaskanaSpringBootTest +class ClassificationControllerIntTest { @Autowired private TaskResourceAssembler taskResourceAssembler; @@ -69,15 +65,15 @@ public class ClassificationControllerIntTest { @LocalServerPort int port; - @Before - public void before() { + @BeforeEach + void before() { template = getRestTemplate(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); request = new HttpEntity(headers); } @Test - public void testGetAllClassifications() { + void testGetAllClassifications() { ResponseEntity response = template.exchange( server + port + "/api/v1/classifications", HttpMethod.GET, request, ParameterizedTypeReference.forType(ClassificationSummaryListResource.class)); @@ -85,7 +81,7 @@ public class ClassificationControllerIntTest { } @Test - public void testGetAllClassificationsFilterByCustomAttribute() { + void testGetAllClassificationsFilterByCustomAttribute() { ResponseEntity response = template.exchange( server + port + "/api/v1/classifications?domain=DOMAIN_A&custom-1-like=RVNR", HttpMethod.GET, request, @@ -95,7 +91,7 @@ public class ClassificationControllerIntTest { } @Test - public void testGetAllClassificationsKeepingFilters() { + void testGetAllClassificationsKeepingFilters() { ResponseEntity response = template.exchange( server + port + "/api/v1/classifications?domain=DOMAIN_A&sort-by=key&order=asc", HttpMethod.GET, request, @@ -110,7 +106,7 @@ public class ClassificationControllerIntTest { } @Test - public void testGetSecondPageSortedByKey() { + void testGetSecondPageSortedByKey() { ResponseEntity response = template.exchange( server + port + "/api/v1/classifications?domain=DOMAIN_A&sort-by=key&order=asc&page=2&page-size=5", HttpMethod.GET, @@ -131,7 +127,7 @@ public class ClassificationControllerIntTest { @Test @DirtiesContext - public void testCreateClassification() throws IOException { + void testCreateClassification() throws IOException { String newClassification = "{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS\",\"name\":\"new classification\",\"type\":\"TASK\"}"; URL url = new URL(server + port + "/api/v1/classifications"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); @@ -163,7 +159,7 @@ public class ClassificationControllerIntTest { @Test @DirtiesContext - public void testCreateClassificationWithParentId() throws IOException { + void testCreateClassificationWithParentId() throws IOException { String newClassification = "{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_B\",\"key\":\"NEW_CLASS_P1\",\"name\":\"new classification\",\"type\":\"TASK\",\"parentId\":\"CLI:200000000000000000000000000000000015\"}"; URL url = new URL(server + port + "/api/v1/classifications"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); @@ -181,7 +177,7 @@ public class ClassificationControllerIntTest { @Test @DirtiesContext - public void testCreateClassificationWithParentKey() throws IOException { + void testCreateClassificationWithParentKey() throws IOException { String newClassification = "{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_B\",\"key\":\"NEW_CLASS_P2\",\"name\":\"new classification\",\"type\":\"TASK\",\"parentKey\":\"T2100\"}"; URL url = new URL(server + port + "/api/v1/classifications"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); @@ -199,7 +195,7 @@ public class ClassificationControllerIntTest { @Test @DirtiesContext - public void testCreateClassificationWithParentKeyInDOMAIN_AShouldCreateAClassificationInRootDomain() + void testCreateClassificationWithParentKeyInDOMAIN_AShouldCreateAClassificationInRootDomain() throws IOException { String newClassification = "{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS_P2\",\"name\":\"new classification\",\"type\":\"TASK\",\"parentKey\":\"T2100\"}"; @@ -234,7 +230,7 @@ public class ClassificationControllerIntTest { @Test @DirtiesContext - public void testReturn400IfCreateClassificationWithIncompatibleParentIdAndKey() throws IOException { + void testReturn400IfCreateClassificationWithIncompatibleParentIdAndKey() throws IOException { String newClassification = "{\"classificationId\":\"\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_B\",\"key\":\"NEW_CLASS_P3\",\"name\":\"new classification\",\"type\":\"TASK\",\"parentId\":\"CLI:200000000000000000000000000000000015\",\"parentKey\":\"T2000\"}"; URL url = new URL(server + port + "/api/v1/classifications"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); @@ -252,7 +248,7 @@ public class ClassificationControllerIntTest { @Test @DirtiesContext - public void testCreateClassificationWithClassificationIdReturnsError400() throws IOException { + void testCreateClassificationWithClassificationIdReturnsError400() throws IOException { String newClassification = "{\"classificationId\":\"someId\",\"category\":\"MANUAL\",\"domain\":\"DOMAIN_A\",\"key\":\"NEW_CLASS\",\"name\":\"new classification\",\"type\":\"TASK\"}"; URL url = new URL("http://127.0.0.1:" + port + "/api/v1/classifications"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); @@ -269,7 +265,7 @@ public class ClassificationControllerIntTest { } @Test - public void testGetClassificationWithSpecialCharacter() { + void testGetClassificationWithSpecialCharacter() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -282,9 +278,9 @@ public class ClassificationControllerIntTest { assertEquals("Zustimmungserklärung", response.getBody().name); } - @Test(expected = HttpClientErrorException.class) + @Test @DirtiesContext - public void testDeleteClassification() { + void testDeleteClassification() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -297,11 +293,13 @@ public class ClassificationControllerIntTest { ParameterizedTypeReference.forType(ClassificationSummaryResource.class)); assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode()); - response = template.exchange( - "http://127.0.0.1:" + port + "/api/v1/classifications/CLI:200000000000000000000000000000000004", - HttpMethod.GET, - request, - ParameterizedTypeReference.forType(ClassificationSummaryResource.class)); + assertThrows(HttpClientErrorException.class, () -> { + template.exchange( + "http://127.0.0.1:" + port + "/api/v1/classifications/CLI:200000000000000000000000000000000004", + HttpMethod.GET, + request, + ParameterizedTypeReference.forType(ClassificationSummaryResource.class)); + }); } private void verifyTaskIsModifiedAfter(String taskId, Instant before) @@ -338,7 +336,7 @@ public class ClassificationControllerIntTest { converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/hal+json")); converter.setObjectMapper(mapper); - RestTemplate template = new RestTemplate(Collections.> singletonList(converter)); + RestTemplate template = new RestTemplate(Collections.>singletonList(converter)); return template; } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java index 417eefd7b..b5f977be3 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java @@ -17,14 +17,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.env.Environment; @@ -38,7 +35,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.HttpClientErrorException; @@ -47,6 +43,7 @@ import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.resource.ClassificationResource; import pro.taskana.rest.resource.ClassificationSummaryListResource; import pro.taskana.rest.resource.ClassificationSummaryResource; @@ -54,10 +51,9 @@ import pro.taskana.rest.resource.ClassificationSummaryResource; /** * Test classification definitions. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = { - "devMode=true"}) -public class ClassificationDefinitionControllerIntTest { + +@TaskanaSpringBootTest +class ClassificationDefinitionControllerIntTest { private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationController.class); @@ -77,8 +73,8 @@ public class ClassificationDefinitionControllerIntTest { @Autowired Environment env; - @Before - public void before() { + @BeforeEach + void before() { LOGGER.debug("before"); template = getRestTemplate(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -86,7 +82,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testExportClassifications() { + void testExportClassifications() { ResponseEntity response = template.exchange( server + port + "/api/v1/classification-definitions?domain=DOMAIN_B", HttpMethod.GET, request, ParameterizedTypeReference.forType(ClassificationResource[].class)); @@ -97,7 +93,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testExportClassificationsFromWrongDomain() { + void testExportClassificationsFromWrongDomain() { ResponseEntity response = template.exchange( server + port + "/api/v1/classification-definitions?domain=ADdfe", HttpMethod.GET, request, ParameterizedTypeReference.forType(ClassificationResource[].class)); @@ -105,7 +101,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testImportFilledClassification() throws IOException { + void testImportFilledClassification() throws IOException { ClassificationResource classification = new ClassificationResource(); classification.setClassificationId("classificationId_"); classification.setKey("key drelf"); @@ -139,7 +135,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testFailureWhenKeyIsMissing() throws IOException { + void testFailureWhenKeyIsMissing() throws IOException { ClassificationResource classification = new ClassificationResource(); classification.setDomain("DOMAIN_A"); List clList = new ArrayList<>(); @@ -153,7 +149,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testFailureWhenDomainIsMissing() throws IOException { + void testFailureWhenDomainIsMissing() throws IOException { ClassificationResource classification = new ClassificationResource(); classification.setKey("one"); List clList = new ArrayList<>(); @@ -167,7 +163,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testFailureWhenUpdatingTypeOfExistingClassification() throws IOException { + void testFailureWhenUpdatingTypeOfExistingClassification() throws IOException { ClassificationSummaryResource classification = this.getClassificationWithKeyAndDomain("T6310", ""); classification.setType("DOCUMENT"); List clList = new ArrayList<>(); @@ -181,7 +177,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testImportMultipleClassifications() throws IOException { + void testImportMultipleClassifications() throws IOException { ClassificationResource classification1 = this.createClassification("id1", "ImportKey1", "DOMAIN_A", null, null); String c1 = objMapper.writeValueAsString(classification1); @@ -208,7 +204,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testImportDuplicateClassification() throws IOException { + void testImportDuplicateClassification() throws IOException { ClassificationResource classification1 = new ClassificationResource(); classification1.setClassificationId("id1"); classification1.setKey("ImportKey3"); @@ -227,7 +223,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testInsertExistingClassificationWithOlderTimestamp() throws IOException { + void testInsertExistingClassificationWithOlderTimestamp() throws IOException { ClassificationSummaryResource existingClassification = getClassificationWithKeyAndDomain("L110107", "DOMAIN_A"); existingClassification.setName("first new Name"); List clList = new ArrayList<>(); @@ -249,7 +245,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testHookExistingChildToNewParent() throws IOException { + void testHookExistingChildToNewParent() throws IOException { ClassificationResource newClassification = createClassification( "new Classification", "newClass", "DOMAIN_A", null, "L11010"); ClassificationSummaryResource existingClassification = getClassificationWithKeyAndDomain("L110102", "DOMAIN_A"); @@ -275,7 +271,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testImportParentAndChildClassification() throws IOException { + void testImportParentAndChildClassification() throws IOException { ClassificationResource classification1 = this.createClassification("parentId", "ImportKey6", "DOMAIN_A", null, null); String c1 = objMapper.writeValueAsString(classification1); @@ -314,7 +310,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testImportParentAndChildClassificationWithKey() throws IOException { + void testImportParentAndChildClassificationWithKey() throws IOException { ClassificationResource classification1 = createClassification("parent", "ImportKey11", "DOMAIN_A", null, null); classification1.setCustom1("parent is correct"); String parent = objMapper.writeValueAsString(classification1); @@ -345,7 +341,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testChangeParentByImportingExistingClassification() throws IOException, InterruptedException { + void testChangeParentByImportingExistingClassification() throws IOException, InterruptedException { ClassificationSummaryResource child1 = this.getClassificationWithKeyAndDomain("L110105", "DOMAIN_A"); assertEquals("L11010", child1.getParentKey()); child1.setParentId("CLI:100000000000000000000000000000000002"); @@ -378,7 +374,7 @@ public class ClassificationDefinitionControllerIntTest { } @Test - public void testFailOnImportDuplicates() throws IOException { + void testFailOnImportDuplicates() throws IOException { ClassificationSummaryResource classification = this.getClassificationWithKeyAndDomain("L110105", "DOMAIN_A"); String classificationString = objMapper.writeValueAsString(classification); @@ -451,7 +447,7 @@ public class ClassificationDefinitionControllerIntTest { converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/haljson,*/*")); converter.setObjectMapper(mapper); - RestTemplate template = new RestTemplate(Collections.> singletonList(converter)); + RestTemplate template = new RestTemplate(Collections.>singletonList(converter)); return template; } } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java index 7b99691e6..f4b3910cf 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java @@ -6,15 +6,13 @@ import static org.mockito.Mockito.verify; import java.util.Collections; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.slf4j.LoggerFactory; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.hateoas.hal.Jackson2HalModule; @@ -24,7 +22,6 @@ import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -34,17 +31,16 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Appender; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.ldap.LdapCacheTestImpl; import pro.taskana.rest.resource.ClassificationSummaryListResource; /** * Test general Exception Handling. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - properties = { - "devMode=true"}) -public class GenenalExceptionHandlingTest { + +@TaskanaSpringBootTest +class GenenalExceptionHandlingTest { String server = "http://127.0.0.1:"; RestTemplate template; @@ -58,8 +54,8 @@ public class GenenalExceptionHandlingTest { @Captor private ArgumentCaptor captorLoggingEvent; - @Before - public void before() { + @BeforeEach + void before() { template = getRestTemplate(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); request = new HttpEntity(headers); @@ -69,14 +65,14 @@ public class GenenalExceptionHandlingTest { // Always have this teardown otherwise we can stuff up our expectations. Besides, it's // good coding practise - @After - public void teardown() { + @AfterEach + void teardown() { final Logger logger = (Logger) LoggerFactory.getLogger(TaskanaRestExceptionHandler.class); logger.detachAppender(mockAppender); } @Test - public void testAccessIdValidationMinimunValueExceptionIsLogged() { + void testAccessIdValidationMinimunValueExceptionIsLogged() { try { AccessIdController.setLdapCache(new LdapCacheTestImpl()); @@ -91,7 +87,7 @@ public class GenenalExceptionHandlingTest { } @Test - public void testDeleteNonExisitingClassificationExceptionIsLogged() { + void testDeleteNonExisitingClassificationExceptionIsLogged() { try { template.exchange( server + port + "/api/v1/classifications/non-existing-id", HttpMethod.DELETE, request, @@ -119,7 +115,7 @@ public class GenenalExceptionHandlingTest { converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/hal+json")); converter.setObjectMapper(mapper); - RestTemplate template = new RestTemplate(Collections.> singletonList(converter)); + RestTemplate template = new RestTemplate(Collections.>singletonList(converter)); return template; } } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskControllerIntTest.java index 360cb3025..38b898168 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskControllerIntTest.java @@ -19,12 +19,9 @@ import java.util.Collections; import javax.sql.DataSource; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.hateoas.Link; @@ -37,7 +34,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; @@ -45,6 +41,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.exceptions.SystemException; import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskSummaryListResource; @@ -53,10 +50,9 @@ import pro.taskana.sampledata.SampleDataGenerator; /** * Test Task Controller. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, - properties = {"devMode=true"}) -public class TaskControllerIntTest { + +@TaskanaSpringBootTest +class TaskControllerIntTest { @Value("${taskana.schemaName:TASKANA}") public String schemaName; @@ -67,7 +63,7 @@ public class TaskControllerIntTest { @Autowired private DataSource dataSource; - public void resetDb() { + void resetDb() { SampleDataGenerator sampleDataGenerator; try { sampleDataGenerator = new SampleDataGenerator(dataSource); @@ -78,7 +74,7 @@ public class TaskControllerIntTest { } @Test - public void testGetAllTasks() { + void testGetAllTasks() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -91,7 +87,7 @@ public class TaskControllerIntTest { } @Test - public void testGetAllTasksByWorkbasketId() { + void testGetAllTasksByWorkbasketId() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); // teamlead_1 @@ -105,7 +101,7 @@ public class TaskControllerIntTest { } @Test - public void testGetAllTasksByWorkbasketKeyAndDomain() { + void testGetAllTasksByWorkbasketKeyAndDomain() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dXNlcl8xXzI6dXNlcl8xXzI="); // user_1_2 @@ -119,7 +115,7 @@ public class TaskControllerIntTest { } @Test - public void testExceptionIfKeyIsSetButDomainIsMissing() { + void testExceptionIfKeyIsSetButDomainIsMissing() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dXNlcl8xXzI6dXNlcl8xXzI="); // user_1_2 @@ -136,7 +132,7 @@ public class TaskControllerIntTest { } @Test - public void testGetAllTasksWithAdminRole() { + void testGetAllTasksWithAdminRole() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic YWRtaW46YWRtaW4="); // Role Admin @@ -149,7 +145,7 @@ public class TaskControllerIntTest { } @Test - public void testGetAllTasksKeepingFilters() { + void testGetAllTasksKeepingFilters() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -166,7 +162,7 @@ public class TaskControllerIntTest { } @Test - public void testThrowsExceptionIfInvalidFilterIsUsed() { + void testThrowsExceptionIfInvalidFilterIsUsed() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -184,7 +180,7 @@ public class TaskControllerIntTest { } @Test - public void testGetLastPageSortedByPorValue() { + void testGetLastPageSortedByPorValue() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic YWRtaW46YWRtaW4="); // Role Admin @@ -210,7 +206,7 @@ public class TaskControllerIntTest { } @Test - public void testGetLastPageSortedByDueWithHiddenTasksRemovedFromResult() { + void testGetLastPageSortedByDueWithHiddenTasksRemovedFromResult() { resetDb(); // required because ClassificationControllerIntTest.testGetQueryByPorSecondPageSortedByType changes // tasks and this test depends on the tasks as they are in sampledata RestTemplate template = getRestTemplate(); @@ -243,7 +239,7 @@ public class TaskControllerIntTest { } @Test - public void testGetQueryByPorSecondPageSortedByType() { + void testGetQueryByPorSecondPageSortedByType() { resetDb(); // required because ClassificationControllerIntTest.testGetQueryByPorSecondPageSortedByType changes // tasks and this test depends on the tasks as they are in sampledata RestTemplate template = getRestTemplate(); @@ -271,7 +267,7 @@ public class TaskControllerIntTest { } @Test - public void testGetTaskWithAttachments() throws IOException { + void testGetTaskWithAttachments() throws IOException { URL url = new URL("http://127.0.0.1:" + port + "/api/v1/tasks/TKI:000000000000000000000000000000000002"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("GET"); @@ -297,7 +293,7 @@ public class TaskControllerIntTest { } @Test - public void testGetAndUpdateTask() throws IOException { + void testGetAndUpdateTask() throws IOException { URL url = new URL("http://127.0.0.1:" + port + "/api/v1/tasks/TKI:100000000000000000000000000000000000"); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("GET"); @@ -354,7 +350,7 @@ public class TaskControllerIntTest { } @Test - public void testCreateAndDeleteTask() throws IOException { + void testCreateAndDeleteTask() throws IOException { String taskToCreateJson = "{\"classificationSummaryResource\":{\"key\":\"L11010\"}," + "\"workbasketSummaryResource\":{\"workbasketId\":\"WBI:100000000000000000000000000000000004\"}," + "\"primaryObjRef\":{\"company\":\"MyCompany1\",\"system\":\"MySystem1\",\"systemInstance\":\"MyInstance1\",\"type\":\"MyType1\",\"value\":\"00000001\"}}"; @@ -398,7 +394,7 @@ public class TaskControllerIntTest { } @Test - public void testCreateTaskWithInvalidParameter() throws IOException { + void testCreateTaskWithInvalidParameter() throws IOException { String taskToCreateJson = "{\"classificationKey\":\"L11010\"," + "\"workbasketSummaryResource\":{\"workbasketId\":\"WBI:100000000000000000000000000000000004\"}," + "\"primaryObjRef\":{\"company\":\"MyCompany1\",\"system\":\"MySystem1\",\"systemInstance\":\"MyInstance1\",\"type\":\"MyType1\",\"value\":\"00000001\"}}"; @@ -416,9 +412,10 @@ public class TaskControllerIntTest { assertEquals(400, con.getResponseCode()); con.disconnect(); - taskToCreateJson = "{\"classificationSummaryResource\":{\"classificationId\":\"CLI:100000000000000000000000000000000004\"}," - + "\"workbasketSummaryResource\":{\"workbasketId\":\"\"}," - + "\"primaryObjRef\":{\"company\":\"MyCompany1\",\"system\":\"MySystem1\",\"systemInstance\":\"MyInstance1\",\"type\":\"MyType1\",\"value\":\"00000001\"}}"; + taskToCreateJson = + "{\"classificationSummaryResource\":{\"classificationId\":\"CLI:100000000000000000000000000000000004\"}," + + "\"workbasketSummaryResource\":{\"workbasketId\":\"\"}," + + "\"primaryObjRef\":{\"company\":\"MyCompany1\",\"system\":\"MySystem1\",\"systemInstance\":\"MyInstance1\",\"type\":\"MyType1\",\"value\":\"00000001\"}}"; url = new URL("http://127.0.0.1:" + port + "/api/v1/tasks"); con = (HttpURLConnection) url.openConnection(); @@ -450,7 +447,7 @@ public class TaskControllerIntTest { // converter.setSupportedMediaTypes(ImmutableList.of(MediaTypes.HAL_JSON)); converter.setObjectMapper(mapper); - RestTemplate template = new RestTemplate(Collections.> singletonList(converter)); + RestTemplate template = new RestTemplate(Collections.>singletonList(converter)); return template; } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java index 7045f1074..7141f043b 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java @@ -7,10 +7,7 @@ import static org.junit.Assert.assertTrue; import java.util.Collections; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.junit.jupiter.api.Test; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.hateoas.hal.Jackson2HalModule; @@ -21,28 +18,27 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import pro.taskana.TaskanaRole; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.resource.TaskanaUserInfoResource; /** * Test TaskanaEngineController. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, - properties = {"devMode=true"}) + +@TaskanaSpringBootTest public class TaskanaEngineControllerIntTest { @LocalServerPort int port; @Test - public void testDomains() { + void testDomains() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -54,7 +50,7 @@ public class TaskanaEngineControllerIntTest { } @Test - public void testClassificationTypes() { + void testClassificationTypes() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -68,7 +64,7 @@ public class TaskanaEngineControllerIntTest { } @Test - public void testClassificationCategories() { + void testClassificationCategories() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -84,7 +80,7 @@ public class TaskanaEngineControllerIntTest { } @Test - public void testGetCurrentUserInfo() { + void testGetCurrentUserInfo() { RestTemplate template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -112,7 +108,7 @@ public class TaskanaEngineControllerIntTest { converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/hal+json, application/json")); converter.setObjectMapper(mapper); - RestTemplate template = new RestTemplate(Collections.> singletonList(converter)); + RestTemplate template = new RestTemplate(Collections.>singletonList(converter)); return template; } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java index 551157eec..047edc415 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java @@ -8,20 +8,18 @@ import java.util.Collections; import javax.sql.DataSource; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.hateoas.hal.Jackson2HalModule; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.configuration.SpringTaskanaEngineConfiguration; import pro.taskana.exceptions.SystemException; import pro.taskana.sampledata.SampleDataGenerator; @@ -30,9 +28,9 @@ import pro.taskana.sampledata.SampleDataGenerator; * Test that the schema name can be customized. * */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class TestSchemaNameCustomizable { + +@TaskanaSpringBootTest +class TestSchemaNameCustomizable { String schemaName = "CUSTOMSCHEMANAME"; boolean isPostgres = false; @@ -40,7 +38,7 @@ public class TestSchemaNameCustomizable { @Autowired private DataSource dataSource; - public void resetDb() { + void resetDb() { SampleDataGenerator sampleDataGenerator; try { if ("PostgreSQL".equals(dataSource.getConnection().getMetaData().getDatabaseProductName())) { @@ -56,7 +54,7 @@ public class TestSchemaNameCustomizable { } @Test - public void chekCustomSchemaNameIsDefined() { + void chekCustomSchemaNameIsDefined() { resetDb(); ResultSet rs; try { diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java index dbb866864..2a0f4aae6 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java @@ -8,12 +8,10 @@ import static org.junit.Assert.fail; import java.util.Collections; -import org.junit.Before; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; -import org.springframework.boot.test.context.SpringBootTest; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.hateoas.Link; @@ -26,23 +24,22 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.resource.WorkbasketAccessItemListResource; import pro.taskana.rest.resource.WorkbasketAccessItemPaginatedListResource; /** * Test WorkbasketAccessItemController. */ -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class WorkbasketAccessItemControllerIntTest { +@TestMethodOrder(MethodOrderer.Alphanumeric.class) +@TaskanaSpringBootTest +class WorkbasketAccessItemControllerIntTest { String url = "http://127.0.0.1:"; RestTemplate template; @@ -50,8 +47,8 @@ public class WorkbasketAccessItemControllerIntTest { @LocalServerPort int port; - @Before - public void before() { + @BeforeEach + void before() { template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -59,7 +56,7 @@ public class WorkbasketAccessItemControllerIntTest { } @Test - public void testGetAllWorkbasketAccessItems() { + void testGetAllWorkbasketAccessItems() { ResponseEntity response = template.exchange( url + port + "/api/v1/workbasket-access-items", HttpMethod.GET, request, ParameterizedTypeReference.forType(WorkbasketAccessItemListResource.class)); @@ -67,7 +64,7 @@ public class WorkbasketAccessItemControllerIntTest { } @Test - public void testGetWorkbasketAccessItemsKeepingFilters() { + void testGetWorkbasketAccessItemsKeepingFilters() { String parameters = "/api/v1/workbasket-access-items?sort-by=workbasket-key&order=asc&page=1&page-size=9&access-ids=user_1_1"; ResponseEntity response = template.exchange( url + port + parameters, HttpMethod.GET, request, @@ -80,7 +77,7 @@ public class WorkbasketAccessItemControllerIntTest { } @Test - public void testThrowsExceptionIfInvalidFilterIsUsed() { + void testThrowsExceptionIfInvalidFilterIsUsed() { try { template.exchange( url + port @@ -95,7 +92,7 @@ public class WorkbasketAccessItemControllerIntTest { } @Test - public void testGetSecondPageSortedByWorkbasketKey() { + void testGetSecondPageSortedByWorkbasketKey() { String parameters = "/api/v1/workbasket-access-items?sort-by=workbasket-key&order=asc&page=2&page-size=9&access-ids=user_1_1"; ResponseEntity response = template.exchange( url + port + parameters, HttpMethod.GET, request, @@ -116,7 +113,7 @@ public class WorkbasketAccessItemControllerIntTest { } @Test - public void testRemoveWorkbasketAccessItemsOfUser() { + void testRemoveWorkbasketAccessItemsOfUser() { String parameters = "/api/v1/workbasket-access-items/?access-id=user_1_1"; ResponseEntity response = template.exchange( @@ -127,7 +124,7 @@ public class WorkbasketAccessItemControllerIntTest { } @Test - public void testGetBadRequestIfTryingToDeleteAccessItemsForGroup() { + void testGetBadRequestIfTryingToDeleteAccessItemsForGroup() { String parameters = "/api/v1/workbasket-access-items?access-id=cn=DevelopersGroup,ou=groups,o=TaskanaTest"; try { ResponseEntity response = template.exchange( @@ -152,7 +149,7 @@ public class WorkbasketAccessItemControllerIntTest { converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/hal+json")); converter.setObjectMapper(mapper); - RestTemplate template = new RestTemplate(Collections.> singletonList(converter)); + RestTemplate template = new RestTemplate(Collections.>singletonList(converter)); return template; } } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java index d0e6f60b9..fe7dc98bd 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java @@ -9,11 +9,8 @@ import static org.junit.Assert.fail; import java.util.Collections; import java.util.Iterator; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.hateoas.Link; @@ -26,13 +23,13 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.resource.DistributionTargetListResource; import pro.taskana.rest.resource.DistributionTargetResource; import pro.taskana.rest.resource.WorkbasketSummaryListResource; @@ -40,10 +37,9 @@ import pro.taskana.rest.resource.WorkbasketSummaryListResource; /** * Test WorkbasketController. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, - properties = {"devMode=true"}) -public class WorkbasketControllerIntTest { + +@TaskanaSpringBootTest +class WorkbasketControllerIntTest { String url = "http://127.0.0.1:"; RestTemplate template; @@ -51,8 +47,8 @@ public class WorkbasketControllerIntTest { @LocalServerPort int port; - @Before - public void before() { + @BeforeEach + void before() { template = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -60,7 +56,7 @@ public class WorkbasketControllerIntTest { } @Test - public void testGetAllWorkbaskets() { + void testGetAllWorkbaskets() { ResponseEntity response = template.exchange( url + port + "/api/v1/workbaskets", HttpMethod.GET, request, ParameterizedTypeReference.forType(WorkbasketSummaryListResource.class)); @@ -68,7 +64,7 @@ public class WorkbasketControllerIntTest { } @Test - public void testGetAllWorkbasketsBusinessAdminHasOpenPermission() { + void testGetAllWorkbasketsBusinessAdminHasOpenPermission() { ResponseEntity response = template.exchange( url + port + "/api/v1/workbaskets?required-permission=OPEN", HttpMethod.GET, request, ParameterizedTypeReference.forType(WorkbasketSummaryListResource.class)); @@ -77,7 +73,7 @@ public class WorkbasketControllerIntTest { } @Test - public void testGetAllWorkbasketsKeepingFilters() { + void testGetAllWorkbasketsKeepingFilters() { String parameters = "/api/v1/workbaskets?type=PERSONAL&sort-by=key&order=desc"; ResponseEntity response = template.exchange( url + port + parameters, HttpMethod.GET, request, @@ -90,7 +86,7 @@ public class WorkbasketControllerIntTest { } @Test - public void testThrowsExceptionIfInvalidFilterIsUsed() { + void testThrowsExceptionIfInvalidFilterIsUsed() { try { template.exchange( url + port + "/api/v1/workbaskets?invalid=PERSONAL", HttpMethod.GET, request, @@ -103,7 +99,7 @@ public class WorkbasketControllerIntTest { } @Test - public void testGetSecondPageSortedByKey() { + void testGetSecondPageSortedByKey() { String parameters = "/api/v1/workbaskets?sort-by=key&order=desc&page=2&page-size=5"; ResponseEntity response = template.exchange( @@ -123,7 +119,7 @@ public class WorkbasketControllerIntTest { } @Test - public void testRemoveWorkbasketAsDistributionTarget() { + void testRemoveWorkbasketAsDistributionTarget() { String parameters = "/api/v1/workbaskets/distribution-targets/WBI:100000000000000000000000000000000007"; ResponseEntity response = template.exchange( url + port + parameters, HttpMethod.DELETE, request, @@ -155,7 +151,7 @@ public class WorkbasketControllerIntTest { converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/hal+json")); converter.setObjectMapper(mapper); - RestTemplate template = new RestTemplate(Collections.> singletonList(converter)); + RestTemplate template = new RestTemplate(Collections.>singletonList(converter)); return template; } diff --git a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java index 784be2a03..148e7a157 100644 --- a/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java @@ -14,13 +14,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.io.FileSystemResource; @@ -33,7 +30,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.HttpClientErrorException; @@ -42,14 +38,15 @@ import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.resource.WorkbasketDefinitionResource; /** * Integration tests for WorkbasketDefinitionController. */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT) -public class WorkbasketDefinitionControllerIntTest { + +@TaskanaSpringBootTest +class WorkbasketDefinitionControllerIntTest { private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationController.class); private String server = "http://127.0.0.1:"; @@ -60,8 +57,8 @@ public class WorkbasketDefinitionControllerIntTest { @LocalServerPort private int port; - @Before - public void before() { + @BeforeEach + void before() { LOGGER.debug("before"); template = getRestTemplate(); headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); @@ -69,10 +66,11 @@ public class WorkbasketDefinitionControllerIntTest { } @Test - public void testExportWorkbasketFromDomain() { + void testExportWorkbasketFromDomain() { ResponseEntity> response = template.exchange( server + port + "/api/v1/workbasket-definitions?domain=DOMAIN_A", HttpMethod.GET, request, new ParameterizedTypeReference>() { + }); assertNotNull(response.getBody()); assertEquals(HttpStatus.OK, response.getStatusCode()); @@ -95,7 +93,7 @@ public class WorkbasketDefinitionControllerIntTest { } @Test - public void testExportWorkbasketsFromWrongDomain() { + void testExportWorkbasketsFromWrongDomain() { ResponseEntity> response = template.exchange( server + port + "/api/v1/workbasket-definitions?domain=wrongDomain", HttpMethod.GET, request, ParameterizedTypeReference.forType(List.class)); @@ -103,7 +101,7 @@ public class WorkbasketDefinitionControllerIntTest { } @Test - public void testImportWorkbasket() throws IOException { + void testImportWorkbasket() throws IOException { ResponseEntity> response = template.exchange( server + port + "/api/v1/workbasket-definitions?domain=DOMAIN_A", HttpMethod.GET, request, ParameterizedTypeReference.forType(List.class)); @@ -115,7 +113,7 @@ public class WorkbasketDefinitionControllerIntTest { } @Test - public void testFailOnImportDuplicates() throws IOException { + void testFailOnImportDuplicates() throws IOException { ResponseEntity> response = template.exchange( server + port + "/api/v1/workbasket-definitions?domain=DOMAIN_A", HttpMethod.GET, request, new ParameterizedTypeReference>() { @@ -134,11 +132,12 @@ public class WorkbasketDefinitionControllerIntTest { } @Test - public void testNoErrorWhenImportWithSameIdButDifferentKeyAndDomain() + void testNoErrorWhenImportWithSameIdButDifferentKeyAndDomain() throws IOException { ResponseEntity> response = template.exchange( server + port + "/api/v1/workbasket-definitions?domain=DOMAIN_A", HttpMethod.GET, request, new ParameterizedTypeReference>() { + }); List list = new ArrayList<>(); @@ -181,6 +180,6 @@ public class WorkbasketDefinitionControllerIntTest { converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/haljson,*/*")); converter.setObjectMapper(mapper); - return new RestTemplate(Collections.> singletonList(converter)); + return new RestTemplate(Collections.>singletonList(converter)); } } diff --git a/rest/taskana-rest-spring-wildfly-example/pom.xml b/rest/taskana-rest-spring-wildfly-example/pom.xml index c1c0d5e64..82813d617 100644 --- a/rest/taskana-rest-spring-wildfly-example/pom.xml +++ b/rest/taskana-rest-spring-wildfly-example/pom.xml @@ -93,8 +93,21 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} test diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml index 580fc212c..b7f2c33fe 100644 --- a/rest/taskana-rest-spring/pom.xml +++ b/rest/taskana-rest-spring/pom.xml @@ -86,9 +86,21 @@ test - junit - junit - ${version.junit} + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} test diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java index 3959206e5..31ecbbfc8 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java @@ -3,11 +3,11 @@ package pro.taskana.rest.resource; import java.time.Instant; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import pro.taskana.Classification; @@ -18,10 +18,10 @@ import pro.taskana.rest.TestConfiguration; /** * Test for {@link ClassificationResourceAssembler}. */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class ClassificationAssemblerTest { +class ClassificationAssemblerTest { @Autowired private ClassificationResourceAssembler classificationResourceAssembler; @@ -30,7 +30,7 @@ public class ClassificationAssemblerTest { private ClassificationService classificationService; @Test - public void classificationToResource() { + void classificationToResource() { // given ClassificationImpl classification = (ClassificationImpl) classificationService.newClassification("DOMAIN_A", "1", "A"); @@ -60,7 +60,7 @@ public class ClassificationAssemblerTest { } @Test - public void resourceToClassification() { + void resourceToClassification() { ClassificationImpl classification = (ClassificationImpl) classificationService.newClassification("12", "DOMAIN_B", "AB"); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ConfigurationTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ConfigurationTest.java index 2b5242764..613b6fee7 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ConfigurationTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ConfigurationTest.java @@ -1,17 +1,18 @@ package pro.taskana.rest.resource; -import org.junit.Test; -import pro.taskana.configuration.TaskanaEngineConfiguration; - import static org.junit.Assert.assertNotNull; +import org.junit.jupiter.api.Test; + +import pro.taskana.configuration.TaskanaEngineConfiguration; + /** * Tests for Taskana lib configuration. */ -public class ConfigurationTest { +class ConfigurationTest { @Test - public void testImplementationVersionIsInTaskanaCorePackage() { + void testImplementationVersionIsInTaskanaCorePackage() { assertNotNull(TaskanaEngineConfiguration.class.getPackage().getImplementationVersion()); } } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java index 05011acd9..c6ae4ea82 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java @@ -13,12 +13,12 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; @@ -31,10 +31,10 @@ import pro.taskana.rest.TestConfiguration; /** * Test for {@link ReportResourceAssembler}. */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class ReportResourceTest { +class ReportResourceTest { @Autowired private ReportResourceAssembler reportResourceAssembler; @@ -43,8 +43,8 @@ public class ReportResourceTest { private LocalDateTime now; private List headers; - @Before - public void before() { + @BeforeEach + void before() { now = LocalDate.parse("2019-01-02").atStartOfDay(); daysDiff = (int) LocalDateTime.now().until(now, ChronoUnit.DAYS); headers = IntStream.range(daysDiff - 5, daysDiff) @@ -54,7 +54,7 @@ public class ReportResourceTest { } @Test - public void testEmptyReport() { + void testEmptyReport() { // given WorkbasketReport report = new WorkbasketReport(headers); // when @@ -83,7 +83,7 @@ public class ReportResourceTest { } @Test - public void testOneSingleRow() { + void testOneSingleRow() { // given ClassificationReport report = new ClassificationReport(headers); MonitorQueryItem item = new MonitorQueryItem(); @@ -126,7 +126,7 @@ public class ReportResourceTest { } @Test - public void testMultipleSingleRows() { + void testMultipleSingleRows() { // given ClassificationReport report = new ClassificationReport(headers); MonitorQueryItem item = new MonitorQueryItem(); @@ -177,7 +177,7 @@ public class ReportResourceTest { } @Test - public void testOneFoldableRow() { + void testOneFoldableRow() { // given ClassificationReport.DetailedClassificationReport report = new ClassificationReport.DetailedClassificationReport( headers); @@ -253,7 +253,7 @@ public class ReportResourceTest { } @Test - public void testMultipleFoldableRows() { + void testMultipleFoldableRows() { // given ClassificationReport.DetailedClassificationReport report = new ClassificationReport.DetailedClassificationReport( headers); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java index f0b12bbba..4f1255223 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java @@ -5,11 +5,11 @@ import java.util.List; import java.util.Map; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import pro.taskana.Attachment; @@ -23,10 +23,10 @@ import pro.taskana.rest.TestConfiguration; /** * Test for {@link TaskResourceAssembler}. */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class TaskResourceAssemberTest { +class TaskResourceAssemberTest { @Autowired TaskService taskService; @@ -34,7 +34,7 @@ public class TaskResourceAssemberTest { TaskResourceAssembler taskResourceAssembler; @Test - public void testSimpleResourceToModel() throws InvalidArgumentException { + void testSimpleResourceToModel() throws InvalidArgumentException { //given ObjectReference primaryObjRef = new ObjectReference(); primaryObjRef.setId("abc"); @@ -94,7 +94,7 @@ public class TaskResourceAssemberTest { testEquality(task, resource); } - public void testEquality(Task task, TaskResource resource) throws InvalidArgumentException { + void testEquality(Task task, TaskResource resource) throws InvalidArgumentException { Assert.assertEquals(task.getId(), resource.getTaskId()); Assert.assertEquals(task.getExternalId(), resource.getExternalId()); Assert.assertEquals(task.getCreated() == null ? null : task.getCreated().toString(), resource.getCreated()); @@ -142,7 +142,7 @@ public class TaskResourceAssemberTest { } - public void testEqualityAttachements(List attachments, List resources) { + void testEqualityAttachements(List attachments, List resources) { Assert.assertEquals(attachments.size(), resources.size()); for (int i = 0; i < resources.size(); i++) { AttachmentResource resource = resources.get(i); @@ -152,7 +152,7 @@ public class TaskResourceAssemberTest { } } - public void testEquality(Map customAttributes, + void testEquality(Map customAttributes, List resourceAttributes) { Assert.assertEquals(customAttributes.size(), resourceAttributes.size()); resourceAttributes.forEach( diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java index 9051c07d0..af6e8f8fc 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java @@ -1,11 +1,11 @@ package pro.taskana.rest.resource; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import pro.taskana.WorkbasketAccessItem; @@ -16,10 +16,10 @@ import pro.taskana.rest.TestConfiguration; /** * Test for {@link WorkbasketAccessItemResourceAssembler}. */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { TestConfiguration.class }) +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class WorkbasketAccessItemResourceAssemblerTest { +class WorkbasketAccessItemResourceAssemblerTest { @Autowired WorkbasketAccessItemResourceAssembler workbasketAccessItemResourceAssembler; @@ -28,7 +28,7 @@ public class WorkbasketAccessItemResourceAssemblerTest { WorkbasketService workbasketService; @Test - public void workBasketAccessItemToResourcePropertiesEqual() { + void workBasketAccessItemToResourcePropertiesEqual() { // given WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem("1", "2"); ((WorkbasketAccessItemImpl) accessItem).setWorkbasketKey("workbasketKey"); @@ -57,7 +57,7 @@ public class WorkbasketAccessItemResourceAssemblerTest { } @Test - public void workBasketAccessItemToModelPropertiesEqual() { + void workBasketAccessItemToModelPropertiesEqual() { // given WorkbasketAccessItemResource resource = new WorkbasketAccessItemResource(); resource.setAccessId("10"); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java index 7ffdef94d..49002e406 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java @@ -3,11 +3,11 @@ package pro.taskana.rest.resource; import java.time.Instant; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import pro.taskana.Workbasket; @@ -21,10 +21,10 @@ import pro.taskana.rest.TestConfiguration; /** * Test for {@link WorkbasketResourceAssembler}. */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class WorkbasketResourceAssemblerTest { +class WorkbasketResourceAssemblerTest { @Autowired WorkbasketService workbasketService; @@ -32,7 +32,7 @@ public class WorkbasketResourceAssemblerTest { WorkbasketResourceAssembler workbasketResourceAssembler; @Test - public void workbasketToResource() throws NotAuthorizedException, WorkbasketNotFoundException { + void workbasketToResource() throws NotAuthorizedException, WorkbasketNotFoundException { // given Workbasket workbasket = workbasketService.newWorkbasket("1", "DOMAIN_A"); ((WorkbasketImpl) workbasket).setId("ID"); @@ -57,7 +57,7 @@ public class WorkbasketResourceAssemblerTest { } @Test - public void resourceWithoutCreated() { + void resourceWithoutCreated() { //given WorkbasketResource resource = new WorkbasketResource(); resource.setWorkbasketId("1"); @@ -70,7 +70,7 @@ public class WorkbasketResourceAssemblerTest { } @Test - public void resourceWithoutModified() { + void resourceWithoutModified() { //given WorkbasketResource resource = new WorkbasketResource(); resource.setWorkbasketId("1"); @@ -83,7 +83,7 @@ public class WorkbasketResourceAssemblerTest { } @Test - public void resourceToWorkbasket() { + void resourceToWorkbasket() { // given WorkbasketResource workbasketResource = new WorkbasketResource(); workbasketResource.setWorkbasketId("1"); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketSummaryAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketSummaryAssemblerTest.java index 80a325f68..8952bad6f 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketSummaryAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketSummaryAssemblerTest.java @@ -1,11 +1,11 @@ package pro.taskana.rest.resource; import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import pro.taskana.WorkbasketService; @@ -16,10 +16,10 @@ import pro.taskana.rest.TestConfiguration; /** * Test for {@link WorkbasketSummaryResourceAssembler}. */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestConfiguration.class}) @WebAppConfiguration -public class WorkbasketSummaryAssemblerTest { +class WorkbasketSummaryAssemblerTest { @Autowired WorkbasketSummaryResourceAssembler workbasketSummaryAssembler; @@ -27,7 +27,7 @@ public class WorkbasketSummaryAssemblerTest { WorkbasketService workbasketService; @Test - public void workbasketSummaryToResource() { + void workbasketSummaryToResource() { // given WorkbasketSummaryImpl workbasketSummary = (WorkbasketSummaryImpl) workbasketService.newWorkbasket("1", "DOMAIN_A").asSummary();