Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9034532

Browse files
Updated update-method module to JUnit 5 (iluwatar#1542)
* Updated saga to JUnit 5* Update fix for CI job in trampoline module* Updated update-method module to JUnit 5* Upgraded to latest JUnit JupiterJUnit 4 is not needed when using JUnit-Vintage* Reverted change to access modifier on Trampoline* Cleanup to resolve code smells* Formatting* FormattingCo-authored-by: Subhrodip Mohanta <hello@subho.xyz>
1 parentc3c90e2 commit9034532

File tree

13 files changed

+99
-101
lines changed

13 files changed

+99
-101
lines changed

‎pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<spring-data.version>2.0.14.RELEASE</spring-data.version>
4242
<h2.version>1.4.190</h2.version>
4343
<junit.version>4.12</junit.version>
44-
<junit-jupiter.version>5.5.2</junit-jupiter.version>
45-
<junit-vintage.version>${junit.version}.2</junit-vintage.version>
44+
<junit-jupiter.version>5.7.1</junit-jupiter.version>
45+
<junit-vintage.version>${junit-jupiter.version}</junit-vintage.version>
4646
<sping-test-junit5.version>1.0.2</sping-test-junit5.version>
4747
<compiler.version>3.8.1</compiler.version>
4848
<jacoco.version>0.8.6</jacoco.version>
@@ -274,12 +274,6 @@
274274
<artifactId>camel-stream</artifactId>
275275
<version>${camel.version}</version>
276276
</dependency>
277-
<dependency>
278-
<groupId>junit</groupId>
279-
<artifactId>junit</artifactId>
280-
<version>${junit.version}</version>
281-
<scope>test</scope>
282-
</dependency>
283277
<dependency>
284278
<groupId>org.junit.jupiter</groupId>
285279
<artifactId>junit-jupiter-api</artifactId>

‎saga/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535

3636
<artifactId>saga</artifactId>
3737
<dependencies>
38-
<dependency>
39-
<groupId>junit</groupId>
40-
<artifactId>junit</artifactId>
41-
<scope>test</scope>
42-
</dependency>
4338
<dependency>
4439
<groupId>org.junit.jupiter</groupId>
4540
<artifactId>junit-jupiter-engine</artifactId>

‎saga/src/test/java/com/iluwatar/saga/choreography/SagaApplicationTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,19 @@
2323

2424
packagecom.iluwatar.saga.choreography;
2525

26-
importcom.iluwatar.saga.orchestration.SagaApplication;
27-
importorg.junit.Test;
28-
2926
importstaticorg.junit.jupiter.api.Assertions.assertDoesNotThrow;
3027

28+
importcom.iluwatar.saga.orchestration.SagaApplication;
29+
importorg.junit.jupiter.api.Test;
30+
3131

3232
/***
3333
* empty test
3434
*/
35-
publicclassSagaApplicationTest {
35+
classSagaApplicationTest {
36+
3637
@Test
37-
publicvoidshouldExecuteWithoutException() {
38+
voidshouldExecuteWithoutException() {
3839
assertDoesNotThrow(() ->SagaApplication.main(newString[]{}));
3940
}
40-
}
41+
}

‎saga/src/test/java/com/iluwatar/saga/choreography/SagaChoreographyTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,25 @@
2323

2424
packagecom.iluwatar.saga.choreography;
2525

26-
importorg.junit.Assert;
27-
importorg.junit.Test;
26+
importorg.junit.jupiter.api.Test;
27+
28+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
2829

2930
/**
3031
* test to check choreography saga
3132
*/
32-
publicclassSagaChoreographyTest {
33+
classSagaChoreographyTest {
3334

3435

3536
@Test
36-
publicvoidexecuteTest() {
37+
voidexecuteTest() {
3738
varsd =serviceDiscovery();
3839
varservice =sd.findAny();
3940
varbadOrderSaga =service.execute(newSaga("bad_order"));
4041
vargoodOrderSaga =service.execute(newSaga("good_order"));
4142

42-
Assert.assertEquals(badOrderSaga.getResult(),Saga.SagaResult.ROLLBACKED);
43-
Assert.assertEquals(goodOrderSaga.getResult(),Saga.SagaResult.FINISHED);
43+
assertEquals(Saga.SagaResult.ROLLBACKED,badOrderSaga.getResult());
44+
assertEquals(Saga.SagaResult.FINISHED,goodOrderSaga.getResult());
4445
}
4546

4647
privatestaticSaganewSaga(Objectvalue) {

‎saga/src/test/java/com/iluwatar/saga/orchestration/SagaApplicationTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323

2424
packagecom.iluwatar.saga.orchestration;
2525

26-
importorg.junit.Test;
26+
importorg.junit.jupiter.api.Test;
2727

2828
/**
2929
* empty test
3030
*/
31-
publicclassSagaApplicationTest {
31+
classSagaApplicationTest {
3232

3333
@Test
34-
publicvoidmainTest() {
34+
voidmainTest() {
3535
SagaApplication.main(newString[]{});
3636
}
37-
}
37+
}

‎saga/src/test/java/com/iluwatar/saga/orchestration/SagaOrchestratorInternallyTest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,30 @@
2323

2424
packagecom.iluwatar.saga.orchestration;
2525

26+
importorg.junit.jupiter.api.Test;
27+
2628
importstaticcom.iluwatar.saga.orchestration.Saga.Result;
29+
importstaticorg.junit.jupiter.api.Assertions.assertArrayEquals;
30+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
2731

2832
importjava.util.ArrayList;
2933
importjava.util.List;
30-
importorg.junit.Assert;
31-
importorg.junit.Test;
3234

3335
/**
3436
* test to test orchestration logic
3537
*/
36-
publicclassSagaOrchestratorInternallyTest {
38+
classSagaOrchestratorInternallyTest {
3739

3840
privatefinalList<String>records =newArrayList<>();
3941

4042
@Test
41-
publicvoidexecuteTest() {
43+
voidexecuteTest() {
4244
varsagaOrchestrator =newSagaOrchestrator(newSaga(),serviceDiscovery());
4345
varresult =sagaOrchestrator.execute(1);
44-
Assert.assertEquals(result,Result.ROLLBACK);
45-
Assert.assertArrayEquals(
46-
records.toArray(newString[]{}),
47-
newString[]{"+1","+2","+3","+4","-4","-3","-2","-1"});
46+
assertEquals(Result.ROLLBACK,result);
47+
assertArrayEquals(
48+
newString[]{"+1","+2","+3","+4","-4","-3","-2","-1"},
49+
records.toArray(newString[]{}));
4850
}
4951

5052
privatestaticSaganewSaga() {

‎saga/src/test/java/com/iluwatar/saga/orchestration/SagaOrchestratorTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,23 @@
2323

2424
packagecom.iluwatar.saga.orchestration;
2525

26-
importorg.junit.Assert;
27-
importorg.junit.Test;
26+
importorg.junit.jupiter.api.Test;
27+
28+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
2829

2930
/**
3031
* test to check general logic
3132
*/
32-
publicclassSagaOrchestratorTest {
33+
classSagaOrchestratorTest {
3334

3435
@Test
35-
publicvoidexecute() {
36+
voidexecute() {
3637
SagaOrchestratorsagaOrchestrator =newSagaOrchestrator(newSaga(),serviceDiscovery());
3738
Saga.ResultbadOrder =sagaOrchestrator.execute("bad_order");
3839
Saga.ResultcrashedOrder =sagaOrchestrator.execute("crashed_order");
3940

40-
Assert.assertEquals(badOrder,Saga.Result.ROLLBACK);
41-
Assert.assertEquals(crashedOrder,Saga.Result.CRASHED);
41+
assertEquals(Saga.Result.ROLLBACK,badOrder);
42+
assertEquals(Saga.Result.CRASHED,crashedOrder);
4243
}
4344

4445
privatestaticSaganewSaga() {

‎trampoline/src/main/java/com/iluwatar/trampoline/Trampoline.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public T get() {
9898
returntrampoline(this);
9999
}
100100

101-
privateTtrampoline(finalTrampoline<T>trampoline) {
101+
Ttrampoline(finalTrampoline<T>trampoline) {
102102
returnStream.iterate(trampoline,Trampoline::jump)
103103
.filter(Trampoline::complete)
104104
.findFirst()

‎update-method/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535

3636
<artifactId>update-method</artifactId>
3737
<dependencies>
38-
<dependency>
39-
<groupId>junit</groupId>
40-
<artifactId>junit</artifactId>
41-
</dependency>
4238
<dependency>
4339
<groupId>org.junit.jupiter</groupId>
4440
<artifactId>junit-jupiter-engine</artifactId>

‎update-method/src/test/java/com/iluwatar/updatemethod/AppTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323

2424
packagecom.iluwatar.updatemethod;
2525

26-
importorg.junit.Test;
26+
importorg.junit.jupiter.api.Test;
2727

2828
importstaticorg.junit.jupiter.api.Assertions.assertDoesNotThrow;
2929

30-
publicclassAppTest {
30+
classAppTest {
3131

3232
@Test
33-
publicvoidshouldExecuteApplicationWithoutException() {
33+
voidshouldExecuteApplicationWithoutException() {
3434
assertDoesNotThrow(() ->App.main(newString[]{}));
3535
}
3636
}

‎update-method/src/test/java/com/iluwatar/updatemethod/SkeletonTest.java

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,56 +23,60 @@
2323

2424
packagecom.iluwatar.updatemethod;
2525

26-
importorg.junit.After;
27-
importorg.junit.Assert;
28-
importorg.junit.Before;
29-
importorg.junit.Test;
26+
importorg.junit.jupiter.api.AfterAll;
27+
importorg.junit.jupiter.api.BeforeAll;
28+
importorg.junit.jupiter.api.Test;
3029

31-
publicclassSkeletonTest {
30+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
31+
importstaticorg.junit.jupiter.api.Assertions.assertFalse;
32+
importstaticorg.junit.jupiter.api.Assertions.assertTrue;
3233

33-
privateSkeletonskeleton;
3434

35-
@Before
36-
publicvoidsetup() {
35+
classSkeletonTest {
36+
37+
privatestaticSkeletonskeleton;
38+
39+
@BeforeAll
40+
publicstaticvoidsetup() {
3741
skeleton =newSkeleton(1);
3842
}
3943

40-
@After
41-
publicvoidtearDown() {
44+
@AfterAll
45+
publicstaticvoidtearDown() {
4246
skeleton =null;
4347
}
4448

4549
@Test
46-
publicvoidtestUpdateForPatrollingLeft() {
50+
voidtestUpdateForPatrollingLeft() {
4751
skeleton.patrollingLeft =true;
4852
skeleton.setPosition(50);
4953
skeleton.update();
50-
Assert.assertEquals(49,skeleton.getPosition());
54+
assertEquals(49,skeleton.getPosition());
5155
}
5256

5357
@Test
54-
publicvoidtestUpdateForPatrollingRight() {
58+
voidtestUpdateForPatrollingRight() {
5559
skeleton.patrollingLeft =false;
5660
skeleton.setPosition(50);
5761
skeleton.update();
58-
Assert.assertEquals(51,skeleton.getPosition());
62+
assertEquals(51,skeleton.getPosition());
5963
}
6064

6165
@Test
62-
publicvoidtestUpdateForReverseDirectionFromLeftToRight() {
66+
voidtestUpdateForReverseDirectionFromLeftToRight() {
6367
skeleton.patrollingLeft =true;
6468
skeleton.setPosition(1);
6569
skeleton.update();
66-
Assert.assertEquals(0,skeleton.getPosition());
67-
Assert.assertEquals(false,skeleton.patrollingLeft);
70+
assertEquals(0,skeleton.getPosition());
71+
assertFalse(skeleton.patrollingLeft);
6872
}
6973

7074
@Test
71-
publicvoidtestUpdateForReverseDirectionFromRightToLeft() {
75+
voidtestUpdateForReverseDirectionFromRightToLeft() {
7276
skeleton.patrollingLeft =false;
7377
skeleton.setPosition(99);
7478
skeleton.update();
75-
Assert.assertEquals(100,skeleton.getPosition());
76-
Assert.assertEquals(true,skeleton.patrollingLeft);
79+
assertEquals(100,skeleton.getPosition());
80+
assertTrue(skeleton.patrollingLeft);
7781
}
7882
}

‎update-method/src/test/java/com/iluwatar/updatemethod/StatueTest.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,37 @@
2323

2424
packagecom.iluwatar.updatemethod;
2525

26-
importorg.junit.After;
27-
importorg.junit.Assert;
28-
importorg.junit.Before;
29-
importorg.junit.Test;
26+
importorg.junit.jupiter.api.AfterAll;
27+
importorg.junit.jupiter.api.BeforeAll;
28+
importorg.junit.jupiter.api.Test;
3029

31-
publicclassStatueTest {
30+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
3231

33-
privateStatuestatue;
32+
classStatueTest {
3433

35-
@Before
36-
publicvoidsetup() {
34+
privatestaticStatuestatue;
35+
36+
@BeforeAll
37+
publicstaticvoidsetup() {
3738
statue =newStatue(1,20);
3839
}
3940

40-
@After
41-
publicvoidtearDown() {
41+
@AfterAll
42+
publicstaticvoidtearDown() {
4243
statue =null;
4344
}
4445

4546
@Test
46-
publicvoidtestUpdateForPendingShoot() {
47+
voidtestUpdateForPendingShoot() {
4748
statue.frames =10;
4849
statue.update();
49-
Assert.assertEquals(11,statue.frames);
50+
assertEquals(11,statue.frames);
5051
}
5152

5253
@Test
53-
publicvoidtestUpdateForShooting() {
54+
voidtestUpdateForShooting() {
5455
statue.frames =19;
5556
statue.update();
56-
Assert.assertEquals(0,statue.frames);
57+
assertEquals(0,statue.frames);
5758
}
5859
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp