Changeset 19086 in josm for trunk

Timestamp:

2024-05-24T22:21:22+02:00 (6 months ago)

Author:

stoecker

Message:

fix some test failures

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/mappaint/RenderingCLIAreaTest.java (modified) (1 diff)
• tools/date/DateUtilsTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java

@@ -45 +45 @@
         // 1
         runs.add(new Object[] {"--scale 4000 --bounds " + param(bFeldberg),
-                CoreMatchers.is(scaleFeldberg4000),
+                isFP(scaleFeldberg4000, ErrorMode.ABSOLUTE, 0.000000000001d),
                 CoreMatchers.is(bFeldberg)});
 

trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java

@@ -17 +17 @@
 import java.util.concurrent.ForkJoinPool;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -164 +165 @@
 
         setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
-        assertEquals("1:00:00" + separator + "AM GMT+01:00", DateUtils.formatTime(new Date(0),
-            DateFormat.LONG), "This is mostly dependent upon java.locale.providers. CET is also OK.");
+        String p1 = "1:00:00" + separator + "AM GMT+01:00";
+        String p2 = "1:00:00" + separator + "AM CET";
+        assertEquals(DateUtils.formatTime(new Date(0), DateFormat.LONG),
+            CoreMatchers.anyOf(CoreMatchers.is(p1), CoreMatchers.is(p2)),
+            "This is mostly dependent upon java.locale.providers.");
     }