test/jdk/tools/jpackage/linux/PackageDepsTest.java

*** 19,28 ****
--- 19,29 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
+ import jdk.jpackage.test.Test;
  import jdk.jpackage.test.PackageTest;
  import jdk.jpackage.test.PackageType;
  
  
  /**
*** 54,71 ****
      // preceeding the main package name.
      // This is needed to make Bash script batch installing/uninstalling packages
      // produced by jtreg tests install/uninstall packages in the right order.
      static class APackageDepsTestPrereq {
  
!         public static void main(String[] args) throws Exception {
              new PackageTest().forTypes(PackageType.LINUX).configureHelloApp().run();
          }
      }
  
!     public static void main(String[] args) throws Exception {
          final String PREREQ_PACKAGE_NAME = "apackagedepstestprereq";
  
          APackageDepsTestPrereq.main(args);
  
          new PackageTest()
          .forTypes(PackageType.LINUX)
          .configureHelloApp()
--- 55,73 ----
      // preceeding the main package name.
      // This is needed to make Bash script batch installing/uninstalling packages
      // produced by jtreg tests install/uninstall packages in the right order.
      static class APackageDepsTestPrereq {
  
!         public static void main(String[] args) {
              new PackageTest().forTypes(PackageType.LINUX).configureHelloApp().run();
          }
      }
  
!     public static void main(String[] args) {
          final String PREREQ_PACKAGE_NAME = "apackagedepstestprereq";
  
+         Test.run(args, () -> {
              APackageDepsTestPrereq.main(args);
  
              new PackageTest()
              .forTypes(PackageType.LINUX)
              .configureHelloApp()
*** 75,81 ****
--- 77,84 ----
              .forTypes(PackageType.LINUX_DEB)
              .addBundlePropertyVerifier("Depends", PREREQ_PACKAGE_NAME)
              .forTypes(PackageType.LINUX_RPM)
              .addBundlePropertyVerifier("Requires", PREREQ_PACKAGE_NAME)
              .run();
+         });
      }
  }