Changeset 17688 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2021-03-30T09:03:19+02:00 (4 years ago)

Author:

simon04

Message:

see #19724 - Fix NPE in PlatformHookWindows.getInstalledFonts on Linux/macOS

File:

• trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -13 +12 @@
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileSystems;
 import java.security.KeyStoreException;
 import java.util.Collection;
@@ -172 +170 @@
     @Test
     void testGetInstalledFonts() {
-        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();
         if (PlatformManager.isPlatformWindows()) {
             assertFalse(fonts.isEmpty());
         } else {
-            assertNull(fonts);
+            assumeTrue(fonts.isEmpty());
         }
     }