< prev index next >

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

Print this page

        

*** 95,105 **** Test.assertFileExists(dir.resolve(desktopShortcutPath()), exists); } private void verifyStartMenuShortcut() { boolean appInstalled = cmd.launcherInstallationPath().toFile().exists(); ! if (cmd.hasArgument("--win-menu") || !cmd.hasArgument("--win-shortcut")) { if (isUserLocalInstall(cmd)) { verifyUserLocalStartMenuShortcut(appInstalled); verifySystemStartMenuShortcut(false); } else { verifySystemStartMenuShortcut(appInstalled); --- 95,105 ---- Test.assertFileExists(dir.resolve(desktopShortcutPath()), exists); } private void verifyStartMenuShortcut() { boolean appInstalled = cmd.launcherInstallationPath().toFile().exists(); ! if (cmd.hasArgument("--win-menu")) { if (isUserLocalInstall(cmd)) { verifyUserLocalStartMenuShortcut(appInstalled); verifySystemStartMenuShortcut(false); } else { verifySystemStartMenuShortcut(appInstalled);
*** 127,142 **** USER_SHELL_FOLDERS_REGKEY, "Programs")); Test.assertFileExists(dir.resolve(startMenuShortcutPath()), exists); } private void verifyFileAssociationsRegistry() { ! Path faFile = cmd.getArgumentValue("--file-associations", ! () -> (Path) null, Path::of); ! if (faFile == null) { ! return; } boolean appInstalled = cmd.launcherInstallationPath().toFile().exists(); try { Test.trace(String.format( "Get file association properties from [%s] file", faFile)); --- 127,141 ---- USER_SHELL_FOLDERS_REGKEY, "Programs")); Test.assertFileExists(dir.resolve(startMenuShortcutPath()), exists); } private void verifyFileAssociationsRegistry() { ! Stream.of(cmd.getAllArgumentValues("--file-associations")).map( ! Path::of).forEach(this::verifyFileAssociationsRegistry); } + private void verifyFileAssociationsRegistry(Path faFile) { boolean appInstalled = cmd.launcherInstallationPath().toFile().exists(); try { Test.trace(String.format( "Get file association properties from [%s] file", faFile));
< prev index next >