Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8266162: Remove JPackage duplicate tests #4003

Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -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});
}