Changeset 16945 in josm for trunk/test/unit/org

Timestamp:

2020-08-28T20:16:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19696 - Fix unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/downloadtasks/PostDownloadHandlerTest.java (modified) (2 diffs)
• tools/LoggingTest.java (modified) (5 diffs)
• tools/TerritoriesTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java

@@ -128 +128 @@
         new PostDownloadHandler(null, newFuture("testRunExceptionFuture")).run();
         assertTrue(Logging.getLastErrorAndWarnings().toString(),
-                Logging.getLastErrorAndWarnings().contains("E: java.util.concurrent.ExecutionException: testRunExceptionFuture"));
+                Logging.getLastErrorAndWarnings().stream()
+                        .anyMatch(e -> e.endsWith("E: java.util.concurrent.ExecutionException: testRunExceptionFuture")));
     }
 
@@ -159 +160 @@
         new PostDownloadHandler(newTask(Arrays.asList("foo", new Exception("bar"), new Object())), newFuture(null)).run();
         assertTrue(Logging.getLastErrorAndWarnings().toString(),
-                Logging.getLastErrorAndWarnings().contains("E: java.lang.Exception: bar"));
+                Logging.getLastErrorAndWarnings().stream()
+                        .anyMatch(e -> e.endsWith("E: java.lang.Exception: bar")));
     }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -199 +198 @@
         Consumer<String> test = string -> {
             assertTrue(string.startsWith("java.io.IOException: x"));
-            assertTrue(string.indexOf("testLogWithStackTraceLevelThrowable") >= 0);
+            assertTrue(string.contains("testLogWithStackTraceLevelThrowable"));
         };
         testLogCaptured(Logging.LEVEL_ERROR, test, () -> Logging.logWithStackTrace(Logging.LEVEL_ERROR, new IOException("x")));
@@ -207 +206 @@
                 () -> Logging.logWithStackTrace(Logging.LEVEL_TRACE, new IOException()));
 
-        testLogCaptured(Logging.LEVEL_TRACE, string -> assertTrue(string.indexOf("Cause:") >= 0),
+        testLogCaptured(Logging.LEVEL_TRACE, string -> assertTrue(string.contains("Cause:")),
                 () -> Logging.logWithStackTrace(Logging.LEVEL_TRACE, new IOException(new IOException())));
 
@@ -268 +267 @@
 
         assertEquals(1, Logging.getLastErrorAndWarnings().size());
-        assertEquals("W: x", Logging.getLastErrorAndWarnings().get(0));
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().get(0).endsWith("W: x"));
 
         Logging.setLogLevel(Logging.LEVEL_ERROR);
@@ -278 +277 @@
 
         assertEquals(2, Logging.getLastErrorAndWarnings().size());
-        assertArrayEquals(new Object[] {"W: x", "E: y"}, Logging.getLastErrorAndWarnings().toArray());
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().get(0).endsWith("W: x"));
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().get(1).endsWith("E: y"));
 
         // limit somewhere reasonable

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

@@ -92 +92 @@
         assertTrue(cache.isEmpty());
         String error = Logging.getLastErrorAndWarnings().get(0);
-        assertTrue(error, error.startsWith("W: Failed to parse external taginfo data at "));
+        assertTrue(error, error.contains("W: Failed to parse external taginfo data at "));
         assertTrue(error, error.contains(": Invalid token=EOF at (line no=3,"));
     }