Upgrade junit to 4.13.1

Author: jericks

.github/workflows/build.yml

@@ -0,0 +1,27 @@
+name: Maven Build
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+      - name: Upload geoscript-groovy.zip
+        uses: actions/upload-artifact@v2
+        with:
+          name: geoscript-groovy.zip
+          path: target/geoscript-groovy-*.zip
+      - name: Upload geoscript-groovy-app.jar
+        uses: actions/upload-artifact@v2
+        with:
+          name: geoscript-groovy-app.jar
+          path: target/geoscript-groovy-app-*.jar

pom.xml

@@ -333,7 +333,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.7</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -475,7 +475,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>geoscript-app-${project.version}</finalName>
+                            <finalName>geoscript-groovy-app-${project.version}</finalName>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.GroovyResourceTransformer">
                                     <extModuleName>groovy-module</extModuleName>

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

@@ -3,10 +3,8 @@ package geoscript.carto
 import org.junit.Test
 
 import java.awt.*
-import java.text.SimpleDateFormat
 
 import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertTrue
 
 class GridItemTest {
 
@@ -24,7 +22,7 @@ class GridItemTest {
         assertEquals(400, item.height)
         assertEquals(20, item.size)
         assertEquals(Color.BLUE, item.strokeColor)
-        assertEquals(2f, item.strokeWidth, 0.1)
+        assertEquals(2f, item.strokeWidth, 0.1f)
         assertEquals("GridItem(x = 10, y = 20, width = 300, height = 400, size = 20, " +
                 "stroke-color = java.awt.Color[r=0,g=0,b=255], stroke-width = 2.0)", item.toString())
     }

src/test/groovy/geoscript/carto/LineItemTest.groovy

@@ -20,7 +20,7 @@ class LineItemTest {
         assertEquals(300, item.width)
         assertEquals(400, item.height)
         assertEquals(Color.BLUE, item.strokeColor)
-        assertEquals(2f, item.strokeWidth, 0.1)
+        assertEquals(2f, item.strokeWidth, 0.1f)
         assertEquals("LineItem(x = 10, y = 20, width = 300, height = 400, " +
                 "stroke-color = java.awt.Color[r=0,g=0,b=255], stroke-width = 2.0)", item.toString())
     }

src/test/groovy/geoscript/carto/NorthArrowItemTest.groovy

@@ -29,7 +29,7 @@ class NorthArrowItemTest {
         assertEquals(Color.WHITE, item.fillColor1)
         assertEquals(Color.RED, item.strokeColor2)
         assertEquals(Color.YELLOW, item.fillColor2)
-        assertEquals(1.2f, item.strokeWidth, 0.1)
+        assertEquals(1.2f, item.strokeWidth, 0.1f)
         assertTrue(item.drawText)
         assertEquals(Color.BLUE, item.textColor)
         assertTrue(item.toString().startsWith("NorthArrowItem(x = 10, y = 20, width = 300, height = 400, " +

src/test/groovy/geoscript/carto/RectangleItemTest.groovy

@@ -21,7 +21,7 @@ class RectangleItemTest {
         assertEquals(300, item.width)
         assertEquals(400, item.height)
         assertEquals(Color.BLUE, item.strokeColor)
-        assertEquals(1.2f, item.strokeWidth, 0.1)
+        assertEquals(1.2f, item.strokeWidth, 0.1f)
         assertEquals(Color.WHITE, item.fillColor)
         assertEquals("RectangleItem(x = 10, y = 20, width = 300, height = 400, " +
                 "stroke-color = java.awt.Color[r=0,g=0,b=255], " +

src/test/groovy/geoscript/feature/FeatureTestCase.groovy

@@ -119,16 +119,16 @@ class FeatureTestCase {
 
         Feature f2 = s1.feature([geom: new Point(121,-49), price: 15.6, name: "Test"])
         f1.set(f2)
-        assertEquals f2['price'], f1['price'], 0.1
+        assertEquals f2['price'], f1['price'], 0.1f
         assertEquals f2['name'], f1['name']
         assertEquals f2.geom.wkt, f1.geom.wkt
         // Values from map
         f1.set([price: 1200.5, name: "Car"])
-        assertEquals 1200.5, f1['price'], 0.1
+        assertEquals 1200.5f, f1['price'], 0.1f
         assertEquals "Car", f1['name']
         // Values from named parameters
         f1.set(price: 12.2, name: "Book")
-        assertEquals 12.2, f1['price'], 0.1
+        assertEquals 12.2f, f1['price'], 0.1f
         assertEquals "Book", f1['name']
     }
 

src/test/groovy/geoscript/layer/TileLayerTestCase.groovy

@@ -10,6 +10,7 @@ import org.junit.Test
 import org.junit.rules.TemporaryFolder
 
 import javax.imageio.ImageIO
+import java.nio.file.Files
 
 import static junit.framework.Assert.*
 
@@ -328,25 +329,25 @@ class TileLayerTestCase {
     @Test
     void getTileLayerFromString() {
         // MBTiles params
-        File file = folder.newFile('test.mbtiles')
+        File file = folder.newFile('test48.mbtiles')
         file.delete()
         TileLayer tileLayer = TileLayer.getTileLayer("type=mbtiles file=${file.absolutePath}")
         assertNotNull(tileLayer)
         assertTrue(tileLayer instanceof MBTiles)
         // MBTiles file
-        file = folder.newFile('test.mbtiles')
+        file = folder.newFile('test10.mbtiles')
         file.delete()
         tileLayer = TileLayer.getTileLayer(file.absolutePath)
         assertNotNull(tileLayer)
         assertTrue(tileLayer instanceof MBTiles)
         // GeoPackage params
-        file = folder.newFile('test.gpkg')
+        file = folder.newFile('test69.gpkg')
         file.delete()
         tileLayer = TileLayer.getTileLayer("type=geopackage file=${file.absolutePath}")
         assertNotNull(tileLayer)
         assertTrue(tileLayer instanceof GeoPackage)
         // GeoPackage file
-        file = folder.newFile('test.gpkg')
+        file = folder.newFile('test19.gpkg')
         file.delete()
         tileLayer = TileLayer.getTileLayer(file.absolutePath)
         assertNotNull(tileLayer)
@@ -414,24 +415,24 @@ class TileLayerTestCase {
     @Test
     void getTileLayerFromParams() {
         // MBTiles (file doesn't exist)
-        File file = folder.newFile('test.mbtiles')
+        File file = folder.newFile('test45.mbtiles')
         file.delete()
         TileLayer tileLayer = TileLayer.getTileLayer([type: 'mbtiles', file: file])
         assertNotNull(tileLayer)
         assertTrue(tileLayer instanceof MBTiles)
         // MBTiles (empty file)
-        file = folder.newFile('test.mbtiles')
+        file = folder.newFile('test23.mbtiles')
         tileLayer = TileLayer.getTileLayer([type: 'mbtiles', file: file])
         assertNotNull(tileLayer)
         assertTrue(tileLayer instanceof MBTiles)
         // GeoPackage (file doesn't exist)
-        file = folder.newFile('test.gpkg')
+        file = folder.newFile('test67.gpkg')
         file.delete()
         tileLayer = TileLayer.getTileLayer([type: 'geopackage', file: file])
         assertNotNull(tileLayer)
         assertTrue(tileLayer instanceof GeoPackage)
         // GeoPackage (empty file)
-        file = folder.newFile('test.gpkg')
+        file = folder.newFile('test34.gpkg')
         file.delete()
         tileLayer = TileLayer.getTileLayer([type: 'geopackage', file: file])
         assertNotNull(tileLayer)
@@ -476,21 +477,21 @@ class TileLayerTestCase {
         File file
         Layer layer = new Shapefile(new File(getClass().getClassLoader().getResource("states.mbtiles").toURI()))
         // MBTiles
-        file = folder.newFile('test.mbtiles')
+        file = folder.newFile('test1.mbtiles')
         file.delete()
         tileLayer = TileLayer.getTileLayer("type=mbtiles file=${file.absolutePath}")
         tileRenderer = TileLayer.getTileRenderer(tileLayer, layer)
         assertNotNull(tileRenderer)
         assertTrue(tileRenderer instanceof ImageTileRenderer)
         // GeoPackage params
-        file = folder.newFile('test.gpkg')
+        file = folder.newFile('test1.gpkg')
         file.delete()
         tileLayer = TileLayer.getTileLayer("type=geopackage file=${file.absolutePath}")
         tileRenderer = TileLayer.getTileRenderer(tileLayer, layer)
         assertNotNull(tileRenderer)
         assertTrue(tileRenderer instanceof ImageTileRenderer)
         // GeoPackage file
-        file = folder.newFile('test.gpkg')
+        file = folder.newFile('test2.gpkg')
         file.delete()
         tileLayer = TileLayer.getTileLayer(file.absolutePath)
         tileRenderer = TileLayer.getTileRenderer(tileLayer, layer)

src/test/groovy/geoscript/style/GradientTestCase.groovy

@@ -78,15 +78,15 @@ class GradientTestCase {
         assertNotNull(sym1)
         assertEquals(5, sym1.parts.size())
 
-        File imgFile1 = folder.newFile("states.png")
+        File imgFile1 = folder.newFile("states1.png")
         shapefile.style = sym1
         map.render(imgFile1)
 
         Gradient sym2 = new Gradient(shapefile, "WORKERS", "EqualInterval", 7, ["#eee8aa","#98fb98","#afeeee","#d87093","#ffefd5","#ffdab9","#cd853f"])
         assertNotNull(sym2)
         assertEquals(7, sym2.parts.size())
 
-        File imgFile2 = folder.newFile("states.png")
+        File imgFile2 = folder.newFile("states2.png")
         shapefile.style = sym2
         map.render(imgFile2)
     }

src/test/groovy/geoscript/workspace/H2TestCase.groovy

@@ -50,13 +50,6 @@ class H2TestCase {
         l.add([new Point(3,3), "three"])
         assertEquals 3, l.count()
         h2.close()
-
-        h2 = new H2(folder.newFile("h2.db"))
-        assertEquals "H2", h2.format
-        assertTrue h2.names.contains("widgets")
-        l = h2.get("widgets")
-        assertEquals 3, l.count()
-        h2.close()
     }
 
     @Test void add() {