test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java

@@ -22,12 +22,10 @@
  */
 package jdk.jpackage.test;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

@@ -94,19 +92,17 @@
     }
 
     private static boolean isBundlerSupported(String bundlerClass) {
         try {
             Class clazz = Class.forName(bundlerClass);
-            Method isSupported = clazz.getDeclaredMethod("isSupported");
-            return ((Boolean) isSupported.invoke(clazz));
+            Method supported = clazz.getMethod("supported", boolean.class);
+            return ((Boolean) supported.invoke(clazz.newInstance(), true));
         } catch (ClassNotFoundException ex) {
             return false;
-        } catch (IllegalAccessException | InvocationTargetException ex) {
+        } catch (InstantiationException | NoSuchMethodException
+                | IllegalAccessException | InvocationTargetException ex) {
             throw new RuntimeException(ex);
-        } catch (NoSuchMethodException ex) {
-            // Not all bundler classes has isSupported() method.
-            return true;
         }
     }
 
     private String name;
     private final String suffix;

@@ -137,9 +133,9 @@
     
     private final static class Inner {
         
         private final static Set<String> DISABLED_PACKAGERS = Stream.of(
                 Optional.ofNullable(
-                        System.getProperty("jpackage.test.disabledPackagers")).orElse(
+                        Test.getConfigProperty("disabledPackagers")).orElse(
                         "").split(",")).collect(Collectors.toUnmodifiableSet());
     }
 }