Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (modified) (14 diffs)

trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.imagery;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Rule;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
@@ -24 +24 @@
  * Unit tests for class {@link TemplatedWMSTileSource}.
  */
-public class TemplatedWMSTileSourceTest {
+class TemplatedWMSTileSourceTest {
 
     private final ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null);
@@ -32 +32 @@
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -40 +40 @@
      */
     @Test
-    public void testEPSG3857() {
+    void testEPSG3857() {
         Projection projection = Projections.getProjectionByCode("EPSG:3857");
         ProjectionRegistry.setProjection(projection);
@@ -65 +65 @@
      */
     @Test
-    public void testEPSG4326() {
+    void testEPSG4326() {
         Projection projection = Projections.getProjectionByCode("EPSG:4326");
         ProjectionRegistry.setProjection(projection);
@@ -81 +81 @@
      */
     @Test
-    public void testEPSG4326widebounds() {
+    void testEPSG4326widebounds() {
         Projection projection = new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=-180,53,180,54");
         ProjectionRegistry.setProjection(projection);
@@ -94 +94 @@
      */
     @Test
-    public void testEPSG4326narrowbounds() {
+    void testEPSG4326narrowbounds() {
         Projection projection = new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=18,-90,20,90");
         ProjectionRegistry.setProjection(projection);
@@ -107 +107 @@
      */
     @Test
-    public void testEPSG2180() {
+    void testEPSG2180() {
         Projection projection = Projections.getProjectionByCode("EPSG:2180");
         ProjectionRegistry.setProjection(projection);
@@ -124 +124 @@
      */
     @Test
-    public void testEPSG3006withbounds() {
+    void testEPSG3006withbounds() {
         Projection projection =
                 new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 "
@@ -140 +140 @@
      */
     @Test
-    public void testEPSG3006withoutbounds() {
+    void testEPSG3006withoutbounds() {
         Projection projection =
                 new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 "
@@ -156 +156 @@
      */
     @Test
-    public void testGetTileUrl() {
+    void testGetTileUrl() {
         // "https://maps.six.nsw.gov.au/arcgis/services/public/NSW_Imagery_Dates/MapServer/WMSServer?
         // SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}
@@ -206 +206 @@
         ICoordinate expected = verifier.tileXYToLatLon(x, y, z - 1);
         assertEquals(expected.getLat(), result.lat(), 1e-4);
-        assertEquals(LatLon.normalizeLon(expected.getLon() - result.lon()), 0.0, 1e-4);
+        assertEquals(0.0, LatLon.normalizeLon(expected.getLon() - result.lon()), 1e-4);
         LatLon tileCenter = new Bounds(result, getTileLatLon(source, x+1, y+1, z)).getCenter();
         TileXY backwardsResult = source.latLonToTileXY(CoordinateConversion.llToCoor(tileCenter), z);
@@ -224 +224 @@
     private void verifyLocation(TemplatedWMSTileSource source, LatLon location, int z) {
         Projection projection = ProjectionRegistry.getProjection();
-        assertTrue(
-                "Point outside world bounds",
-                projection.getWorldBoundsLatLon().contains(location)
-                );
+        assertTrue(projection.getWorldBoundsLatLon().contains(location), "Point outside world bounds");
 
         TileXY tileIndex = source.latLonToTileXY(CoordinateConversion.llToCoor(location), z);
 
-        assertTrue("X index: " + tileIndex.getXIndex() + " greater than tileXmax: " + source.getTileXMax(z) + " at zoom: " + z,
-                tileIndex.getXIndex() <= source.getTileXMax(z));
-
-        assertTrue("Y index: " + tileIndex.getYIndex() + " greater than tileYmax: " + source.getTileYMax(z) + " at zoom: " + z,
-                tileIndex.getYIndex() <= source.getTileYMax(z));
+        assertTrue(tileIndex.getXIndex() <= source.getTileXMax(z),
+                "X index: " + tileIndex.getXIndex() + " greater than tileXmax: " + source.getTileXMax(z) + " at zoom: " + z);
+
+        assertTrue(tileIndex.getYIndex() <= source.getTileYMax(z),
+                "Y index: " + tileIndex.getYIndex() + " greater than tileYmax: " + source.getTileYMax(z) + " at zoom: " + z);
 
         ICoordinate x1 = source.tileXYToLatLon(tileIndex.getXIndex(), tileIndex.getYIndex(), z);
@@ -245 +242 @@
         bounds.extend(x2.getLat(), x2.getLon());
         // test that location is within tile bounds
-        assertTrue(location + " not within " + bounds + " for tile " + z + "/" + tileIndex.getXIndex() + "/" + tileIndex.getYIndex(),
-                bounds.contains(location));
+        assertTrue(bounds.contains(location),
+                location + " not within " + bounds + " for tile " + z + "/" + tileIndex.getXIndex() + "/" + tileIndex.getYIndex());
         verifyTileSquareness(source, tileIndex.getXIndex(), tileIndex.getYIndex(), z);
     }