Skip to content

Update to JUnit5 across all modules #1668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Mar 6, 2021
Merged

Update to JUnit5 across all modules #1668

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bac42ee
Updated saga to JUnit 5
charlesfinley Oct 2, 2020
c988b64
Update fix for CI job in trampoline module
charlesfinley Oct 2, 2020
92ecf55
Updated update-method module to JUnit 5
charlesfinley Oct 2, 2020
7252d02
Merge branch 'master' into feature/junit5-update
ohbus Mar 1, 2021
19c0428
Merge pull request #1 from iluwatar/master
charlesfinley Mar 3, 2021
431d3c5
Upgraded to latest JUnit Jupiter
charlesfinley Mar 3, 2021
416712c
Merge branch 'master' into feature/junit5-update
charlesfinley Mar 3, 2021
73f472c
Reverted change to access modifier on Trampoline
charlesfinley Mar 3, 2021
9b9800a
Cleanup to resolve code smells
charlesfinley Mar 3, 2021
12d148d
Formatting
charlesfinley Mar 4, 2021
3d06a29
Formatting
charlesfinley Mar 4, 2021
2681589
Migrating to JUnit5 and updating some Mockito patterns
charlesfinley Mar 4, 2021
abbd3c8
Migrating to JUnit5
charlesfinley Mar 4, 2021
15ae2f6
Migrating to JUnit5
charlesfinley Mar 4, 2021
28245c5
Migrating to JUnit 5
charlesfinley Mar 5, 2021
47e8380
Merge pull request #2 from iluwatar/master
charlesfinley Mar 5, 2021
c2ccbfd
Formatting cleanup
charlesfinley Mar 5, 2021
3b90bee
Added missing scope for junit
charlesfinley Mar 5, 2021
7b6d597
Fixed tests that were not running previously.
charlesfinley Mar 5, 2021
55d74fe
Merge branch 'master' into feature/junit5-migration
charlesfinley Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Updated saga to JUnit 5
  • Loading branch information
@charlesfinley
charlesfinley committed Oct 2, 2020
commit bac42eef0cf43281fbc8b2a039e4d3cb055c2200
5 changes: 0 additions & 5 deletions saga/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@

<artifactId>saga</artifactId>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion saga/src/test/java/com/iluwatar/saga/choreography/SagaApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
package com.iluwatar.saga.choreography;

import com.iluwatar.saga.orchestration.SagaApplication;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

Expand Down
9 changes: 5 additions & 4 deletions saga/src/test/java/com/iluwatar/saga/choreography/SagaChoreographyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
*/
package com.iluwatar.saga.choreography;

import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* test to check choreography saga
Expand All @@ -38,8 +39,8 @@ public void executeTest() {
var badOrderSaga = service.execute(newSaga("bad_order"));
var goodOrderSaga = service.execute(newSaga("good_order"));

Assert.assertEquals(badOrderSaga.getResult(), Saga.SagaResult.ROLLBACKED);
Assert.assertEquals(goodOrderSaga.getResult(), Saga.SagaResult.FINISHED);
assertEquals(badOrderSaga.getResult(), Saga.SagaResult.ROLLBACKED);
assertEquals(goodOrderSaga.getResult(), Saga.SagaResult.FINISHED);
}

private static Saga newSaga(Object value) {
Expand Down
2 changes: 1 addition & 1 deletion saga/src/test/java/com/iluwatar/saga/orchestration/SagaApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/
package com.iluwatar.saga.orchestration;

import org.junit.Test;
import org.junit.jupiter.api.Test;

/**
* empty test
Expand Down
10 changes: 6 additions & 4 deletions saga/src/test/java/com/iluwatar/saga/orchestration/SagaOrchestratorInternallyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
*/
package com.iluwatar.saga.orchestration;

import org.junit.jupiter.api.Test;

import static com.iluwatar.saga.orchestration.Saga.Result;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.ArrayList;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;

/**
* test to test orchestration logic
Expand All @@ -40,8 +42,8 @@ public class SagaOrchestratorInternallyTest {
public void executeTest() {
var sagaOrchestrator = new SagaOrchestrator(newSaga(), serviceDiscovery());
var result = sagaOrchestrator.execute(1);
Assert.assertEquals(result, Result.ROLLBACK);
Assert.assertArrayEquals(
assertEquals(result, Result.ROLLBACK);
assertArrayEquals(
records.toArray(new String[]{}),
new String[]{"+1", "+2", "+3", "+4", "-4", "-3", "-2", "-1"});
}
Expand Down
9 changes: 5 additions & 4 deletions saga/src/test/java/com/iluwatar/saga/orchestration/SagaOrchestratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
*/
package com.iluwatar.saga.orchestration;

import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* test to check general logic
Expand All @@ -36,8 +37,8 @@ public void execute() {
Saga.Result badOrder = sagaOrchestrator.execute("bad_order");
Saga.Result crashedOrder = sagaOrchestrator.execute("crashed_order");

Assert.assertEquals(badOrder, Saga.Result.ROLLBACK);
Assert.assertEquals(crashedOrder, Saga.Result.CRASHED);
assertEquals(badOrder, Saga.Result.ROLLBACK);
assertEquals(crashedOrder, Saga.Result.CRASHED);
}

private static Saga newSaga() {
Expand Down