From b7fe42206e8f6503a588a8ab43d3b9dfc386dab5 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Thu, 11 Jul 2019 16:46:43 +0200 Subject: [PATCH] TSK-860: Removed an additional (& unnecessary) error message --- .../TaskServiceImplIntExplicitTest.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 7e32f488a..bcaac0f38 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 @@ -5,6 +5,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; +import java.io.File; import java.sql.Connection; import java.sql.SQLException; import java.util.List; @@ -78,17 +79,14 @@ public class TaskServiceImplIntExplicitTest { private static ClassificationService classificationService; private static WorkbasketService workbasketService; - @Before - public void resetDb() { - cleaner.clearDb(dataSource, false); - } - @BeforeClass public static void setup() throws SQLException { String userHomeDirectroy = System.getProperty("user.home"); String propertiesFileName = userHomeDirectroy + "/taskanaUnitTest.properties"; - dataSource = TaskanaEngineConfigurationTest.createDataSourceFromProperties(propertiesFileName); + dataSource = new File(propertiesFileName).exists() + ? TaskanaEngineConfigurationTest.createDataSourceFromProperties(propertiesFileName) + : TaskanaEngineConfiguration.createDefaultDataSource(); taskanaEngineConfiguration = new TaskanaEngineConfiguration(dataSource, false, TaskanaEngineConfigurationTest.getSchemaName()); taskanaEngine = taskanaEngineConfiguration.buildTaskanaEngine(); @@ -102,6 +100,11 @@ public class TaskServiceImplIntExplicitTest { creator.run(); } + @Before + public void resetDb() { + cleaner.clearDb(dataSource, false); + } + @WithAccessId(userName = "Elena", groupNames = {"businessadmin"}) @Test(expected = TaskNotFoundException.class) public void testStartTransactionFail()