From 2c5f97927b2962966fa0c56f6b0172e24671fc32 Mon Sep 17 00:00:00 2001
From: SebastianRoseneck <55637012+SebastianRoseneck@users.noreply.github.com>
Date: Wed, 14 Apr 2021 10:40:34 +0200
Subject: [PATCH] TSK-1617: Fixed unit tests when creating db2 with
 prepare_db.bat script

---
 ci/prepare_db.bat                                         | 2 +-
 ci/prepare_db.sh                                          | 6 +++---
 .../src/test/java/acceptance/AbstractAccTest.java         | 8 ++++----
 .../java/acceptance/TaskanaEngineTestConfiguration.java   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ci/prepare_db.bat b/ci/prepare_db.bat
index 83bbda682..ae1d154ce 100644
--- a/ci/prepare_db.bat
+++ b/ci/prepare_db.bat
@@ -36,7 +36,7 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
     ECHO jdbcUrl=jdbc:db2://localhost:5101/tskdb>> %PROP_FILE%
     ECHO dbUserName=db2inst1>> %PROP_FILE%
     ECHO dbPassword=db2inst1-pwd>> %PROP_FILE%
-    ECHO schemaName=taskana>> %PROP_FILE%
+    ECHO schemaName=TASKANA>> %PROP_FILE%
     ECHO ---
     GOTO MENU
 
diff --git a/ci/prepare_db.sh b/ci/prepare_db.sh
index d4ca3fbb0..178ffbc82 100755
--- a/ci/prepare_db.sh
+++ b/ci/prepare_db.sh
@@ -53,7 +53,7 @@ function main() {
     [[ -f "$propFile" ]] && rm "$propFile"
     ;;
   DB2_11_1)
-    docker-compose -f $scriptDir/docker-compose.yml up -d $(mapDBToDockerComposeServiceName "$1")
+    docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
 
     echo 'jdbcDriver=com.ibm.db2.jcc.DB2Driver' > $propFile
     echo 'jdbcUrl=jdbc:db2://localhost:5101/tskdb' >> $propFile
@@ -62,7 +62,7 @@ function main() {
     echo 'schemaName=TASKANA' >> $propFile
     ;;
   POSTGRES_10)
-    docker-compose -f $scriptDir/docker-compose.yml up -d $(mapDBToDockerComposeServiceName "$1")
+    docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
    
     echo 'jdbcDriver=org.postgresql.Driver' > $propFile
     echo 'jdbcUrl=jdbc:postgresql://localhost:5102/postgres' >> $propFile
@@ -71,7 +71,7 @@ function main() {
     echo 'schemaName=taskana' >> $propFile
     ;;
   stop)
-    docker-compose -f $scriptDir/docker-compose.yml rm -f -s -v $(mapDBToDockerComposeServiceName "$2")
+    docker-compose -f $scriptDir/docker-compose.yml rm -f -s -v "$(mapDBToDockerComposeServiceName "$2")"
     
     [[ -f "$propFile" ]] && rm "$propFile"
     ;;
diff --git a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java
index 103a0ed88..50467fc55 100644
--- a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java
@@ -48,13 +48,13 @@ public abstract class AbstractAccTest {
 
     DataSource dataSource = TaskanaEngineTestConfiguration.getDataSource();
     String schemaName = TaskanaEngineTestConfiguration.getSchemaName();
-    SampleDataGenerator sampleDataGenerator = new SampleDataGenerator(dataSource, schemaName);
+    taskanaEngineConfiguration = new TaskanaEngineConfiguration(dataSource, false, schemaName);
+    taskanaEngineConfiguration.setGermanPublicHolidaysEnabled(true);
+    SampleDataGenerator sampleDataGenerator =
+        new SampleDataGenerator(dataSource, taskanaEngineConfiguration.getSchemaName());
     if (dropTables) {
       sampleDataGenerator.dropDb();
     }
-    dataSource = TaskanaEngineTestConfiguration.getDataSource();
-    taskanaEngineConfiguration = new TaskanaEngineConfiguration(dataSource, false, schemaName);
-    taskanaEngineConfiguration.setGermanPublicHolidaysEnabled(true);
     taskanaEngine = taskanaEngineConfiguration.buildTaskanaEngine();
     taskanaEngine.setConnectionManagementMode(ConnectionManagementMode.AUTOCOMMIT);
     converter = taskanaEngine.getWorkingDaysToDaysConverter();
diff --git a/lib/taskana-core/src/test/java/acceptance/TaskanaEngineTestConfiguration.java b/lib/taskana-core/src/test/java/acceptance/TaskanaEngineTestConfiguration.java
index 28cd64867..6bb3d0eee 100644
--- a/lib/taskana-core/src/test/java/acceptance/TaskanaEngineTestConfiguration.java
+++ b/lib/taskana-core/src/test/java/acceptance/TaskanaEngineTestConfiguration.java
@@ -60,8 +60,8 @@ public final class TaskanaEngineTestConfiguration {
    */
   public static String getSchemaName() {
     if (schemaName == null) {
-      String userHomeDirectroy = System.getProperty("user.home");
-      String propertiesFileName = userHomeDirectroy + "/taskanaUnitTest.properties";
+      String userHomeDirectory = System.getProperty("user.home");
+      String propertiesFileName = userHomeDirectory + "/taskanaUnitTest.properties";
       File f = new File(propertiesFileName);
       if (f.exists() && !f.isDirectory()) {
         schemaName = getSchemaNameFromPropertiesObject(propertiesFileName);