Changeset 17158 in josm for trunk

Timestamp:

2020-10-11T10:30:11+02:00 (4 years ago)

Author:

simon04

Message:

see #19370 - Fix OsmReaderTest on Windows (byte counting due to line separator)

File:

• trunk/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -345 +348 @@
             fail("should throw exception");
         } catch (IllegalDataException e) {
-            assertEquals("Illegal value for attributes 'lat', 'lon' on node with ID 1425146006." +
-                    " Got '550.3311950157', '10.49428298298'." +
-                    " (at line 5, column 179). 578 bytes have been read", e.getMessage());
+            String prefix = "Illegal value for attributes 'lat', 'lon' on node with ID 1425146006. Got '550.3311950157', '10.49428298298'.";
+            assertThat(e.getMessage(), anyOf(
+                    is(prefix + " (at line 5, column 179). 578 bytes have been read"),
+                    is(prefix + " (at line 5, column 179). 581 bytes have been read") // GitHub Actions
+            ));
         }
     }
@@ -361 +366 @@
             fail("should throw exception");
         } catch (IllegalDataException e) {
-            assertEquals("Illegal value for attributes 'lat', 'lon' on node with ID 978." +
-                    " Got 'nan', 'nan'." +
-                    " (at line 4, column 151). 336 bytes have been read", e.getMessage());
+            String prefix = "Illegal value for attributes 'lat', 'lon' on node with ID 978. Got 'nan', 'nan'.";
+            assertThat(e.getMessage(), anyOf(
+                    is(prefix + " (at line 4, column 151). 336 bytes have been read"),
+                    is(prefix + " (at line 5, column 179). 338 bytes have been read") // GitHub Actions
+            ));
         }
     }