TSK-340 do not use ~/data as tmp directory in unit tests

This commit is contained in:
BerndBreier 2018-03-05 14:24:58 +01:00 committed by Holger Hagen
parent bab3d9ff5c
commit ab5c58280c
45 changed files with 49 additions and 49 deletions

View File

@ -57,7 +57,7 @@ public class TaskanaProducersTest {
Class.forName("org.h2.Driver");
int resultCount = 0;
try (Connection conn = DriverManager.getConnection("jdbc:h2:~/data/testdb;AUTO_SERVER=TRUE;IGNORECASE=TRUE", "SA", "SA")) {
try (Connection conn = DriverManager.getConnection("jdbc:h2:~/taskana-h2-data/testdb;AUTO_SERVER=TRUE;IGNORECASE=TRUE", "SA", "SA")) {
ResultSet rs = conn.createStatement().executeQuery("SELECT ID, OWNER FROM TASK");
while (rs.next()) {
@ -74,7 +74,7 @@ public class TaskanaProducersTest {
Class.forName("org.h2.Driver");
int resultCount = 0;
try (Connection conn = DriverManager.getConnection("jdbc:h2:~/data/testdb;AUTO_SERVER=TRUE;IGNORECASE=TRUE", "SA", "SA")) {
try (Connection conn = DriverManager.getConnection("jdbc:h2:~/taskana-h2-data/testdb;AUTO_SERVER=TRUE;IGNORECASE=TRUE", "SA", "SA")) {
ResultSet rs = conn.createStatement().executeQuery("SELECT ID, OWNER FROM TASK");
while (rs.next()) {

View File

@ -5,11 +5,11 @@ swarm:
data-sources:
TestDS:
driver-name: myh2
connection-url: jdbc:h2:~/data/testdb;AUTO_SERVER=TRUE
connection-url: jdbc:h2:~/taskana-h2-data/testdb;AUTO_SERVER=TRUE
user-name: SA
password: SA
jdbc-drivers:
myh2:
driver-class-name: org.h2.Driver
xa-datasource-name: org.h2.jdbcx.JdbcDataSource
driver-module-name: com.h2database.h2
driver-module-name: com.h2database.h2

View File

@ -23,7 +23,7 @@ public class TaskanaEngineConfiguration {
private static final String USER_NAME = "sa";
private static final String USER_PASSWORD = "sa";
private static final String JDBC_H2_MEM_TASKANA = "jdbc:h2:mem:taskana;IGNORECASE=TRUE";
private static final String JDBC_H2_MEM_TASKANA = "jdbc:h2:~/taskana-h2-data/testdb;AUTO_SERVER=TRUE;IGNORECASE=TRUE";
private static final String H2_DRIVER = "org.h2.Driver";
private static final String TASKANA_ROLES_PROPERTIES = "/taskanaroles.properties";
private static final String TASKANA_PROPERTIES_SEPARATOR = "|";

View File

@ -154,6 +154,6 @@ public class CreateClassificationAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -142,6 +142,6 @@ public class DeleteClassificationAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -24,7 +24,7 @@ public class GetClassificationAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
@Test

View File

@ -225,6 +225,6 @@ public class QueryClassificationAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -166,6 +166,6 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -172,6 +172,6 @@ public class UpdateClassificationAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -303,6 +303,6 @@ public class GetTaskIdsOfCategoryReportAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -464,6 +464,6 @@ public class ProvideCategoryReportAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -554,6 +554,6 @@ public class ProvideClassificationReportAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -482,6 +482,6 @@ public class ProvideCustomFieldValueReportAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -966,6 +966,6 @@ public class ProvideDetailedClassificationReportAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -456,6 +456,6 @@ public class ProvideWorkbasketLevelReportAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -112,6 +112,6 @@ public class QueryObjectReferenceAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -142,6 +142,6 @@ public class QueryObjectreferencesWithPaginationAccTest extends AbstractAccTest
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -540,6 +540,6 @@ public class CreateTaskAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -137,6 +137,6 @@ public class DeleteTaskAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -532,6 +532,6 @@ public class QueryTasksAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -70,6 +70,6 @@ public class QueryTasksByObjectReferenceAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -279,6 +279,6 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -55,6 +55,6 @@ public class QueryTasksByWorkbasketAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -199,6 +199,6 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -224,6 +224,6 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -224,6 +224,6 @@ public class TransferTaskAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -213,6 +213,6 @@ public class UpdateTaskAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -431,6 +431,6 @@ public class UpdateTaskAttachmentsAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -303,6 +303,6 @@ public class WorkOnTaskAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -130,6 +130,6 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -317,7 +317,7 @@ public class DistributionTargetsAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -85,6 +85,6 @@ public class GetWorkbasketAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -362,7 +362,7 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -145,7 +145,7 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -134,6 +134,6 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -191,6 +191,6 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -79,7 +79,7 @@ public class UpdateWorkbasketAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -270,6 +270,6 @@ public class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -78,6 +78,6 @@ public class WorkbasketQueryWithOrderedPaginationAccTest extends AbstractAccTest
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -66,7 +66,7 @@ public class ClassificationServiceImplIntAutoCommitTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
@Before

View File

@ -67,7 +67,7 @@ public class ClassificationServiceImplIntExplicitTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
@Before

View File

@ -77,7 +77,7 @@ public class TaskServiceImplIntAutocommitTest {
DataSource ds = TaskanaEngineConfigurationTest.getDataSource();
DBCleaner cleaner = new DBCleaner();
cleaner.clearDb(ds, true);
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
@Before
@ -412,6 +412,6 @@ public class TaskServiceImplIntAutocommitTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -84,7 +84,7 @@ public class TaskServiceImplIntExplicitTest {
DataSource ds = TaskanaEngineConfigurationTest.getDataSource();
DBCleaner cleaner = new DBCleaner();
cleaner.clearDb(ds, true);
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
@Before
@ -571,7 +571,7 @@ public class TaskServiceImplIntExplicitTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -268,6 +268,6 @@ public class WorkbasketServiceImplIntAutocommitTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}

View File

@ -257,6 +257,6 @@ public class WorkbasketServiceImplIntExplicitTest {
@AfterClass
public static void cleanUpClass() {
FileUtils.deleteRecursive("~/data", true);
FileUtils.deleteRecursive("~/taskana-h2-data", true);
}
}