Skip to content
Permalink
Browse files
8266162: Remove JPackage duplicate tests
Reviewed-by: almatvee, herrick
  • Loading branch information
Alexey Semenyuk committed May 13, 2021
1 parent a259ab4 commit f3c6cda47631cc123dbcddbfb627dc05cf7bc13b
Showing with 39 additions and 0 deletions.
  1. +15 −0 test/jdk/tools/jpackage/windows/WinInstallerUiTest.java
  2. +24 −0 test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java
@@ -63,6 +63,21 @@ public WinInstallerUiTest(Boolean withDirChooser, Boolean withLicense,
for (var withDirChooser : List.of(Boolean.TRUE, Boolean.FALSE)) {
for (var withLicense : List.of(Boolean.TRUE, Boolean.FALSE)) {
for (var withShortcutPrompt : List.of(Boolean.TRUE, Boolean.FALSE)) {
if (!withDirChooser && !withLicense && !withShortcutPrompt) {
// Duplicates SimplePackageTest
continue;
}

if (withDirChooser && !withLicense && !withShortcutPrompt) {
// Duplicates WinDirChooserTest
continue;
}

if (!withDirChooser && withLicense && !withShortcutPrompt) {
// Duplicates LicenseTest
continue;
}

data.add(new Object[]{withDirChooser, withLicense,
withShortcutPrompt});
}
@@ -61,6 +61,30 @@ public WinShortcutPromptTest(Boolean withStartMenuShortcut,
for (var withStartMenuShortcut : List.of(Boolean.TRUE, Boolean.FALSE)) {
for (var withDesktopShortcut : List.of(Boolean.TRUE, Boolean.FALSE)) {
for (var withShortcutPrompt : List.of(Boolean.TRUE, Boolean.FALSE)) {
if (withShortcutPrompt && withStartMenuShortcut
&& withDesktopShortcut) {
// Duplicates WinInstallerUiTestWithShortcutPromptTest (WinInstallerUiTest(withShortcutPrompt=true))
continue;
}

if (!withShortcutPrompt && !withStartMenuShortcut
&& !withDesktopShortcut) {
// Duplicates SimplePackageTest
continue;
}

if (!withShortcutPrompt && !withStartMenuShortcut
&& withDesktopShortcut) {
// Duplicates WinShortcutTest
continue;
}

if (!withShortcutPrompt && withStartMenuShortcut
&& !withDesktopShortcut) {
// Duplicates WinMenuTest
continue;
}

data.add(new Object[]{withStartMenuShortcut,
withDesktopShortcut, withShortcutPrompt});
}

1 comment on commit f3c6cda

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on f3c6cda May 13, 2021

Please sign in to comment.