Changeset 12746 in josm for trunk/test/unit

Timestamp:

2017-09-05T22:05:45+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - fix deprecations in tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/coor/LatLonTest.java (modified) (1 diff)
• data/coor/conversion (added)
• data/coor/conversion/ICoordinateFormatTest.java (added)
• tools/ExifReaderTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

@@ -193 +193 @@
         assertEquals(90d*90d, LatLon.ZERO.distanceSq(LatLon.NORTH_POLE), 0);
         assertEquals(180d*180d, LatLon.SOUTH_POLE.distanceSq(LatLon.NORTH_POLE), 0);
-    }
-
-    /**
-     * Tests the methods {@link LatLon#latToString}, {@link LatLon#lonToString}, {@link LatLon#toStringCSV}.
-     */
-    @Test
-    public void testFormatting() {
-        LatLon c = new LatLon(47.000000, 19.000000);
-        assertEquals("47.0", c.latToString(CoordinateFormat.DECIMAL_DEGREES));
-        assertEquals("19.0", c.lonToString(CoordinateFormat.DECIMAL_DEGREES));
-        assertEquals("47°00'00.0\"N", c.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
-        assertEquals("19°00'00.0\"E", c.lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
-        assertEquals("47°00.000'N", c.latToString(CoordinateFormat.NAUTICAL));
-        assertEquals("19°00.000'E", c.lonToString(CoordinateFormat.NAUTICAL));
-        assertEquals("5942074.0724311", c.latToString(CoordinateFormat.EAST_NORTH));
-        assertEquals("2115070.3250722", c.lonToString(CoordinateFormat.EAST_NORTH));
-        c = new LatLon(-47.000000, -19.000000);
-        assertEquals("47°00'00.0\"S", c.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
-        assertEquals("19°00'00.0\"W", c.lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS));
-        assertEquals("47°00.000'S", c.latToString(CoordinateFormat.NAUTICAL));
-        assertEquals("19°00.000'W", c.lonToString(CoordinateFormat.NAUTICAL));
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java

@@ -24 +24 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat;
 
 /**
@@ -104 +105 @@
         assertNotNull(latlon);
         DecimalFormat f = new DecimalFormat("00.0");
-        assertEquals("51°46'"+f.format(43.0)+"\"", LatLon.degreesMinutesSeconds(latlon.lat()));
-        assertEquals("8°21'"+f.format(56.3)+"\"", LatLon.degreesMinutesSeconds(latlon.lon()));
+        assertEquals("51°46'"+f.format(43.0)+"\"", DMSCoordinateFormat.degreesMinutesSeconds(latlon.lat()));
+        assertEquals("8°21'"+f.format(56.3)+"\"", DMSCoordinateFormat.degreesMinutesSeconds(latlon.lon()));
     }