From 469452b50bf8a6538838d96ac118936493c0cd3c Mon Sep 17 00:00:00 2001 From: Holger Hagen <19706592+holgerhagen@users.noreply.github.com> Date: Wed, 24 Jul 2019 08:59:10 +0200 Subject: [PATCH] TSK-858: extracted default db test to separate test file. --- .../ClassificationAlreadyExistException.java | 2 +- .../TaskServiceImplIntAutocommitTest.java | 58 ++++++----------- .../TaskServiceImplIntExplicitTest.java | 62 +++++-------------- 3 files changed, 34 insertions(+), 88 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/exceptions/ClassificationAlreadyExistException.java b/lib/taskana-core/src/main/java/pro/taskana/exceptions/ClassificationAlreadyExistException.java index df1f3ee80..e3bf7a7a6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/exceptions/ClassificationAlreadyExistException.java +++ b/lib/taskana-core/src/main/java/pro/taskana/exceptions/ClassificationAlreadyExistException.java @@ -10,7 +10,7 @@ public class ClassificationAlreadyExistException extends TaskanaException { private static final long serialVersionUID = 4716611657569005013L; public ClassificationAlreadyExistException(Classification classification) { - super("ID='" + classification.getId() + "', KEY=' " + classification.getKey() + "', DOMAIN='" + super("ID='" + classification.getId() + "', KEY='" + classification.getKey() + "', DOMAIN='" + classification.getDomain() + "';"); } } diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java index 2bf6328ce..c430646ed 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java @@ -64,13 +64,18 @@ import pro.taskana.security.WithAccessId; public class TaskServiceImplIntAutocommitTest { private DataSource dataSource; - private TaskServiceImpl taskServiceImpl; - private TaskanaEngineConfiguration taskanaEngineConfiguration; - private TaskanaEngine taskanaEngine; - private TaskanaEngineImpl taskanaEngineImpl; - private ClassificationService classificationService; - private WorkbasketService workbasketService; + private TaskServiceImpl taskServiceImpl; + + private TaskanaEngineConfiguration taskanaEngineConfiguration; + + private TaskanaEngine taskanaEngine; + + private TaskanaEngineImpl taskanaEngineImpl; + + private ClassificationService classificationService; + + private WorkbasketService workbasketService; @Before public void setup() throws SQLException { @@ -93,10 +98,12 @@ public class TaskServiceImplIntAutocommitTest { WorkbasketNotFoundException, NotAuthorizedException, ClassificationNotFoundException, ClassificationAlreadyExistException, TaskAlreadyExistException, InvalidWorkbasketException, InvalidArgumentException, WorkbasketAlreadyExistException, DomainNotFoundException { + Workbasket wb = workbasketService.newWorkbasket("workbasket", "DOMAIN_A"); wb.setName("workbasket"); wb.setType(WorkbasketType.GROUP); taskanaEngine.getWorkbasketService().createWorkbasket(wb); + Classification classification = classificationService.newClassification("TEST", "DOMAIN_A", "TASK"); taskanaEngine.getClassificationService().createClassification(classification); @@ -119,6 +126,7 @@ public class TaskServiceImplIntAutocommitTest { WorkbasketNotFoundException, ClassificationNotFoundException, ClassificationAlreadyExistException, TaskAlreadyExistException, InvalidWorkbasketException, InvalidArgumentException, WorkbasketAlreadyExistException, DomainNotFoundException { + Workbasket wb = workbasketService.newWorkbasket("wb1k1", "DOMAIN_A"); wb.setName("sdf"); wb.setType(WorkbasketType.GROUP); @@ -127,9 +135,10 @@ public class TaskServiceImplIntAutocommitTest { Classification classification = classificationService.newClassification("TEST", "DOMAIN_A", "TASK"); classification = taskanaEngine.getClassificationService() .createClassification(classification); - classification = taskanaEngine.getClassificationService().getClassification( - classification.getKey(), - classification.getDomain()); + classification = taskanaEngine.getClassificationService() + .getClassification( + classification.getKey(), + classification.getDomain()); TaskImpl task = (TaskImpl) taskServiceImpl.newTask(wb.getKey(), "DOMAIN_A"); task.setName("Unit Test Task"); @@ -143,35 +152,6 @@ public class TaskServiceImplIntAutocommitTest { taskServiceImpl2.getTask(wb.getId()); } - @Test - public void testCreateTaskInTaskanaWithDefaultDb() - throws SQLException, NotAuthorizedException, - WorkbasketNotFoundException, ClassificationNotFoundException, ClassificationAlreadyExistException, - TaskAlreadyExistException, InvalidWorkbasketException, InvalidArgumentException, - WorkbasketAlreadyExistException, DomainNotFoundException { - TaskanaEngineConfiguration taskanaEngineConfiguration = new TaskanaEngineConfiguration(null, false, false, - null); - TaskanaEngine te = taskanaEngineConfiguration.buildTaskanaEngine(); - ((TaskanaEngineImpl) te).setConnectionManagementMode(ConnectionManagementMode.AUTOCOMMIT); - TaskServiceImpl taskServiceImpl = (TaskServiceImpl) te.getTaskService(); - - Workbasket wb = workbasketService.newWorkbasket("workbasket", "DOMAIN_A"); - wb.setName("workbasket"); - wb.setType(WorkbasketType.GROUP); - te.getWorkbasketService().createWorkbasket(wb); - Classification classification = te.getClassificationService().newClassification("TEST", "DOMAIN_A", "TASK"); - te.getClassificationService().createClassification(classification); - - Task task = taskServiceImpl.newTask(wb.getId()); - task.setName("Unit Test Task"); - task.setClassificationKey(classification.getKey()); - task.setPrimaryObjRef(JunitHelper.createDefaultObjRef()); - task = taskServiceImpl.createTask(task); - - Assert.assertNotNull(task); - Assert.assertNotNull(task.getId()); - } - @Test public void should_ReturnList_when_BuilderIsUsed() throws NotAuthorizedException, WorkbasketNotFoundException, ClassificationNotFoundException, ClassificationAlreadyExistException, @@ -274,7 +254,7 @@ public class TaskServiceImplIntAutocommitTest { taskServiceImpl.transfer(UUID.randomUUID() + "_X", "1"); } - @WithAccessId(userName = "User", groupNames = {"businessadmin"}) + @WithAccessId(userName = "User", groupNames = { "businessadmin" }) @Test public void shouldNotTransferByFailingSecurity() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, ClassificationAlreadyExistException, SQLException, diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java index bcaac0f38..467b1daba 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java @@ -47,13 +47,11 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.ClassificationImpl; -import pro.taskana.impl.ClassificationServiceImpl; import pro.taskana.impl.JunitHelper; import pro.taskana.impl.TaskImpl; import pro.taskana.impl.TaskServiceImpl; import pro.taskana.impl.TaskanaEngineImpl; import pro.taskana.impl.WorkbasketImpl; -import pro.taskana.impl.WorkbasketServiceImpl; import pro.taskana.impl.WorkbasketSummaryImpl; import pro.taskana.impl.configuration.DBCleaner; import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest; @@ -71,12 +69,19 @@ import pro.taskana.security.WithAccessId; public class TaskServiceImplIntExplicitTest { private static DataSource dataSource; + private static DBCleaner cleaner; + private static TaskServiceImpl taskServiceImpl; + private static TaskanaEngineConfiguration taskanaEngineConfiguration; + private static TaskanaEngine taskanaEngine; + private static TaskanaEngineImpl taskanaEngineImpl; + private static ClassificationService classificationService; + private static WorkbasketService workbasketService; @BeforeClass @@ -105,7 +110,7 @@ public class TaskServiceImplIntExplicitTest { cleaner.clearDb(dataSource, false); } - @WithAccessId(userName = "Elena", groupNames = {"businessadmin"}) + @WithAccessId(userName = "Elena", groupNames = { "businessadmin" }) @Test(expected = TaskNotFoundException.class) public void testStartTransactionFail() throws SQLException, TaskNotFoundException, NotAuthorizedException, WorkbasketNotFoundException, @@ -145,7 +150,7 @@ public class TaskServiceImplIntExplicitTest { connection.commit(); } - @WithAccessId(userName = "Elena", groupNames = {"businessadmin"}) + @WithAccessId(userName = "Elena", groupNames = { "businessadmin" }) @Test public void testCreateTask() throws SQLException, TaskNotFoundException, NotAuthorizedException, @@ -175,46 +180,7 @@ public class TaskServiceImplIntExplicitTest { connection.commit(); } - @WithAccessId(userName = "Elena", groupNames = {"businessadmin"}) - @Test - public void testCreateTaskInTaskanaWithDefaultDb() - throws SQLException, NotAuthorizedException, - WorkbasketNotFoundException, ClassificationNotFoundException, ClassificationAlreadyExistException, - TaskAlreadyExistException, InvalidWorkbasketException, InvalidArgumentException, - WorkbasketAlreadyExistException, DomainNotFoundException { - DataSource ds = TaskanaEngineConfiguration.createDefaultDataSource(); - TaskanaEngineConfiguration taskanaEngineConfiguration = new TaskanaEngineConfiguration(ds, false, false, - null); - TaskanaEngine te = taskanaEngineConfiguration.buildTaskanaEngine(); - Connection connection = ds.getConnection(); - te.setConnection(connection); - TaskServiceImpl taskServiceImpl = (TaskServiceImpl) te.getTaskService(); - WorkbasketServiceImpl workBasketServiceImpl = (WorkbasketServiceImpl) te.getWorkbasketService(); - ClassificationServiceImpl classificationServiceImpl = (ClassificationServiceImpl) te.getClassificationService(); - - Workbasket workbasket = workbasketService.newWorkbasket("K99", "DOMAIN_A"); - workbasket.setName("workbasket"); - - workbasket.setName("workbasket99"); - workbasket.setType(WorkbasketType.GROUP); - workbasket = workBasketServiceImpl.createWorkbasket(workbasket); - Classification classification = classificationService.newClassification("TEST", "DOMAIN_A", "TASK"); - classification = classificationServiceImpl.createClassification(classification); - - Task task = taskServiceImpl.newTask(workbasket.getId()); - task.setName("Unit Test Task"); - task.setClassificationKey(classification.getKey()); - task.setPrimaryObjRef(JunitHelper.createDefaultObjRef()); - task.addAttachment(null); - task = taskServiceImpl.createTask(task); - - Assert.assertNotNull(task); - Assert.assertNotNull(task.getId()); - connection.commit(); - te.setConnection(null); - } - - @WithAccessId(userName = "Elena", groupNames = {"businessadmin"}) + @WithAccessId(userName = "Elena", groupNames = { "businessadmin" }) @Test(expected = WorkbasketNotFoundException.class) public void createTaskShouldThrowWorkbasketNotFoundException() throws NotAuthorizedException, WorkbasketNotFoundException, ClassificationNotFoundException, SQLException, @@ -227,7 +193,7 @@ public class TaskServiceImplIntExplicitTest { taskServiceImpl.createTask(test); } - @WithAccessId(userName = "Elena", groupNames = {"businessadmin"}) + @WithAccessId(userName = "Elena", groupNames = { "businessadmin" }) @Test(expected = ClassificationNotFoundException.class) public void createManualTaskShouldThrowClassificationNotFoundException() throws NotAuthorizedException, WorkbasketNotFoundException, ClassificationNotFoundException, SQLException, @@ -253,7 +219,7 @@ public class TaskServiceImplIntExplicitTest { taskServiceImpl.createTask(task); } - @WithAccessId(userName = "Elena", groupNames = {"DummyGroup", "businessadmin"}) + @WithAccessId(userName = "Elena", groupNames = { "DummyGroup", "businessadmin" }) @Test public void should_ReturnList_when_BuilderIsUsed() throws SQLException, NotAuthorizedException, WorkbasketNotFoundException, ClassificationNotFoundException, ClassificationAlreadyExistException, @@ -301,7 +267,7 @@ public class TaskServiceImplIntExplicitTest { connection.commit(); } - @WithAccessId(userName = "Elena", groupNames = {"businessadmin"}) + @WithAccessId(userName = "Elena", groupNames = { "businessadmin" }) @Test public void shouldTransferTaskToOtherWorkbasket() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, @@ -380,7 +346,7 @@ public class TaskServiceImplIntExplicitTest { taskServiceImpl.transfer(UUID.randomUUID() + "_X", "1"); } - @WithAccessId(userName = "User", groupNames = {"businessadmin"}) + @WithAccessId(userName = "User", groupNames = { "businessadmin" }) @Test public void shouldNotTransferByFailingSecurity() throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException, ClassificationAlreadyExistException, SQLException,