Migrate to JUnit 5

Author: jericks

pom.xml

@@ -335,9 +335,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/test/groovy/geoscript/AssertUtil.groovy

@@ -1,7 +1,7 @@
 package geoscript
 
 import geoscript.geom.Bounds
-import static org.junit.Assert.*
+import static org.junit.jupiter.api.Assertions.*
 
 /**
  * A collection of assertion utilities.
@@ -17,7 +17,7 @@ class AssertUtil {
         StringReader actualReader = new StringReader(actual)
         List<String> expectedLines = expectedReader.readLines()
         List<String> actualLines = actualReader.readLines()
-        assertEquals("The number of lines should be equal", expectedLines.size(), actualLines.size())
+        assertEquals(expectedLines.size(), actualLines.size(), "The number of lines should be equal")
         expectedLines.eachWithIndex { String exp, int i ->
             String act = actualLines[i]
             if (trim) {
@@ -32,7 +32,7 @@ class AssertUtil {
                 println "Expected: ${exp}"
                 println "Actual  : ${act}"
             }
-            assertEquals("Lines should match", exp, act)
+            assertEquals(exp, act, "Lines should match")
         }
     }
 

src/test/groovy/geoscript/FileUtil.groovy

@@ -0,0 +1,11 @@
+package geoscript
+
+class FileUtil {
+
+    static File createDir(File dir, String name) {
+        File file = new File(dir, name)
+        file.mkdir()
+        file
+    }
+
+}

…roovy/geoscript/GeoScriptTestCase.groovy …st/groovy/geoscript/GeoScriptTest.groovysrc/test/groovy/geoscript/GeoScriptTestCase.groovy renamed to src/test/groovy/geoscript/GeoScriptTest.groovy src/test/groovy/geoscript/GeoScriptTestCase.groovy renamed to src/test/groovy/geoscript/GeoScriptTest.groovy

@@ -3,18 +3,16 @@ package geoscript
 import geoscript.feature.Feature
 import geoscript.feature.Schema
 import geoscript.filter.Expression
-import geoscript.geom.Point
 import geoscript.layer.Cursor
 import geoscript.proj.Geodetic
 import geoscript.layer.Format
 import geoscript.layer.GeoTIFF
 import geoscript.layer.Raster
 import geoscript.workspace.Memory
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
 
-import static org.junit.Assert.*
+import static org.junit.jupiter.api.Assertions.*
 
 import geoscript.geom.*
 import geoscript.layer.Layer
@@ -26,10 +24,10 @@ import geoscript.workspace.Workspace
  * The unit test for the GeoScript class.
  * @author Jared Erickson
  */
