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

Commit41b4abe

Browse files
authored
Updated the project to use JUnit 5 instead of JUnit 4 (fishercoder1534#185)
1 parent440b096 commit41b4abe

File tree

1,116 files changed

+5504
-5508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,116 files changed

+5504
-5508
lines changed

‎build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ dependencies {
3131
compile'com.google.code.gson:gson:2.8.0'
3232
compilegroup:'org.apache.commons',name:'commons-collections4',version:'4.0'
3333

34-
// TODO: to remove Junit4 after all tests are migrated to Junit5
35-
compile'junit:junit:4.13'
36-
testCompile"junit:junit:4.13.1"
37-
3834
testImplementation'org.junit.jupiter:junit-jupiter-api:5.8.1'
3935
testRuntimeOnly'org.junit.jupiter:junit-jupiter-engine:5.8.1'
4036

‎src/test/java/com/fishercoder/firstthousand/_100Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
importcom.fishercoder.common.classes.TreeNode;
44
importcom.fishercoder.common.utils.TreeUtils;
55
importcom.fishercoder.solutions.firstthousand._100;
6-
importorg.junit.BeforeClass;
7-
importorg.junit.Test;
6+
importorg.junit.jupiter.api.BeforeEach;
7+
importorg.junit.jupiter.api.Test;
88

99
importjava.util.Arrays;
1010

11-
importstaticorg.junit.Assert.assertEquals;
11+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
1212

1313
publicclass_100Test {
14-
privatestatic_100.Solution1solution1;
14+
private_100.Solution1solution1;
1515
privatestaticTreeNodep;
1616
privatestaticTreeNodeq;
1717

18-
@BeforeClass
19-
publicstaticvoidsetup() {
18+
@BeforeEach
19+
publicvoidsetup() {
2020
solution1 =new_100.Solution1();
2121
}
2222

‎src/test/java/com/fishercoder/firstthousand/_101Test.java

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

77
importjava.util.Arrays;
88

9-
importorg.junit.BeforeClass;
10-
importorg.junit.Test;
9+
importorg.junit.jupiter.api.BeforeEach;
10+
importorg.junit.jupiter.api.Test;
1111

12-
importstaticorg.junit.Assert.assertEquals;
12+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
1313

1414
publicclass_101Test {
15-
privatestatic_101.Solution1solution1;
16-
privatestatic_101.Solution2solution2;
15+
private_101.Solution1solution1;
16+
private_101.Solution2solution2;
1717
privatestaticTreeNoderoot;
1818

19-
@BeforeClass
20-
publicstaticvoidsetup() {
19+
@BeforeEach
20+
publicvoidsetup() {
2121
solution1 =new_101.Solution1();
2222
solution2 =new_101.Solution2();
2323
}

‎src/test/java/com/fishercoder/firstthousand/_102Test.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
importcom.fishercoder.common.utils.CommonUtils;
55
importcom.fishercoder.common.utils.TreeUtils;
66
importcom.fishercoder.solutions.firstthousand._102;
7-
importorg.junit.BeforeClass;
8-
importorg.junit.Test;
7+
importorg.junit.jupiter.api.BeforeEach;
8+
importorg.junit.jupiter.api.Test;
99

1010
importjava.util.Arrays;
1111

1212
publicclass_102Test {
13-
privatestatic_102.Solution1solution1;
13+
private_102.Solution1solution1;
1414
privatestaticTreeNodetreeRoot;
1515

16-
@BeforeClass
17-
publicstaticvoidsetup() {
16+
@BeforeEach
17+
publicvoidsetup() {
1818
solution1 =new_102.Solution1();
1919
}
2020

‎src/test/java/com/fishercoder/firstthousand/_103Test.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
importcom.fishercoder.common.utils.CommonUtils;
55
importcom.fishercoder.common.utils.TreeUtils;
66
importcom.fishercoder.solutions.firstthousand._103;
7-
importorg.junit.BeforeClass;
8-
importorg.junit.Test;
7+
importorg.junit.jupiter.api.BeforeEach;
8+
importorg.junit.jupiter.api.Test;
99

1010
importjava.util.Arrays;
1111

1212
publicclass_103Test {
13-
privatestatic_103.Solution1solution1;
13+
private_103.Solution1solution1;
1414
privatestaticTreeNoderoot;
1515

16-
@BeforeClass
17-
publicstaticvoidsetup() {
16+
@BeforeEach
17+
publicvoidsetup() {
1818
solution1 =new_103.Solution1();
1919
}
2020

‎src/test/java/com/fishercoder/firstthousand/_104Test.java

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

77
importjava.util.Arrays;
88

9-
importorg.junit.BeforeClass;
10-
importorg.junit.Test;
9+
importorg.junit.jupiter.api.BeforeEach;
10+
importorg.junit.jupiter.api.Test;
1111

12-
importstaticorg.junit.Assert.assertEquals;
12+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
1313

1414
publicclass_104Test {
15-
privatestatic_104.Solution1solution1;
16-
privatestatic_104.Solution2solution2;
15+
private_104.Solution1solution1;
16+
private_104.Solution2solution2;
1717
privatestaticTreeNoderoot;
1818

19-
@BeforeClass
20-
publicstaticvoidsetup() {
19+
@BeforeEach
20+
publicvoidsetup() {
2121
solution1 =new_104.Solution1();
2222
solution2 =new_104.Solution2();
2323
}

‎src/test/java/com/fishercoder/firstthousand/_105Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66

77
importjava.util.Arrays;
88

9-
importorg.junit.BeforeClass;
10-
importorg.junit.Test;
9+
importorg.junit.jupiter.api.BeforeEach;
10+
importorg.junit.jupiter.api.Test;
1111

12-
importstaticjunit.framework.Assert.assertEquals;
12+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
1313

1414
publicclass_105Test {
15-
privatestatic_105.Solution1solution1;
15+
private_105.Solution1solution1;
1616
privatestaticTreeNodeexpected;
1717
privatestaticTreeNodeactual;
1818
privatestaticint[]preorder;
1919
privatestaticint[]inorder;
2020

21-
@BeforeClass
22-
publicstaticvoidsetup() {
21+
@BeforeEach
22+
publicvoidsetup() {
2323
solution1 =new_105.Solution1();
2424
}
2525

‎src/test/java/com/fishercoder/firstthousand/_106Test.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
importcom.fishercoder.common.classes.TreeNode;
44
importcom.fishercoder.common.utils.TreeUtils;
55
importcom.fishercoder.solutions.firstthousand._106;
6-
importorg.junit.BeforeClass;
7-
importorg.junit.Test;
6+
importorg.junit.jupiter.api.BeforeEach;
7+
importorg.junit.jupiter.api.Test;
88

99
importjava.util.Arrays;
1010

11-
importstaticjunit.framework.Assert.assertEquals;
11+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
1212

1313
publicclass_106Test {
14-
privatestatic_106.Solution1solution1;
15-
privatestatic_106.Solution2solution2;
14+
private_106.Solution1solution1;
15+
private_106.Solution2solution2;
1616
privatestaticTreeNodeexpected;
1717
privatestaticTreeNodeactual;
1818
privatestaticint[]inorder;
1919
privatestaticint[]postorder;
2020

21-
@BeforeClass
22-
publicstaticvoidsetup() {
21+
@BeforeEach
22+
publicvoidsetup() {
2323
solution1 =new_106.Solution1();
2424
solution2 =new_106.Solution2();
2525
}

‎src/test/java/com/fishercoder/firstthousand/_107Test.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
importcom.fishercoder.common.utils.CommonUtils;
55
importcom.fishercoder.common.utils.TreeUtils;
66
importcom.fishercoder.solutions.firstthousand._107;
7-
importorg.junit.BeforeClass;
8-
importorg.junit.Test;
7+
importorg.junit.jupiter.api.BeforeEach;
8+
importorg.junit.jupiter.api.Test;
99

1010
importjava.util.Arrays;
1111

1212
publicclass_107Test {
13-
privatestatic_107.Solution1solution1;
13+
private_107.Solution1solution1;
1414
privatestaticTreeNoderoot;
1515

16-
@BeforeClass
17-
publicstaticvoidsetup() {
16+
@BeforeEach
17+
publicvoidsetup() {
1818
solution1 =new_107.Solution1();
1919
}
2020

‎src/test/java/com/fishercoder/firstthousand/_108Test.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
importcom.fishercoder.common.utils.TreeUtils;
44
importcom.fishercoder.solutions.firstthousand._108;
5-
importorg.junit.BeforeClass;
6-
importorg.junit.Test;
5+
importorg.junit.jupiter.api.BeforeEach;
6+
importorg.junit.jupiter.api.Test;
77

88
publicclass_108Test {
9-
privatestatic_108.Solution1solution1;
9+
private_108.Solution1solution1;
1010
privatestaticint[]nums;
1111

12-
@BeforeClass
13-
publicstaticvoidsetup() {
12+
@BeforeEach
13+
publicvoidsetup() {
1414
solution1 =new_108.Solution1();
1515
}
1616

‎src/test/java/com/fishercoder/firstthousand/_109Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
importjava.util.Arrays;
1212

1313
publicclass_109Test {
14-
privatestatic_109.Solution1solution1;
14+
private_109.Solution1solution1;
1515
privatestaticListNodehead;
1616
privatestaticTreeNodeexpected;
1717

‎src/test/java/com/fishercoder/firstthousand/_10Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
88

99
publicclass_10Test {
10-
privatestatic_10.Solution1solution1;
10+
private_10.Solution1solution1;
1111

1212
@BeforeEach
1313
publicvoidsetup() {

‎src/test/java/com/fishercoder/firstthousand/_110Test.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
importcom.fishercoder.common.classes.TreeNode;
44
importcom.fishercoder.common.utils.TreeUtils;
55
importcom.fishercoder.solutions.firstthousand._110;
6-
importorg.junit.BeforeClass;
7-
importorg.junit.Test;
6+
importorg.junit.jupiter.api.BeforeEach;
7+
importorg.junit.jupiter.api.Test;
88

99
importjava.util.Arrays;
1010

11-
importstaticorg.junit.Assert.assertEquals;
11+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
1212

1313
publicclass_110Test {
14-
privatestatic_110.Solution1solution1;
15-
privatestatic_110.Solution2solution2;
14+
private_110.Solution1solution1;
15+
private_110.Solution2solution2;
1616
privatestaticTreeNodetreeNode;
1717

18-
@BeforeClass
19-
publicstaticvoidsetup() {
18+
@BeforeEach
19+
publicvoidsetup() {
2020
solution1 =new_110.Solution1();
2121
solution2 =new_110.Solution2();
2222
}

‎src/test/java/com/fishercoder/firstthousand/_113Test.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
importcom.fishercoder.common.classes.TreeNode;
44
importcom.fishercoder.common.utils.TreeUtils;
55
importcom.fishercoder.solutions.firstthousand._113;
6-
importorg.junit.BeforeClass;
7-
importorg.junit.Test;
6+
importorg.junit.jupiter.api.BeforeEach;
7+
importorg.junit.jupiter.api.Test;
88

99
importjava.util.ArrayList;
1010
importjava.util.Arrays;
1111
importjava.util.List;
1212

13-
importstaticorg.junit.Assert.assertEquals;
13+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
1414

1515
publicclass_113Test {
16-
privatestatic_113.Solution1solution1;
17-
privatestatic_113.Solution2solution2;
16+
private_113.Solution1solution1;
17+
private_113.Solution2solution2;
1818
privatestaticTreeNoderoot;
1919
privatestaticintsum;
2020
privatestaticList<List<Integer>>expected;
2121

22-
@BeforeClass
23-
publicstaticvoidsetup() {
22+
@BeforeEach
23+
publicvoidsetup() {
2424
solution1 =new_113.Solution1();
2525
solution2 =new_113.Solution2();
2626
}

‎src/test/java/com/fishercoder/firstthousand/_114Test.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
importcom.fishercoder.common.classes.TreeNode;
44
importcom.fishercoder.common.utils.TreeUtils;
55
importcom.fishercoder.solutions.firstthousand._114;
6-
importorg.junit.BeforeClass;
7-
importorg.junit.Test;
6+
importorg.junit.jupiter.api.BeforeEach;
7+
importorg.junit.jupiter.api.Test;
88

99
importjava.util.Arrays;
1010

1111
publicclass_114Test {
12-
privatestatic_114.Solution1solution1;
12+
private_114.Solution1solution1;
1313
privatestaticTreeNoderoot;
1414

15-
@BeforeClass
16-
publicstaticvoidsetup() {
15+
@BeforeEach
16+
publicvoidsetUp() {
1717
solution1 =new_114.Solution1();
1818
}
1919

‎src/test/java/com/fishercoder/firstthousand/_115Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
packagecom.fishercoder.firstthousand;
22

33
importcom.fishercoder.solutions.firstthousand._115;
4-
importorg.junit.BeforeClass;
5-
importorg.junit.Test;
4+
importorg.junit.jupiter.api.BeforeEach;
5+
importorg.junit.jupiter.api.Test;
66

7-
importstaticorg.junit.Assert.assertEquals;
7+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
88

99
publicclass_115Test {
10-
privatestatic_115.Solution1solution1;
10+
private_115.Solution1solution1;
1111

12-
@BeforeClass
13-
publicstaticvoidsetup() {
12+
@BeforeEach
13+
publicvoidsetUp() {
1414
solution1 =new_115.Solution1();
1515
}
1616

‎src/test/java/com/fishercoder/firstthousand/_116Test.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
importorg.junit.jupiter.api.Test;
66

77
publicclass_116Test {
8-
privatestatic_116.Solution1solution1;
9-
privatestatic_116.Solution2solution2;
10-
privatestatic_116.Noderoot;
8+
private_116.Solution1solution1;
9+
private_116.Solution2solution2;
10+
private_116.Noderoot;
1111

1212
@BeforeEach
1313
publicvoidsetup() {

‎src/test/java/com/fishercoder/firstthousand/_117Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
packagecom.fishercoder.firstthousand;
22

33
importcom.fishercoder.solutions.firstthousand._117;
4-
importorg.junit.BeforeClass;
5-
importorg.junit.Test;
4+
importorg.junit.jupiter.api.BeforeEach;
5+
importorg.junit.jupiter.api.Test;
66

77
publicclass_117Test {
8-
privatestatic_117.Solution1solution1;
9-
privatestatic_117.Noderoot;
8+
private_117.Solution1solution1;
9+
private_117.Noderoot;
1010

11-
@BeforeClass
12-
publicstaticvoidsetup() {
11+
@BeforeEach
12+
publicvoidsetup() {
1313
solution1 =new_117.Solution1();
1414
}
1515

0 commit comments

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