Changeset 17149 in josm for trunk

Timestamp:

2020-10-10T22:32:44+02:00 (4 years ago)

Author:

simon04

Message:

see #19370 - Fix GpxWriterTest, InspectPrimitiveDialogTest on Windows

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (2 diffs)
• gui/dialogs/InspectPrimitiveDialogTest.java (modified) (7 diffs)
• io/GpxWriterTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -34 +34 @@
 import java.util.stream.Stream;
 
+import org.junit.Assert;
 import org.junit.Assume;
 import org.openstreetmap.josm.command.Command;
@@ -540 +541 @@
 
     /**
+     * Replaces {@linkplain System#lineSeparator() system dependent line separators} with {@code \n}
+     * and calls {@link Assert#assertEquals(java.lang.Object, java.lang.Object)}.
+     * @param expected expected value
+     * @param actual the value to check against <code>expected</code>
+     */
+    public static void assertEqualsNewline(String expected, String actual) {
+        assertEquals(expected, actual.replace(System.lineSeparator(), "\n"));
+    }
+
+    /**
      * Waits until any asynchronous operations launched by the test on the EDT or worker threads have
      * (almost certainly) completed.

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.openstreetmap.josm.TestUtils.assertEqualsNewline;
 
 import java.util.ArrayList;
@@ -68 +68 @@
     public void testBuildDataText() {
         DataSet ds = new DataSet();
-        assertEquals("", InspectPrimitiveDialog.buildDataText(ds, new ArrayList<>(ds.allPrimitives())));
+        assertEqualsNewline("", InspectPrimitiveDialog.buildDataText(ds, new ArrayList<>(ds.allPrimitives())));
         final Way way = new Way();
         way.addNode(new Node(new LatLon(47.2687921, 11.390525)));
@@ -83 +83 @@
         ds.addPrimitive(way);
         way.addNode(way.firstNode()); // close way
-        assertEquals(
+        assertEqualsNewline(
             "Way: 1\n" +
                 "  Data Set: "+Integer.toHexString(ds.hashCode())+"\n" +
@@ -110 +110 @@
     public void testBuildListOfEditorsText() {
         DataSet ds = new DataSet();
-        assertEquals("0 users last edited the selection:\n\n", InspectPrimitiveDialog.buildListOfEditorsText(ds.allPrimitives()));
+        assertEqualsNewline("0 users last edited the selection:\n\n", InspectPrimitiveDialog.buildListOfEditorsText(ds.allPrimitives()));
         ds.addPrimitive(new Node(LatLon.ZERO));
-        assertEquals("0 users last edited the selection:\n\n", InspectPrimitiveDialog.buildListOfEditorsText(ds.allPrimitives()));
+        assertEqualsNewline("0 users last edited the selection:\n\n", InspectPrimitiveDialog.buildListOfEditorsText(ds.allPrimitives()));
         Node n = new Node(LatLon.ZERO);
         n.setUser(User.getAnonymous());
@@ -119 +119 @@
         n.setUser(User.getAnonymous());
         ds.addPrimitive(n);
-        assertEquals(
+        assertEqualsNewline(
                 "1 user last edited the selection:\n" +
                 "\n" +
@@ -153 +153 @@
         try {
             MainApplication.getLayerManager().addLayer(layer);
-            assertEquals("", InspectPrimitiveDialog.buildMapPaintText());
+            assertEqualsNewline("", InspectPrimitiveDialog.buildMapPaintText());
             Node n = new Node(LatLon.ZERO);
             n.setUser(User.getAnonymous());
@@ -159 +159 @@
             ds.addSelected(n);
             String text = InspectPrimitiveDialog.buildMapPaintText().replaceAll("@(\\p{XDigit})+", "");
-            assertEquals(baseText, text);
+            assertEqualsNewline(baseText, text);
             n = new Node(LatLon.ZERO);
             n.setUser(User.getAnonymous());
             ds.addPrimitive(n);
             ds.addSelected(n);
-            assertEquals(baseText + baseText + "The 2 selected objects have identical style caches.\n",
+            assertEqualsNewline(baseText + baseText + "The 2 selected objects have identical style caches.\n",
                     InspectPrimitiveDialog.buildMapPaintText().replaceAll("@(\\p{XDigit})+", ""));
         } finally {

trunk/test/unit/org/openstreetmap/josm/io/GpxWriterTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import static org.junit.Assert.assertEquals;
+import static org.openstreetmap.josm.TestUtils.assertEqualsNewline;
 
 import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.Month;
@@ -51 +50 @@
             writer.write(gpx);
         }
-        assertEquals(String.format("<?xml version='1.0' encoding='UTF-8'?>%n" +
-                "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"%n" +
-                "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"%n" +
-                "    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">%n" +
-                "  <metadata>%n" +
-                "    <bounds minlat=\"0.0\" minlon=\"0.0\" maxlat=\"0.0\" maxlon=\"0.0\"/>%n" +
-                "  </metadata>%n" +
-                "  <wpt lat=\"0.0\" lon=\"0.0\">%n" +
+        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
+                "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
+                "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                "    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\n" +
+                "  <metadata>\n" +
+                "    <bounds minlat=\"0.0\" minlon=\"0.0\" maxlat=\"0.0\" maxlon=\"0.0\"/>\n" +
+                "  </metadata>\n" +
+                "  <wpt lat=\"0.0\" lon=\"0.0\">\n" +
                 atts +
-                "  </wpt>%n" +
-                "</gpx>"), baos.toString(StandardCharsets.UTF_8.name()));
+                "  </wpt>\n" +
+                "</gpx>", baos.toString());
     }
 
@@ -73 +72 @@
         testSingleWaypoint(
                 w -> w.put(GpxConstants.PT_TIME, Date.from(LocalDate.of(2018, Month.AUGUST, 2).atStartOfDay(ZoneOffset.UTC).toInstant())),
-                "    <time>2018-08-02T00:00:00Z</time>%n");
+                "    <time>2018-08-02T00:00:00Z</time>\n");
     }
 
@@ -90 +89 @@
                     w.put(GpxConstants.PT_PDOP, 1.2);
                 },
-                "    <sat>16</sat>%n" +
-                "    <hdop>0.7</hdop>%n" +
-                "    <vdop>0.9</vdop>%n" +
-                "    <pdop>1.2</pdop>%n");
+                "    <sat>16</sat>\n" +
+                "    <hdop>0.7</hdop>\n" +
+                "    <vdop>0.9</vdop>\n" +
+                "    <pdop>1.2</pdop>\n");
     }
 
@@ -134 +133 @@
 
         writer.write(data);
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n" +
+        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
                 "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
                 "    xmlns:knownprefix=\"http://example.com/URI\"\n" +
@@ -171 +170 @@
         baos.reset();
         writer.write(data, GpxConstants.ColorFormat.GPXX, true);
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n" +
+        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
                 "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
                 "    xmlns:knownprefix=\"http://example.com/URI\"\n" +
@@ -210 +209 @@
         baos.reset();
         writer.write(data, null, false);
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n" +
+        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
                 "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
                 "    xmlns:knownprefix=\"http://example.com/URI\"\n" +
@@ -243 +242 @@
         // being hidden, even if they don't actually have to be converted
         // (GPXD -> convertColor() -> GPXX -> hide() -> null -> show() -> GPXX)
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n" +
+        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
                 "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
                 "    xmlns:knownprefix=\"http://example.com/URI\"\n" +