Changeset 18555 in josm

Timestamp:

2022-09-08T18:22:23+02:00 (2 years ago)

Author:

taylor.smock

Message:

Update tests for new UI information

See #20716: Search for missing power line support features.

This also improves test failure feedback in TestUtils.assertEqualsNewline.
This is done by creating arrays and comparing those, which will help narrow
down where the actual problem was.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (2 diffs)
• gui/dialogs/InspectPrimitiveDialogTest.java (modified) (2 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -601 +602 @@
      */
     public static void assertEqualsNewline(String expected, String actual) {
-        assertEquals(expected, actual.replace(System.lineSeparator(), "\n"));
+        String[] actualArray = actual.split(System.lineSeparator(), -1);
+        String[] expectedArray = expected.split("\n", -1);
+        assertAll(() -> assertEquals(expectedArray.length, actualArray.length, "Different number of newlines"),
+                () -> assertArrayEquals(expectedArray, actualArray),
+                () -> assertEquals(expected, actual.replace(System.lineSeparator(), "\n")));
     }
 

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

@@ -35 +35 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().projection().mapStyles();
+    static JOSMTestRules test = new JOSMTestRules().main().projection().mapStyles();
 
     /**
@@ -95 +95 @@
                 "  Centroid: 47.2686049, 11.3909649\n" +
                 "  Length: 193.3 m\n" +
+                "  Average segment length: 48.3 m\n" +
+                "  Standard deviation: 27.5 m\n" +
                 "  5 Nodes: \n" +
                 "    2\n" +