Changeset 17688 in josm

Timestamp:

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

Author:

simon04

Message:

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/PlatformHookWindows.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -529 +529 @@
         // Use more low-level method to find the installed fonts.
         List<String> fontsAvail = new ArrayList<>();
-        Path fontPath = FileSystems.getDefault().getPath(getSystemEnv("SYSTEMROOT"), "Fonts");
+        String systemRoot = getSystemEnv("SYSTEMROOT");
+        if (systemRoot == null) {
+            return fontsAvail;
+        }
+        Path fontPath = FileSystems.getDefault().getPath(systemRoot, "Fonts");
         try (DirectoryStream<Path> ds = Files.newDirectoryStream(fontPath)) {
             for (Path p : ds) {

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());
         }
     }