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

TSK-1138 Removed Junit4 dependency in taskana-spring-example

This commit is contained in:
Sofie Hofmann 2020-02-20 16:02:29 +01:00
parent 3283dd4e4e
commit 4f4e7209cd
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/taskana-spring-example/pom.xml
View File

@ -48,12 +48,6 @@
<version>${version.junit.jupiter}</version> <version>${version.junit.jupiter}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${version.junit.jupiter}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>

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

@ -75,66 +75,66 @@ class TaskanaTransactionIntTest {
@Test @Test
void testTransaction() { void testTransaction() {
assertBefore(0, 0); assertQuantities(0, 0);
ResponseEntity<String> responseEntity = restTemplate.getForEntity("/transaction", String.class); ResponseEntity<String> responseEntity = restTemplate.getForEntity("/transaction", String.class);
System.err.println("response: " + responseEntity.getBody()); System.err.println("response: " + responseEntity.getBody());
assertThat(responseEntity.getBody()).containsSequence("workbaskets: 1"); assertThat(responseEntity.getBody()).containsSequence("workbaskets: 1");
assertAfter(1, 0); assertQuantities(1, 0);
} }
@Test @Test
void testTransactionRollback() { void testTransactionRollback() {
assertBefore(0, 0); assertQuantities(0, 0);
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("workbaskets: 1");
assertAfter(0, 0); assertQuantities(0, 0);
} }
@Test @Test
void testTransactionCombined() { void testTransactionCombined() {
assertBefore(0, 0); assertQuantities(0, 0);
ResponseEntity<String> responseEntity = ResponseEntity<String> responseEntity =
restTemplate.getForEntity("/transaction-many", String.class); restTemplate.getForEntity("/transaction-many", String.class);
System.err.println("response: " + responseEntity.getBody()); System.err.println("response: " + responseEntity.getBody());
assertThat(responseEntity.getBody()).containsSequence("workbaskets: 3"); assertThat(responseEntity.getBody()).containsSequence("workbaskets: 3");
assertAfter(3, 0); assertQuantities(3, 0);
} }
@Test @Test
void testTransactionCombinedRollback() { void testTransactionCombinedRollback() {
assertBefore(0, 0); assertQuantities(0, 0);
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("workbaskets: 3");
assertAfter(0, 0); assertQuantities(0, 0);
} }
@Test @Test
void testTransactionCustomdb() { void testTransactionCustomdb() {
assertBefore(0, 0); assertQuantities(0, 0);
ResponseEntity<String> responseEntity = restTemplate.getForEntity("/customdb", String.class); ResponseEntity<String> responseEntity = restTemplate.getForEntity("/customdb", String.class);
System.err.println("response: " + responseEntity.getBody()); System.err.println("response: " + responseEntity.getBody());
assertThat(responseEntity.getBody()).containsSequence("workbaskets: 2"); assertThat(responseEntity.getBody()).containsSequence("workbaskets: 2");
assertThat(responseEntity.getBody()).containsSequence("tests: 2"); assertThat(responseEntity.getBody()).containsSequence("tests: 2");
assertAfter(2, 2); assertQuantities(2, 2);
} }
@Test @Test
void testTransactionCustomdbRollback() { void testTransactionCustomdbRollback() {
assertBefore(0, 0); assertQuantities(0, 0);
ResponseEntity<String> responseEntity = ResponseEntity<String> responseEntity =
restTemplate.getForEntity("/customdb?rollback={rollback}", String.class, "true"); restTemplate.getForEntity("/customdb?rollback={rollback}", String.class, "true");
@ -142,7 +142,7 @@ class TaskanaTransactionIntTest {
assertThat(responseEntity.getBody()).containsSequence("workbaskets: 2"); assertThat(responseEntity.getBody()).containsSequence("workbaskets: 2");
assertThat(responseEntity.getBody()).containsSequence("tests: 2"); assertThat(responseEntity.getBody()).containsSequence("tests: 2");
assertAfter(0, 0); assertQuantities(0, 0);
} }
@Test @Test
@ -241,22 +241,17 @@ class TaskanaTransactionIntTest {
return objRef; return objRef;
} }
private void assertBefore(int workbaskets, int tests) { private void assertQuantities(int workbaskets, int tests) {
assertWorkbaskets("before", workbaskets); assertWorkbaskets(workbaskets);
assertCustomdbTests("before", tests); assertCustomdbTests(tests);
} }
private void assertAfter(int workbaskets, int tests) { private void assertWorkbaskets(int value) {
assertWorkbaskets("after", workbaskets);
assertCustomdbTests("after", tests);
}
private void assertWorkbaskets(String assertion, int value) {
int workbaskets = getWorkbaskets(); int workbaskets = getWorkbaskets();
assertThat(workbaskets).isEqualTo(value); assertThat(workbaskets).isEqualTo(value);
} }
private void assertCustomdbTests(String assertion, int value) { private void assertCustomdbTests(int value) {
int tests = getCustomdbTests(); int tests = getCustomdbTests();
assertThat(tests).isEqualTo(value); assertThat(tests).isEqualTo(value);
} }