test/jdk/tools/jpackage/linux/AppCategoryTest.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;
  
  
  /**
*** 47,59 ****
   * @modules jdk.jpackage/jdk.jpackage.internal
   * @run main/othervm/timeout=360 -Xmx512m AppCategoryTest
   */
  public class AppCategoryTest {
  
!     public static void main(String[] args) throws Exception {
          final String CATEGORY = "Foo";
  
          new PackageTest()
          .forTypes(PackageType.LINUX)
          .configureHelloApp()
          .addInitializer(cmd -> {
              cmd.addArguments("--linux-app-category", CATEGORY);
--- 48,61 ----
   * @modules jdk.jpackage/jdk.jpackage.internal
   * @run main/othervm/timeout=360 -Xmx512m AppCategoryTest
   */
  public class AppCategoryTest {
  
!     public static void main(String[] args) {
          final String CATEGORY = "Foo";
  
+         Test.run(args, () -> {
              new PackageTest()
              .forTypes(PackageType.LINUX)
              .configureHelloApp()
              .addInitializer(cmd -> {
                  cmd.addArguments("--linux-app-category", CATEGORY);
*** 61,67 ****
--- 63,70 ----
              .forTypes(PackageType.LINUX_DEB)
              .addBundlePropertyVerifier("Section", CATEGORY)
              .forTypes(PackageType.LINUX_RPM)
              .addBundlePropertyVerifier("Group", CATEGORY)
              .run();
+         });
      }
  }