Skip to content

Commit f3c6cda

Browse files
author
Alexey Semenyuk
committedMay 13, 2021
8266162: Remove JPackage duplicate tests
Reviewed-by: almatvee, herrick
1 parent a259ab4 commit f3c6cda

File tree

2 files changed

+39
-0
lines changed

2 files changed

+39
-0
lines changed
 

‎test/jdk/tools/jpackage/windows/WinInstallerUiTest.java

+15
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,21 @@ public static List<Object[]> data() {
6363
for (var withDirChooser : List.of(Boolean.TRUE, Boolean.FALSE)) {
6464
for (var withLicense : List.of(Boolean.TRUE, Boolean.FALSE)) {
6565
for (var withShortcutPrompt : List.of(Boolean.TRUE, Boolean.FALSE)) {
66+
if (!withDirChooser && !withLicense && !withShortcutPrompt) {
67+
// Duplicates SimplePackageTest
68+
continue;
69+
}
70+
71+
if (withDirChooser && !withLicense && !withShortcutPrompt) {
72+
// Duplicates WinDirChooserTest
73+
continue;
74+
}
75+
76+
if (!withDirChooser && withLicense && !withShortcutPrompt) {
77+
// Duplicates LicenseTest
78+
continue;
79+
}
80+
6681
data.add(new Object[]{withDirChooser, withLicense,
6782
withShortcutPrompt});
6883
}

‎test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java

+24
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,30 @@ public static List<Object[]> data() {
6161
for (var withStartMenuShortcut : List.of(Boolean.TRUE, Boolean.FALSE)) {
6262
for (var withDesktopShortcut : List.of(Boolean.TRUE, Boolean.FALSE)) {
6363
for (var withShortcutPrompt : List.of(Boolean.TRUE, Boolean.FALSE)) {
64+
if (withShortcutPrompt && withStartMenuShortcut
65+
&& withDesktopShortcut) {
66+
// Duplicates WinInstallerUiTestWithShortcutPromptTest (WinInstallerUiTest(withShortcutPrompt=true))
67+
continue;
68+
}
69+
70+
if (!withShortcutPrompt && !withStartMenuShortcut
71+
&& !withDesktopShortcut) {
72+
// Duplicates SimplePackageTest
73+
continue;
74+
}
75+
76+
if (!withShortcutPrompt && !withStartMenuShortcut
77+
&& withDesktopShortcut) {
78+
// Duplicates WinShortcutTest
79+
continue;
80+
}
81+
82+
if (!withShortcutPrompt && withStartMenuShortcut
83+
&& !withDesktopShortcut) {
84+
// Duplicates WinMenuTest
85+
continue;
86+
}
87+
6488
data.add(new Object[]{withStartMenuShortcut,
6589
withDesktopShortcut, withShortcutPrompt});
6690
}

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on May 13, 2021

@openjdk-notifier[bot]
Please sign in to comment.