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

refactored/fixed test cases, upgrade jackson-databind according to spring-boot version

This commit is contained in:
sfrevel 2020-05-19 13:05:06 +02:00 committed by dependabot-preview[bot]
parent 930cd6dbea
commit 5b25635ca4
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java
View File

@ -57,7 +57,7 @@ public class TaskanaTestController {
int workbaskets = getWorkbaskets(); int workbaskets = getWorkbaskets();
if (Boolean.parseBoolean(rollback)) { if (Boolean.parseBoolean(rollback)) {
throw new RuntimeException("workbaskets: " + workbaskets); throw new RuntimeException();
} else { } else {
return "workbaskets: " + workbaskets; return "workbaskets: " + workbaskets;
} }
@ -74,7 +74,7 @@ public class TaskanaTestController {
taskanaEngine.getWorkbasketService().createWorkbasket(createWorkBasket("key3", "workbasket3")); taskanaEngine.getWorkbasketService().createWorkbasket(createWorkBasket("key3", "workbasket3"));
if (Boolean.parseBoolean(rollback)) { if (Boolean.parseBoolean(rollback)) {
throw new RuntimeException("workbaskets: " + getWorkbaskets()); throw new RuntimeException();
} else { } else {
return "workbaskets: " + getWorkbaskets(); return "workbaskets: " + getWorkbaskets();
} }
@ -93,8 +93,7 @@ public class TaskanaTestController {
jdbcTemplate.execute("INSERT INTO CUSTOMDB.TEST VALUES ('2', 'test2')"); jdbcTemplate.execute("INSERT INTO CUSTOMDB.TEST VALUES ('2', 'test2')");
if (Boolean.parseBoolean(rollback)) { if (Boolean.parseBoolean(rollback)) {
throw new RuntimeException( throw new RuntimeException();
"workbaskets: " + getWorkbaskets() + ", tests: " + getCustomdbTests());
} else { } else {
return "workbaskets: " + getWorkbaskets() + ", tests: " + getCustomdbTests(); return "workbaskets: " + getWorkbaskets() + ", tests: " + getCustomdbTests();
} }

12
lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java
View File

@ -54,6 +54,8 @@ import pro.taskana.workbasket.internal.models.WorkbasketImpl;
@Import({TransactionalJobsConfiguration.class}) @Import({TransactionalJobsConfiguration.class})
class TaskanaTransactionIntTest { class TaskanaTransactionIntTest {
private static final String INTERNAL_SERVER_ERROR_MESSAGE = "Internal Server Error";
private static final String INTERNAL_SERVER_ERROR_STATUS = "500";
@Autowired TaskanaTransactionProvider<Object> springTransactionProvider; @Autowired TaskanaTransactionProvider<Object> springTransactionProvider;
@Autowired private TestRestTemplate restTemplate; @Autowired private TestRestTemplate restTemplate;
@Autowired private DataSource dataSource; @Autowired private DataSource dataSource;
@ -92,7 +94,8 @@ class TaskanaTransactionIntTest {
ResponseEntity<String> responseEntity = ResponseEntity<String> responseEntity =
restTemplate.getForEntity("/transaction?rollback={rollback}", String.class, "true"); restTemplate.getForEntity("/transaction?rollback={rollback}", String.class, "true");
System.err.println("result: " + responseEntity.getBody()); System.err.println("result: " + responseEntity.getBody());
assertThat(responseEntity.getBody()).containsSequence("workbaskets: 1"); assertThat(responseEntity.getBody()).containsSequence(INTERNAL_SERVER_ERROR_MESSAGE);
assertThat(responseEntity.getBody()).containsSequence(INTERNAL_SERVER_ERROR_STATUS);
assertQuantities(0, 0); assertQuantities(0, 0);
} }
@ -116,7 +119,8 @@ class TaskanaTransactionIntTest {
ResponseEntity<String> responseEntity = ResponseEntity<String> responseEntity =
restTemplate.getForEntity("/transaction-many?rollback={rollback}", String.class, "true"); restTemplate.getForEntity("/transaction-many?rollback={rollback}", String.class, "true");
System.err.println("result: " + responseEntity.getBody()); System.err.println("result: " + responseEntity.getBody());
assertThat(responseEntity.getBody()).containsSequence("workbaskets: 3"); assertThat(responseEntity.getBody()).containsSequence(INTERNAL_SERVER_ERROR_MESSAGE);
assertThat(responseEntity.getBody()).containsSequence(INTERNAL_SERVER_ERROR_STATUS);
assertQuantities(0, 0); assertQuantities(0, 0);
} }
@ -140,8 +144,8 @@ class TaskanaTransactionIntTest {
ResponseEntity<String> responseEntity = ResponseEntity<String> responseEntity =
restTemplate.getForEntity("/customdb?rollback={rollback}", String.class, "true"); restTemplate.getForEntity("/customdb?rollback={rollback}", String.class, "true");
System.err.println("response: " + responseEntity.getBody()); System.err.println("response: " + responseEntity.getBody());
assertThat(responseEntity.getBody()).containsSequence("workbaskets: 2"); assertThat(responseEntity.getBody()).containsSequence(INTERNAL_SERVER_ERROR_MESSAGE);
assertThat(responseEntity.getBody()).containsSequence("tests: 2"); assertThat(responseEntity.getBody()).containsSequence(INTERNAL_SERVER_ERROR_STATUS);
assertQuantities(0, 0); assertQuantities(0, 0);
} }

2
pom.xml
View File

@ -28,7 +28,7 @@
<version.mybatis>3.5.4</version.mybatis> <version.mybatis>3.5.4</version.mybatis>
<version.slf4j>1.7.30</version.slf4j> <version.slf4j>1.7.30</version.slf4j>
<version.json>20190722</version.json> <version.json>20190722</version.json>
<version.jackson>2.9.8</version.jackson> <version.jackson>2.11.0</version.jackson>
<version.aspectjweaver>1.9.5</version.aspectjweaver> <version.aspectjweaver>1.9.5</version.aspectjweaver>
<version.javax.validation>2.0.1.Final</version.javax.validation> <version.javax.validation>2.0.1.Final</version.javax.validation>