From 23882acf976c249d17345ebd8ba8f6494ce544c9 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 1 Nov 2021 10:37:18 +0100 Subject: [PATCH] Remove dependency on JUnit 4 Closes gh-1879 --- .../samples/integrationtest/withgroovy/build.gradle | 6 ++++-- .../samples/integrationtest/withjava/build.gradle | 4 +++- .../src/integration-test/java/sample/TheTest.java | 2 +- .../samples/integrationtest/withpropdeps/build.gradle | 6 ++++-- .../src/integration-test/java/sample/TheTest.java | 2 +- .../src/test/resources/samples/jacoco/java/build.gradle | 6 ++++-- .../jacoco/java/src/test/java/sample/TheClassTest.java | 8 ++++---- .../samples/maven/install-with-springio/build.gradle | 4 +++- .../src/test/resources/samples/maven/install/build.gradle | 4 +++- .../src/test/resources/samples/maven/signing/build.gradle | 4 +++- .../src/test/resources/samples/maven/upload/build.gradle | 4 +++- .../resources/samples/testsconfiguration/web/build.gradle | 6 ++++-- .../web/src/test/java/sample/DependencyTest.java | 2 +- gradle/dependency-management.gradle | 1 - 14 files changed, 38 insertions(+), 21 deletions(-) diff --git a/buildSrc/src/test/resources/samples/integrationtest/withgroovy/build.gradle b/buildSrc/src/test/resources/samples/integrationtest/withgroovy/build.gradle index d5dd6923..b6f921f7 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withgroovy/build.gradle +++ b/buildSrc/src/test/resources/samples/integrationtest/withgroovy/build.gradle @@ -10,7 +10,9 @@ repositories { } dependencies { - testCompile 'junit:junit:4.12' + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' testCompile 'org.spockframework:spock-core:1.0-groovy-2.4' integrationTestCompile 'org.springframework:spring-core:4.3.7.RELEASE' -} \ No newline at end of file +} diff --git a/buildSrc/src/test/resources/samples/integrationtest/withjava/build.gradle b/buildSrc/src/test/resources/samples/integrationtest/withjava/build.gradle index 69fe9fa8..9b7ca1b5 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withjava/build.gradle +++ b/buildSrc/src/test/resources/samples/integrationtest/withjava/build.gradle @@ -9,6 +9,8 @@ repositories { } dependencies { - testCompile 'junit:junit:4.12' + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' integrationTestCompile 'org.springframework:spring-core:4.3.7.RELEASE' } \ No newline at end of file diff --git a/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTest.java b/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTest.java index dc82588c..9c0a6b56 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTest.java +++ b/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTest.java @@ -1,6 +1,6 @@ package sample; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.Ordered; public class TheTest { diff --git a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle index 732278d0..cc4b661e 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle +++ b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle @@ -10,5 +10,7 @@ repositories { dependencies { optional 'javax.servlet:javax.servlet-api:3.1.0' - testCompile 'junit:junit:4.12' -} \ No newline at end of file + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' +} diff --git a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTest.java b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTest.java index de492ca0..0a3761ba 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTest.java +++ b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTest.java @@ -1,6 +1,6 @@ package sample; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.servlet.http.HttpServletRequest; public class TheTest { diff --git a/buildSrc/src/test/resources/samples/jacoco/java/build.gradle b/buildSrc/src/test/resources/samples/jacoco/java/build.gradle index f70cc9a7..1369c864 100644 --- a/buildSrc/src/test/resources/samples/jacoco/java/build.gradle +++ b/buildSrc/src/test/resources/samples/jacoco/java/build.gradle @@ -9,5 +9,7 @@ repositories { } dependencies { - testCompile 'junit:junit:4.12' -} \ No newline at end of file + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' +} diff --git a/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTest.java b/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTest.java index 5e1c64bb..42bf38da 100644 --- a/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTest.java +++ b/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTest.java @@ -1,19 +1,19 @@ package sample; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TheClassTest { TheClass theClass = new TheClass(); @Test public void doStuffWhenTrueThenTrue() { - assertTrue(theClass.doStuff(true)); + assertThat(theClass.doStuff(true)).isTrue(); } @Test public void doStuffWhenTrueThenFalse() { - assertFalse(theClass.doStuff(false)); + assertThat(theClass.doStuff(false)).isFalse(); } } \ No newline at end of file diff --git a/buildSrc/src/test/resources/samples/maven/install-with-springio/build.gradle b/buildSrc/src/test/resources/samples/maven/install-with-springio/build.gradle index b4784e44..a7466a07 100644 --- a/buildSrc/src/test/resources/samples/maven/install-with-springio/build.gradle +++ b/buildSrc/src/test/resources/samples/maven/install-with-springio/build.gradle @@ -7,6 +7,8 @@ repositories { } dependencies { - testCompile 'junit:junit:4.12' + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' compile 'org.springframework:spring-core' } \ No newline at end of file diff --git a/buildSrc/src/test/resources/samples/maven/install/build.gradle b/buildSrc/src/test/resources/samples/maven/install/build.gradle index 4847d7f2..74d5c24b 100644 --- a/buildSrc/src/test/resources/samples/maven/install/build.gradle +++ b/buildSrc/src/test/resources/samples/maven/install/build.gradle @@ -9,6 +9,8 @@ repositories { } dependencies { - testCompile 'junit:junit:4.12' + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' optional 'aopalliance:aopalliance:1.0' } \ No newline at end of file diff --git a/buildSrc/src/test/resources/samples/maven/signing/build.gradle b/buildSrc/src/test/resources/samples/maven/signing/build.gradle index 7460119f..81e39a7f 100644 --- a/buildSrc/src/test/resources/samples/maven/signing/build.gradle +++ b/buildSrc/src/test/resources/samples/maven/signing/build.gradle @@ -11,6 +11,8 @@ repositories { } dependencies { - testCompile 'junit:junit:4.12' + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' optional 'aopalliance:aopalliance:1.0' } \ No newline at end of file diff --git a/buildSrc/src/test/resources/samples/maven/upload/build.gradle b/buildSrc/src/test/resources/samples/maven/upload/build.gradle index fb36fc6f..cf2f126c 100644 --- a/buildSrc/src/test/resources/samples/maven/upload/build.gradle +++ b/buildSrc/src/test/resources/samples/maven/upload/build.gradle @@ -7,7 +7,9 @@ repositories { } dependencies { - testCompile 'junit:junit:4.12' + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' optional 'aopalliance:aopalliance:1.0' } diff --git a/buildSrc/src/test/resources/samples/testsconfiguration/web/build.gradle b/buildSrc/src/test/resources/samples/testsconfiguration/web/build.gradle index 51609102..863efe01 100644 --- a/buildSrc/src/test/resources/samples/testsconfiguration/web/build.gradle +++ b/buildSrc/src/test/resources/samples/testsconfiguration/web/build.gradle @@ -6,5 +6,7 @@ repositories { dependencies { testImplementation project(path: ':core', configuration: 'tests') - testImplementation 'junit:junit:4.12' -} \ No newline at end of file + testImplementation platform('org.junit:junit-bom:5.8.1') + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testImplementation 'org.junit.jupiter:junit-jupiter-engine' +} diff --git a/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTest.java b/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTest.java index 8c378643..38ed6ef1 100644 --- a/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTest.java +++ b/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTest.java @@ -1,6 +1,6 @@ package sample; -import org.junit.*; +import org.junit.jupiter.api.Test; public class DependencyTest { @Test diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 2258d31c..b8e07dd7 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -27,7 +27,6 @@ dependencyManagement { dependency 'io.lettuce:lettuce-core:6.1.5.RELEASE' dependency 'javax.annotation:javax.annotation-api:1.3.2' dependency 'javax.servlet:javax.servlet-api:4.0.1' - dependency 'junit:junit:4.13.2' dependency 'mysql:mysql-connector-java:8.0.26' dependency 'org.apache.derby:derby:10.14.2.0' dependency 'org.assertj:assertj-core:3.21.0'