Skip to content

Commit 474a49c

Browse files
mperrymperry
committed
Upgrade Junit to 4.13.2, fixed deprecations. Update gradle-versions-plugin, junit-vintage-engine
1 parent 3c254bb commit 474a49c

28 files changed

Lines changed: 31 additions & 32 deletions

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212

1313
dependencies {
14-
classpath "com.github.ben-manes:gradle-versions-plugin:0.27.0"
14+
classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
1515
classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0"
1616
}
1717

@@ -46,7 +46,7 @@ allprojects {
4646

4747
snapshotAppendix = "-SNAPSHOT"
4848
fjVersion = fjBaseVersion + (isSnapshot ? snapshotAppendix : "")
49-
fjConsumeVersion = "4.9"
49+
fjConsumeVersion = "5.0"
5050

5151
signModule = false
5252

@@ -66,8 +66,8 @@ allprojects {
6666
sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
6767
primaryEmail = "functionaljava@googlegroups.com"
6868

69-
junitCompile = "junit:junit:4.12"
70-
junitRuntime = "org.junit.vintage:junit-vintage-engine:5.5.2"
69+
junitCompile = "junit:junit:4.13.2"
70+
junitRuntime = "org.junit.vintage:junit-vintage-engine:5.8.2"
7171

7272
displayCompilerWarnings = true
7373
generateTestReports = false

‎core/src/test/java/fj/ClassTest.java‎

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

1313
import static org.hamcrest.core.Is.is;
14-
import static org.junit.Assert.assertThat;
14+
import static org.hamcrest.MatcherAssert.assertThat;
1515

1616
public class ClassTest {
1717
@Test

‎core/src/test/java/fj/DigitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import static fj.data.Array.range;
77
import static org.hamcrest.core.Is.is;
8-
import static org.junit.Assert.assertThat;
8+
import static org.hamcrest.MatcherAssert.assertThat;
99

1010
public class DigitTest {
1111
@Test

‎core/src/test/java/fj/MonoidTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import static fj.data.Option.some;
1010
import static org.hamcrest.core.Is.is;
11-
import static org.junit.Assert.assertThat;
11+
import static org.hamcrest.MatcherAssert.assertThat;
1212

1313
public class MonoidTest {
1414

‎core/src/test/java/fj/TryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.junit.Test;
66

77
import static org.hamcrest.core.Is.is;
8-
import static org.junit.Assert.assertThat;
8+
import static org.hamcrest.MatcherAssert.assertThat;
99

1010
public class TryTest {
1111

‎core/src/test/java/fj/control/db/TestDbState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.sql.*;
1010

1111
import static org.hamcrest.core.Is.is;
12-
import static org.junit.Assert.assertThat;
12+
import static org.hamcrest.MatcherAssert.assertThat;
1313

1414
public class TestDbState {
1515
@Test

‎core/src/test/java/fj/data/ArrayTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import static org.hamcrest.CoreMatchers.equalTo;
77
import static org.hamcrest.CoreMatchers.instanceOf;
8-
import static org.junit.Assert.assertThat;
8+
import static org.hamcrest.MatcherAssert.assertThat;
99

1010
public class ArrayTest {
1111

‎core/src/test/java/fj/data/DListTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import static fj.data.DList.*;
66
import static org.hamcrest.core.Is.is;
7-
import static org.junit.Assert.assertThat;
7+
import static org.hamcrest.MatcherAssert.assertThat;
88

99
public class DListTest {
1010
@Test

‎core/src/test/java/fj/data/LazyStringTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import static org.hamcrest.CoreMatchers.equalTo;
66
import static org.hamcrest.CoreMatchers.is;
7-
import static org.junit.Assert.assertThat;
7+
import static org.hamcrest.MatcherAssert.assertThat;
88

99
public class LazyStringTest {
1010

‎core/src/test/java/fj/data/ListBufferTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.junit.Test;
44

55
import static org.hamcrest.CoreMatchers.equalTo;
6-
import static org.junit.Assert.assertThat;
6+
import static org.hamcrest.MatcherAssert.assertThat;
77

88
public class ListBufferTest {
99

0 commit comments

Comments
 (0)