-class GeoScriptTestCase {
+class GeoScriptTest {
 
-    @Rule
-    public TemporaryFolder folder = new TemporaryFolder()
+    @TempDir
+    private File folder
 
     @Test void wrap() {
         assertTrue GeoScript.wrap(new Feature([the_geom: "POINT (1 1)"],"pt").f) instanceof Feature
@@ -151,7 +149,7 @@ class GeoScriptTestCase {
 "POINT (111 -47)","House","12.5"
 "POINT (121 -45)","School","22.7"
 """
-        File csvFile = folder.newFile("layer.csv")
+        File csvFile = new File(folder, "layer.csv")
         csvFile.write(csv)
         use(GeoScript) {
             Layer layer = csvFile as Layer
@@ -165,7 +163,7 @@ class GeoScriptTestCase {
 
     @Test void geoJsonFileAsLayer() {
         String json = """{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[111,-47]},"properties":{"name":"House","price":12.5},"id":"fid-3eff7fce_131b538ad4c_-8000"},{"type":"Feature","geometry":{"type":"Point","coordinates":[121,-45]},"properties":{"name":"School","price":22.7},"id":"fid-3eff7fce_131b538ad4c_-7fff"}]}"""
-        File jsonFile = folder.newFile("layer.json")
+        File jsonFile = new File(folder, "layer.json")
         jsonFile.write(json)
         use(GeoScript) {
             Layer layer = jsonFile as Layer
@@ -235,17 +233,17 @@ class GeoScriptTestCase {
     }
 
     @Test void zipUnzip() {
-        File dir = folder.newFolder("files")
+        File dir = FileUtil.createDir(folder,"files")
         List files = ["file1","file2","file3"].collect {
             File file = new File(dir, "${it}.txt")
             file.write("123")
             file
         }
-        File zipFile = folder.newFile("files.zip")
+        File zipFile = new File(folder, "files.zip")
         GeoScript.zip(files, zipFile)
         assertTrue zipFile.exists()
         assertTrue zipFile.length() > 0
-        File newDir = folder.newFolder("unzipped")
+        File newDir = FileUtil.createDir(folder,"unzipped")
         GeoScript.unzip(zipFile, newDir)
         ["file1","file2","file3"].each { String name ->
             File f = new File(newDir, "${name}.txt")
@@ -256,7 +254,7 @@ class GeoScriptTestCase {
 
     @Test void download() {
         URL url = getClass().getClassLoader().getResource("points.zip")
-        File file = folder.newFile("zipped_points")
+        File file = new File(folder, "zipped_points")
         GeoScript.download(url, file)
         assertTrue file.exists()
         assertTrue file.length() > 100

src/test/groovy/geoscript/carto/CartoFactoriesTest.groovy

@@ -1,7 +1,7 @@
 package geoscript.carto
 
-import org.junit.Test
-import static org.junit.Assert.*
+import org.junit.jupiter.api.Test
+import static org.junit.jupiter.api.Assertions.*
 
 class CartoFactoriesTest {
 

src/test/groovy/geoscript/carto/DateTextItemTest.groovy

@@ -1,11 +1,11 @@
 package geoscript.carto
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 import java.awt.Color
 import java.awt.Font
 import java.text.SimpleDateFormat
-import static org.junit.Assert.*
+import static org.junit.jupiter.api.Assertions.*
 
 class DateTextItemTest {
 

src/test/groovy/geoscript/carto/GridItemTest.groovy

@@ -1,10 +1,10 @@
 package geoscript.carto
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 import java.awt.*
 
-import static org.junit.Assert.assertEquals
+import static org.junit.jupiter.api.Assertions.assertEquals
 
 class GridItemTest {
 

src/test/groovy/geoscript/carto/ImageCartoBuilderTest.groovy

@@ -3,18 +3,17 @@ package geoscript.carto
 import geoscript.layer.GeoTIFF
 import geoscript.layer.Shapefile
 import geoscript.render.Map
+import org.junit.jupiter.api.io.TempDir
 
 import java.awt.Color
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
+import org.junit.jupiter.api.Test
 
 import java.awt.Font
 
 class ImageCartoBuilderTest {
 
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder()
+    @TempDir
+    private File folder
 
     @Test
     void build() {
@@ -28,7 +27,7 @@ class ImageCartoBuilderTest {
         ])
 
         boolean saveToTarget = false
-        File file = saveToTarget ? new File("target/map.png") : temporaryFolder.newFile("map.png")
+        File file = saveToTarget ? new File("target/map.png") : new File(folder, "map.png")
         file.withOutputStream { OutputStream outputStream ->
             new ImageCartoBuilder(PageSize.LETTER_LANDSCAPE, ImageCartoBuilder.ImageType.PNG)
                 .rectangle(new RectangleItem(0, 0, 792, 612).strokeColor(Color.WHITE).fillColor(Color.WHITE))

src/test/groovy/geoscript/carto/ImageItemTest.groovy

@@ -1,7 +1,7 @@
 package geoscript.carto
 
-import org.junit.Test
-import static org.junit.Assert.*
+import org.junit.jupiter.api.Test
+import static org.junit.jupiter.api.Assertions.*
 
 class ImageItemTest {
 

src/test/groovy/geoscript/carto/Java2DCartoBuilderTest.groovy

@@ -10,13 +10,12 @@ import geoscript.style.Fill
 import geoscript.style.Shape
 import geoscript.style.Stroke
 import geoscript.style.UniqueValues
-import org.junit.Rule;
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
 
 import java.awt.Font
 
-import static org.junit.Assert.*
+import static org.junit.jupiter.api.Assertions.*
 
 import javax.imageio.ImageIO
 import java.awt.Graphics2D
@@ -25,8 +24,8 @@ import java.awt.image.BufferedImage;
 
 class Java2DCartoBuilderTest {
 
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder()
+    @TempDir
+    private File folder
 
     boolean showInTarget = false
 
@@ -266,7 +265,13 @@ class Java2DCartoBuilderTest {
     }
 
     private File getDirectory() {
-        showInTarget ? new File("target") : temporaryFolder.newFolder("carto")
+        if (showInTarget) {
+            new File("target")
+        } else {
+            File dir = new File(folder, "carto")
+            dir.mkdir()
+            dir
+        }
     }
 
 }