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

TSK-1029: Fix side effect of tests

This commit is contained in:
Benjamin Eckstein 2020-01-20 19:22:07 +01:00 committed by Holger Hagen
parent fae9d1fb9b
commit 1d15f5102f
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java
View File

@ -13,11 +13,12 @@ import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.sql.DataSource;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.FileSystemResource;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
@ -34,21 +35,32 @@ import org.springframework.web.client.RestTemplate;
import pro.taskana.RestHelper; import pro.taskana.RestHelper;
import pro.taskana.TaskanaSpringBootTest; import pro.taskana.TaskanaSpringBootTest;
import pro.taskana.rest.resource.WorkbasketDefinitionResource; import pro.taskana.rest.resource.WorkbasketDefinitionResource;
import pro.taskana.sampledata.SampleDataGenerator;
/** Integration tests for WorkbasketDefinitionController. */ /** Integration tests for WorkbasketDefinitionController. */
@TaskanaSpringBootTest @TaskanaSpringBootTest
class WorkbasketDefinitionControllerIntTest { class WorkbasketDefinitionControllerIntTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationController.class);
private static RestTemplate template; private static RestTemplate template;
@Value("${taskana.schemaName:TASKANA}")
String schemaName;
@Autowired RestHelper restHelper; @Autowired RestHelper restHelper;
private ObjectMapper objMapper = new ObjectMapper();
@Autowired private DataSource dataSource;
@BeforeAll @BeforeAll
static void init() { static void init() {
template = RestHelper.getRestTemplate(); template = RestHelper.getRestTemplate();
} }
@BeforeEach
void resetDb() {
SampleDataGenerator sampleDataGenerator = new SampleDataGenerator(dataSource, schemaName);
sampleDataGenerator.generateSampleData();
}
@Test @Test
void testExportWorkbasketFromDomain() { void testExportWorkbasketFromDomain() {
ResponseEntity<List<WorkbasketDefinitionResource>> response = ResponseEntity<List<WorkbasketDefinitionResource>> response =
@ -101,6 +113,7 @@ class WorkbasketDefinitionControllerIntTest {
ParameterizedTypeReference.forType(List.class)); ParameterizedTypeReference.forType(List.class));
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
ObjectMapper objMapper = new ObjectMapper();
list.add(objMapper.writeValueAsString(response.getBody().get(0))); list.add(objMapper.writeValueAsString(response.getBody().get(0)));
ResponseEntity<Void> responseImport = importRequest(list); ResponseEntity<Void> responseImport = importRequest(list);
assertEquals(HttpStatus.NO_CONTENT, responseImport.getStatusCode()); assertEquals(HttpStatus.NO_CONTENT, responseImport.getStatusCode());
@ -116,6 +129,7 @@ class WorkbasketDefinitionControllerIntTest {
new ParameterizedTypeReference<List<WorkbasketDefinitionResource>>() {}); new ParameterizedTypeReference<List<WorkbasketDefinitionResource>>() {});
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
ObjectMapper objMapper = new ObjectMapper();
list.add(objMapper.writeValueAsString(response.getBody().get(0))); list.add(objMapper.writeValueAsString(response.getBody().get(0)));
list.add(objMapper.writeValueAsString(response.getBody().get(0))); list.add(objMapper.writeValueAsString(response.getBody().get(0)));
try { try {
@ -136,6 +150,7 @@ class WorkbasketDefinitionControllerIntTest {
new ParameterizedTypeReference<List<WorkbasketDefinitionResource>>() {}); new ParameterizedTypeReference<List<WorkbasketDefinitionResource>>() {});
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
ObjectMapper objMapper = new ObjectMapper();
WorkbasketDefinitionResource wbDef = response.getBody().get(0); WorkbasketDefinitionResource wbDef = response.getBody().get(0);
list.add(objMapper.writeValueAsString(wbDef)); list.add(objMapper.writeValueAsString(wbDef));
wbDef.getWorkbasket().setKey("new Key for this WB"); wbDef.getWorkbasket().setKey("new Key for this WB");