--- a/test/jdk/tools/jpackage/windows/base/InstallDirBase.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/base/InstallDirBase.java	Thu Aug 08 17:23:13 2019 -0400
@@ -74,7 +74,7 @@
         TEST_NAME = name;
         EXT = ext;
         OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT;
-        INSTALL_DIR = "TestVendor\\JPackageCreateInstallerInstallDirTestDir";
+        INSTALL_DIR = "TestVendor" + File.separator + TEST_NAME;
         CMD = new String[]{
             "--package-type", EXT,
             "--input", "input",

--- a/test/jdk/tools/jpackage/windows/base/WinMenuGroupBase.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/base/WinMenuGroupBase.java	Thu Aug 08 17:23:13 2019 -0400
@@ -75,7 +75,7 @@
             "--main-jar", "hello.jar",
             "--main-class", "Hello",
             "--win-menu",
-            "--win-menu-group", TEST_NAME};
+            "--win-menu-group", TEST_NAME + "_MenuGroup"};
     }
 
     public static void run(String name, String ext) throws Exception {

--- a/test/jdk/tools/jpackage/windows/exe/FileAssociationsInstallDirTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/FileAssociationsInstallDirTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,15 @@
  */
 
 /*
+ * Test both --file-associations and --install-dir parameters.
+ * Output of the test should be FileAssociationsInstallDirTest-1.0.exe installer.
+ * For the expected behavior and suggested testing see descriptions of 
+ * FileAssociationsTest and InstallDirTest tests.
+ * Note: file association suffix is ".jptest3" and not ".jptest1" as in 
+ * FileAssociationsTest test.
+ */
+ 
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/FileAssociationsTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/FileAssociationsTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,21 @@
  */
 
 /*
+ * Test --file-associations parameter.
+ * Output of the test should be FileAssociationsTest-1.0.exe installer.
+ * The output installer should provide the same functionality as the default 
+ * installer (see description of the default installer in Test.java) plus 
+ * configure file associations.
+ * After installation files with ".jptest1" suffix should be associated with 
+ * the test app.
+ *
+ * Suggested test scenario is to create empty file with ".jptest1" suffix, 
+ * double click on it and make sure that test application was launched in 
+ * response to double click event with the path to test .jptest1 file 
+ * on the commend line.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/InstallDirTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/InstallDirTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,15 @@
  */
 
 /*
+ * Test --install-dir parameter.
+ * Output of the test should be InstallDirTest-1.0.exe installer.
+ * The output installer should provide the same functionality as the default 
+ * installer (see description of the default installer in Test.java) but 
+ * install test app in %ProgramFiles%\TestVendor\InstallDirTest instead of 
+ * %ProgramFiles%\InstallDirTest directory.
+ */
+
+/*
  * @test
  * @summary jpackage create installer install dir test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/LicenseTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/LicenseTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,15 @@
  */
 
 /*
+ * Test --license-file parameter.
+ * Output of the test should be LicenseTest-1.0.exe installer.
+ * The output installer should provide the same functionality as the default 
+ * installer (see description of the default installer in Test.java) plus 
+ * should display license text matching contents of 
+ * test/jdk/tools/jpackage/resources/license.txt file from OpenJDK repo.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/RuntimeTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/RuntimeTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -24,6 +24,16 @@
 import java.lang.invoke.MethodHandles;
 
 /*
+ * Test --runtime-image parameter.
+ * Output of the test should be RuntimeTest-1.0.exe installer.
+ * The installer should install Java Runtime without an application.
+ * Installation directory should not have "app" subfolder and should not have 
+ * an application launcher.
+ * No shortcuts should be created in Windows Menu.
+ * Java runtime should be installed in %ProgramFiles%\RuntimeTest directory.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/Test.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/Test.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,16 @@
  */
 
 /*
+ * Test defaults for exe installer.
+ * Output of the test should be Test-1.0.exe installer.
+ * The installer should not have license text. It should not have an option 
+ * to change the default installation directory.
+ * Test application should be installed in %ProgramFiles%\Test directory.
+ * Installer should install test app for all users (machine wide).
+ * Installer should create a shortcut for application launcher in Windows Menu.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/WinDirChooserTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/WinDirChooserTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,14 @@
  */
 
 /*
+ * Test --win-dir-chooser parameter.
+ * Output of the test should be WinDirChooserTest-1.0.exe installer.
+ * The output installer should provide the same functionality as the default 
+ * installer (see description of the default installer in Test.java) plus 
+ * provide an option for user to change the default installation directory.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/WinMenuGroupTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/WinMenuGroupTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,15 @@
  */
 
 /*
+ * Test --win-menu and --win-menu-group parameters.
+ * Output of the test should be WinMenuGroupTest-1.0.exe installer.
+ * The output installer should provide the same functionality as the default 
+ * installer (see description of the default installer in Test.java) plus 
+ * it should create a shortcut for application launcher in Windows Menu in 
+ * "C:\ProgramData\Microsoft\Windows\Start Menu\Programs\WinMenuGroupTest_MenuGroup" folder.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/WinMenuTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/WinMenuTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,13 @@
  */
 
 /*
+ * Test --win-menu parameter.
+ * Output of the test should be WinMenuTest-1.0.exe installer.
+ * The output installer should provide the same functionality as the default 
+ * installer (see description of the default installer in Test.java).
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/WinPerUserInstallTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/WinPerUserInstallTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,15 @@
  */
 
 /*
+ * Test --win-per-user-install, --win-menu, --win-menu-group parameters.
+ * Output of the test should be WinPerUserInstallTest-1.0.exe installer.
+ * The output installer should provide the same functionality as the default installer 
+ * (see description of the default installer in Test.java) plus it should 
+ * create application menu in Windows Menu and installation should be per 
+ * user and not machine wide.
+ */
+            
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/WinRegistryNameTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/WinRegistryNameTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,17 @@
  */
 
 /*
+ * Test both --file-associations and --win-registry-name parameters.
+ * Output of the test should be WinRegistryNameTest-1.0.exe installer.
+ * The output installer should provide the same functionality as 
+ * installer from FileAssociationsTest.java test with the following 
+ * differences:
+ *  - file association should work for files with with ".jptest2" suffix.
+ *  - file association config should be saved in Windows Registry 
+ *  not under "JPWINTESTREGISTRYNAME" key.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/WinShortcutTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/WinShortcutTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,14 @@
  */
 
 /*
+ * Test --win-shortcut parameter.
+ * Output of the test should be WinShortcutTest-1.0.exe installer.
+ * The output installer should provide the same functionality as the default installer 
+ * (see description of the default installer in Test.java) plus install 
+ * application shortcut on the desktop.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers

--- a/test/jdk/tools/jpackage/windows/exe/WinUpgradeUUIDTest.java	Thu Aug 08 17:21:32 2019 -0400
+++ b/test/jdk/tools/jpackage/windows/exe/WinUpgradeUUIDTest.java	Thu Aug 08 17:23:13 2019 -0400
@@ -22,6 +22,18 @@
  */
 
 /*
+ * Test both --win-upgrade-uuid and --app-version parameters.
+ * Output of the test should be WinUpgradeUUIDTest-1.0.exe 
+ * and WinUpgradeUUIDTest-2.0.exe installers.
+ * Both output installers should provide the same functionality as the default 
+ * installer (see description of the default installer in Test.java) but have 
+ * the same product code and different versions.
+ * Running WinUpgradeUUIDTest-2.0.exe installer should automatically 
+ * uninstall older version of the test application previously installed with
+ * WinUpgradeUUIDTest-1.0.exe installer.
+ */
+
+/*
  * @test
  * @summary jpackage create installer test
  * @library ../../helpers