diff --git a/build.gradle b/build.gradle index 8044c5e..8f30863 100644 --- a/build.gradle +++ b/build.gradle @@ -35,12 +35,18 @@ subprojects { } } + test { + useJUnitPlatform() + } + // Standard libraries added to all projects dependencies { errorprone(libs.errorprone.core) compileOnly libs.errorprone.annotations - testImplementation libs.junit + testImplementation(platform(libs.junit.bom)) + testImplementation libs.junit.jupiter + testRuntimeOnly libs.junit.platform.launcher } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c0ffe88..0418b26 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] jackson = "2.18.2" +junit = "5.11.3" retrofit = "2.11.0" dropwizard = "4.0.11" errorprone = "2.36.0" @@ -25,7 +26,9 @@ dropwizard-swagger = { module = "com.smoketurner:dropwizard-swagger", version = jersey-media-sse = { module = "org.glassfish.jersey.media:jersey-media-sse", version = "3.1.9" } jdbf = { module = "com.github.spyhunter99:jdbf", version = "2.2.4" } -junit = { module = "junit:junit", version = "4.13.2" } +junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" } +junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" } [bundles] jackson = ["jackson-bind", "jackson-yaml", "jackson-xml", "jackson-jsr310", "jackson-jdk8"] diff --git a/verkeersdrukte/src/test/java/nl/bertriksikken/datex2/MeasuredDataPublicationTest.java b/verkeersdrukte/src/test/java/nl/bertriksikken/datex2/MeasuredDataPublicationTest.java index 0313ef3..40f3b71 100644 --- a/verkeersdrukte/src/test/java/nl/bertriksikken/datex2/MeasuredDataPublicationTest.java +++ b/verkeersdrukte/src/test/java/nl/bertriksikken/datex2/MeasuredDataPublicationTest.java @@ -1,7 +1,7 @@ package nl.bertriksikken.datex2; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +21,7 @@ public void test() throws IOException { LOG.info("Start parsing..."); measuredDataPublication = MeasuredDataPublication.parse(gzis); } - Assert.assertFalse(measuredDataPublication.getSiteMeasurementsList().isEmpty()); + Assertions.assertFalse(measuredDataPublication.getSiteMeasurementsList().isEmpty()); LOG.info("Got {} elements", measuredDataPublication.getSiteMeasurementsList().size()); } diff --git a/verkeersdrukte/src/test/java/nl/bertriksikken/shapefile/ShapeFileReaderTest.java b/verkeersdrukte/src/test/java/nl/bertriksikken/shapefile/ShapeFileReaderTest.java index fc34765..90bc96e 100644 --- a/verkeersdrukte/src/test/java/nl/bertriksikken/shapefile/ShapeFileReaderTest.java +++ b/verkeersdrukte/src/test/java/nl/bertriksikken/shapefile/ShapeFileReaderTest.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import nl.bertriksikken.geojson.FeatureCollection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; diff --git a/verkeersdrukte/src/test/java/nl/bertriksikken/verkeersdrukte/ndw/FileResponseTest.java b/verkeersdrukte/src/test/java/nl/bertriksikken/verkeersdrukte/ndw/FileResponseTest.java index a9cb90d..e1053ef 100644 --- a/verkeersdrukte/src/test/java/nl/bertriksikken/verkeersdrukte/ndw/FileResponseTest.java +++ b/verkeersdrukte/src/test/java/nl/bertriksikken/verkeersdrukte/ndw/FileResponseTest.java @@ -1,7 +1,7 @@ package nl.bertriksikken.verkeersdrukte.ndw; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.time.Instant; import java.util.List; @@ -15,9 +15,9 @@ public void test() { Map> headers = Map.of("Last-Modified", List.of("Tue, 3 Jun 2008 11:05:30 GMT")); FileResponse response = FileResponse.create(200, headers, contents); - Assert.assertArrayEquals(contents, response.getContents()); + Assertions.assertArrayEquals(contents, response.getContents()); Instant lastModified = response.getLastModified(); - Assert.assertNotNull(lastModified); + Assertions.assertNotNull(lastModified); } }