Changeset 18555 in josm for trunk/test/unit/org/openstreetmap/josm/TestUtils.java

Timestamp:

2022-09-08T18:22:23+02:00 (4 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.

File:

• trunk/test/unit/org/openstreetmap/josm/TestUtils.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")));
     }