8246010: AdditionalLaunchersTest is not enabled, and fails

Reviewed-by: asemenyuk, almatvee
openjdk · Jun 2, 2020 · 1933fe3 · 1933fe3
1 parent 5ce3d0d
commit 1933fe3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/...package/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources.properties b/...package/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ error.msi-product-version-build-out-of-range=Build part of version must be in th
 error.msi-product-version-minor-out-of-range=Minor version must be in the range [0, 255]
 error.version-swap=Failed to update version information for {0}
 error.invalid-envvar=Invalid value of {0} environment variable
+error.lock-resource=Failed to lock: {0}
 
 message.result-dir=Result application bundle: {0}.
 message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.

diff --git a/...kage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_ja.properties b/...kage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ error.msi-product-version-build-out-of-range=\u30D0\u30FC\u30B8\u30E7\u30F3\u306
 error.msi-product-version-minor-out-of-range=\u30DE\u30A4\u30CA\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.version-swap={0}\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u306E\u66F4\u65B0\u306B\u5931\u6557\u3057\u307E\u3057\u305F
 error.invalid-envvar={0}\u74B0\u5883\u5909\u6570\u306E\u5024\u304C\u7121\u52B9\u3067\u3059
++error.lock-resource=Failed to lock: {0}
 
 message.result-dir=\u7D50\u679C\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB: {0}
 message.icon-not-ico=\u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICO\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002

diff --git a/...e/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_zh_CN.properties b/...e/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ error.msi-product-version-build-out-of-range=\u7248\u672C\u7684\u5DE5\u4F5C\u724
 error.msi-product-version-minor-out-of-range=\u6B21\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
 error.version-swap=\u65E0\u6CD5\u66F4\u65B0 {0} \u7684\u7248\u672C\u4FE1\u606F
 error.invalid-envvar={0} \u73AF\u5883\u53D8\u91CF\u7684\u503C\u65E0\u6548
++error.lock-resource=Failed to lock: {0}
 
 message.result-dir=\u751F\u6210\u7684\u5E94\u7528\u7A0B\u5E8F\u5305: {0}\u3002
 message.icon-not-ico=\u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICO \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002

diff --git a/...ackage/share/AdditionalLaunchersTest.java → ...tools/jpackage/share/AddLauncherTest.java b/...ackage/share/AdditionalLaunchersTest.java → ...tools/jpackage/share/AddLauncherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 
 /**
  * Test --add-launcher parameter. Output of the test should be
- * additionallauncherstest*.* installer. The output installer should provide the
+ * AddLauncherTest*.* installer. The output installer should provide the
  * same functionality as the default installer (see description of the default
  * installer in SimplePackageTest.java) plus install three extra application
  * launchers.
@@ -46,9 +46,9 @@
  * @library ../helpers
  * @build jdk.jpackage.test.*
  * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
- * @compile AdditionalLaunchersTest.java
+ * @compile AddLauncherTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=AdditionalLaunchersTest.test
+ *  --jpt-run=AddLauncherTest.test
  */
 
 /*
@@ -58,13 +58,13 @@
  * @requires (jpackage.test.SQETest == null)
  * @library ../helpers
  * @build jdk.jpackage.test.*
- * @modules jdk.jpackage/jdk.jpackage.internal
- * @compile AdditionalLaunchersTest.java
+ * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
+ * @compile AddLauncherTest.java
  * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=AdditionalLaunchersTest
+ *  --jpt-run=AddLauncherTest
  */
 
-public class AdditionalLaunchersTest {
+public class AddLauncherTest {
 
     @Test
     public void test() {