nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1617: Fixed unit tests when creating db2 with prepare_db.bat script

This commit is contained in:
SebastianRoseneck 2021-04-14 10:40:34 +02:00 committed by Mustapha Zorgati
parent 74cd4eacd9
commit 2c5f97927b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/prepare_db.bat
View File

@ -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

6
ci/prepare_db.sh
View File

@ -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"
;;

8
lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java
View File

@ -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();

4
lib/taskana-core/src/test/java/acceptance/TaskanaEngineTestConfiguration.java
View File

@ -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);