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

TSK-1162 new postgres version 42.2.11; refactoring of db setup/teardown in test classes

This commit is contained in:
Sascha Frevel 2020-04-06 14:40:27 +02:00 committed by Mustapha Zorgati
parent 25b35d4889
commit 03a2985b1c
4 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntAutoCommitTest.java
View File

@ -13,6 +13,7 @@ import java.time.ZoneId;
import java.util.List;
import javax.sql.DataSource;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -42,25 +43,30 @@ class ClassificationServiceImplIntAutoCommitTest {
private ClassificationService classificationService;
@BeforeEach
void setup() throws SQLException {
private SampleDataGenerator sampleDataGenerator;
private TaskanaEngineConfiguration taskanaEngineConfiguration;
@BeforeAll
void beforeAll() throws SQLException {
DataSource dataSource = TaskanaEngineTestConfiguration.getDataSource();
String schemaName = TaskanaEngineTestConfiguration.getSchemaName();
TaskanaEngineConfiguration taskanaEngineConfiguration =
sampleDataGenerator = new SampleDataGenerator(dataSource, schemaName);
taskanaEngineConfiguration =
new TaskanaEngineConfiguration(dataSource, false, false, schemaName);
}
@BeforeEach
void setup() {
TaskanaEngine taskanaEngine = taskanaEngineConfiguration.buildTaskanaEngine();
classificationService = taskanaEngine.getClassificationService();
TaskanaEngineImpl taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine;
taskanaEngineImpl.setConnectionManagementMode(ConnectionManagementMode.AUTOCOMMIT);
new SampleDataGenerator(dataSource, schemaName).clearDb();
}
@AfterEach
void teardown() {
DataSource dataSource = TaskanaEngineTestConfiguration.getDataSource();
String schemaName = TaskanaEngineTestConfiguration.getSchemaName();
new SampleDataGenerator(dataSource, schemaName).dropDb();
sampleDataGenerator.clearDb();
}
@Test

23
lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntAutocommitTest.java
View File

@ -10,7 +10,9 @@ import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import javax.sql.DataSource;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ -66,8 +68,6 @@ class TaskServiceImplIntAutocommitTest {
private TaskServiceImpl taskServiceImpl;
private TaskanaEngineConfiguration taskanaEngineConfiguration;
private TaskanaEngine taskanaEngine;
private TaskanaEngineImpl taskanaEngineImpl;
@ -76,20 +76,31 @@ class TaskServiceImplIntAutocommitTest {
private WorkbasketService workbasketService;
@BeforeEach
void setup() throws SQLException {
dataSource = TaskanaEngineTestConfiguration.getDataSource();
private SampleDataGenerator sampleDataGenerator;
private TaskanaEngineConfiguration taskanaEngineConfiguration;
@BeforeAll
void beforeAll() throws SQLException {
DataSource dataSource = TaskanaEngineTestConfiguration.getDataSource();
String schemaName = TaskanaEngineTestConfiguration.getSchemaName();
sampleDataGenerator = new SampleDataGenerator(dataSource, schemaName);
taskanaEngineConfiguration =
new TaskanaEngineConfiguration(dataSource, false, false, schemaName);
}
@BeforeEach
void setup() throws SQLException {
taskanaEngine = taskanaEngineConfiguration.buildTaskanaEngine();
taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine;
taskanaEngineImpl.setConnectionManagementMode(ConnectionManagementMode.AUTOCOMMIT);
taskServiceImpl = (TaskServiceImpl) taskanaEngine.getTaskService();
classificationService = taskanaEngine.getClassificationService();
workbasketService = taskanaEngine.getWorkbasketService();
SampleDataGenerator sampleDataGenerator = new SampleDataGenerator(dataSource, schemaName);
}
@AfterEach
void tearDown() {
sampleDataGenerator.clearDb();
}

24
lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntExplicitTest.java
View File

@ -15,6 +15,7 @@ import java.util.UUID;
import javax.sql.DataSource;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ -71,8 +72,6 @@ class TaskServiceImplIntExplicitTest {
private TaskServiceImpl taskServiceImpl;
private TaskanaEngineConfiguration taskanaEngineConfiguration;
private TaskanaEngine taskanaEngine;
private TaskanaEngineImpl taskanaEngineImpl;
@ -81,8 +80,12 @@ class TaskServiceImplIntExplicitTest {
private WorkbasketService workbasketService;
@BeforeEach
void setup() throws SQLException {
private SampleDataGenerator sampleDataGenerator;
private TaskanaEngineConfiguration taskanaEngineConfiguration;
@BeforeAll
void beforeAll() throws SQLException {
String userHomeDirectory = System.getProperty("user.home");
String propertiesFileName = userHomeDirectory + "/taskanaUnitTest.properties";
@ -93,6 +96,10 @@ class TaskServiceImplIntExplicitTest {
taskanaEngineConfiguration =
new TaskanaEngineConfiguration(
dataSource, false, TaskanaEngineTestConfiguration.getSchemaName());
}
@BeforeEach
void setup() throws SQLException {
taskanaEngine = taskanaEngineConfiguration.buildTaskanaEngine();
taskServiceImpl = (TaskServiceImpl) taskanaEngine.getTaskService();
taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine;
@ -100,15 +107,16 @@ class TaskServiceImplIntExplicitTest {
taskanaEngineImpl.setConnectionManagementMode(ConnectionManagementMode.EXPLICIT);
workbasketService = taskanaEngine.getWorkbasketService();
try (Connection connection = dataSource.getConnection()) {
SampleDataGenerator sampleDataGenerator =
new SampleDataGenerator(dataSource, TaskanaEngineTestConfiguration.getSchemaName());
sampleDataGenerator.clearDb();
DbSchemaCreator creator = new DbSchemaCreator(dataSource, connection.getSchema());
creator.run();
}
String schemaName = TaskanaEngineTestConfiguration.getSchemaName();
SampleDataGenerator sampleDataGenerator = new SampleDataGenerator(dataSource, schemaName);
// String schemaName = TaskanaEngineTestConfiguration.getSchemaName();
}
@AfterEach
void tearDown() {
sampleDataGenerator.clearDb();
}

2
pom.xml
View File

@ -90,7 +90,7 @@
<!-- database driver versions -->
<version.h2>1.4.200</version.h2>
<version.db2>11.1.1.1</version.db2>
<version.postgres>42.2.10</version.postgres>
<version.postgres>42.2.11</version.postgres>
<!-- used by jacoco to collect coverage -->
<argLine></argLine>
</properties>