Changeset 19103 in josm for trunk/test

Timestamp:

2024-06-13T00:23:03+02:00 (5 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x (followup of r19101)

Location:

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

Files:

• PlatformHookOsxTest.java (modified) (3 diffs)
• PlatformHookWindowsTest.java (modified) (1 diff)
• UtilsTest.java (modified) (1 diff)

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

@@ -13 +13 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.openstreetmap.josm.spi.preferences.Config;
 
@@ -35 +38 @@
     @Test
     void testStartupHook() {
-        hook.startupHook((a, b, c, d) -> System.out.println("java callback"), u -> System.out.println("webstart callback"),
+        hook.startupHook((a, b, c, d) -> System.out.println("java callback"),
                 (a, b, c) -> System.out.println("sanity check callback"));
     }
@@ -51 +54 @@
      * @throws IOException if an error occurs
      */
+    @EnabledOnOs(OS.MAC)
     @Test
     void testOpenUrl() throws IOException {
-        assumeTrue(PlatformManager.isPlatformOsx());
         hook.openUrl(Config.getUrls().getJOSMWebsite());
     }

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

@@ -46 +46 @@
     void testStartupHook() {
         final PlatformHook.JavaExpirationCallback javaCallback = (a, b, c, d) -> System.out.println("java callback");
-        final PlatformHook.WebStartMigrationCallback webstartCallback = u -> System.out.println("webstart callback");
         final PlatformHook.SanityCheckCallback sanityCheckCallback = (a, b, c) -> System.out.println("sanity check callback");
-        assertDoesNotThrow(() -> hook.startupHook(javaCallback, webstartCallback, sanityCheckCallback));
+        assertDoesNotThrow(() -> hook.startupHook(javaCallback, sanityCheckCallback));
     }
 

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

@@ -354 +354 @@
 
     /**
-     * Tests if readBytesFromStream handles null streams (might happen when there is no data on error stream)
-     * @throws IOException in case of I/O error
-     * @deprecated {@link Utils#readBytesFromStream(InputStream)} is deprecated since the JVM has the same functionality.
-     */
-    @Test
-    @Deprecated
-    void testNullStreamForReadBytesFromStream() throws IOException {
-        assertEquals(0, Utils.readBytesFromStream(null).length, "Empty on null stream");
-    }
-
-    /**
      * Test of {@link Utils#getLevenshteinDistance} method.
      */