Changeset 17677 in josm for trunk/test/unit/org/openstreetmap/josm/tools

Timestamp:

2021-03-27T15:38:17+01:00 (5 years ago)

Author:

simon04

Message:

see #16567 - JUnit 5: use org.junit.jupiter.api.Assumptions

Location:

trunk/test/unit/org/openstreetmap/josm/tools

Files:

• JosmDecimalFormatSymbolsProviderTest.java (modified) (1 diff)
• PlatformHookWindowsTest.java (modified) (2 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import static org.junit.Assume.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.text.DecimalFormat;

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import static org.junit.Assume.assumeNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -173 +172 @@
     @Test
     void testGetInstalledFonts() {
-        assumeNotNull(FileSystems.getDefault()); // weird NPE on Jenkins
+        assumeTrue(FileSystems.getDefault() != null); // weird NPE on Jenkins
         assumeTrue(Utils.getJavaVersion() < 16 || PlatformManager.isPlatformWindows()); // No idea why the test fails with Java 16+ on Linux
         Collection<String> fonts = hook.getInstalledFonts();