From 150508e8e9da5daa8cd0082392a0f8cf6dbde4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Kl=C3=A4ger?=
 <kklaeger@users.noreply.github.com>
Date: Fri, 8 Dec 2017 09:33:06 +0100
Subject: [PATCH] TSK-65: Fix tests because of failure and update UserPrincipal

---
 .../src/main/java/pro/taskana/security/UserPrincipal.java | 5 +----
 .../integration/TaskServiceImplIntAutocommitTest.java     | 5 +++--
 .../impl/integration/TaskServiceImplIntExplicitTest.java  | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/taskana-core/src/main/java/pro/taskana/security/UserPrincipal.java b/lib/taskana-core/src/main/java/pro/taskana/security/UserPrincipal.java
index 8602f1176..6985d0383 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/security/UserPrincipal.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/security/UserPrincipal.java
@@ -13,10 +13,7 @@ public class UserPrincipal implements Principal {
         this.name = name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
+    @Override
     public String getName() {
         return this.name;
     }
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 f4af654ea..0fa394861 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
@@ -109,13 +109,14 @@ public class TaskServiceImplIntAutocommitTest {
             throws FileNotFoundException, SQLException, TaskNotFoundException, NotAuthorizedException, WorkbasketNotFoundException, ClassificationNotFoundException {
         TaskanaEngineConfiguration taskanaEngineConfiguration = new TaskanaEngineConfiguration(null, false, false);
         TaskanaEngine te = taskanaEngineConfiguration.buildTaskanaEngine();
+        ((TaskanaEngineImpl) te).setConnectionManagementMode(ConnectionManagementMode.AUTOCOMMIT);
         TaskServiceImpl taskServiceImpl = (TaskServiceImpl) te.getTaskService();
 
         Workbasket wb = new Workbasket();
         wb.setName("workbasket");
-        taskanaEngine.getWorkbasketService().createWorkbasket(wb);
+        te.getWorkbasketService().createWorkbasket(wb);
         Classification classification = new Classification();
-        taskanaEngine.getClassificationService().addClassification(classification);
+        te.getClassificationService().addClassification(classification);
 
         Task task = new Task();
         task.setName("Unit Test Task");
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 0cf0927ab..6d9c14093 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
@@ -92,12 +92,12 @@ public class TaskServiceImplIntExplicitTest {
     }
 
     @Test
-    public void testTaskService() throws Throwable {
+    public void testCreateTask() throws Throwable {
         try {
             Subject.doAs(subject, new PrivilegedExceptionAction<Object>() {
                 @Override
                 public Object run() throws TaskNotFoundException, WorkbasketNotFoundException, FileNotFoundException, NotAuthorizedException, SQLException, ClassificationNotFoundException {
-                    do_testTaskService();
+                    do_testCreateTask();
                     return null;
                 }
             });
@@ -106,7 +106,7 @@ public class TaskServiceImplIntExplicitTest {
         }
     }
 
-    public void do_testTaskService() throws FileNotFoundException, SQLException, TaskNotFoundException, NotAuthorizedException, WorkbasketNotFoundException, ClassificationNotFoundException {
+    public void do_testCreateTask() throws FileNotFoundException, SQLException, TaskNotFoundException, NotAuthorizedException, WorkbasketNotFoundException, ClassificationNotFoundException {
         Connection connection = dataSource.getConnection();
         taskanaEngineImpl.setConnection(connection);
 
@@ -193,7 +193,7 @@ public class TaskServiceImplIntExplicitTest {
         ClassificationServiceImpl classificationServiceImpl = (ClassificationServiceImpl) te.getClassificationService();
 
         Workbasket workbasket = new Workbasket();
-        workbasket.setName("workbasket");
+        workbasket.setName("workbasket99");
         Classification classification = new Classification();
         workbasketServiceImpl.createWorkbasket(workbasket);
         classificationServiceImpl.addClassification(classification);