infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-09 18:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8266162: Remove JPackage duplicate tests

Browse Source 
Reviewed-by: almatvee, herrick
This commit is contained in:
Alexey Semenyuk 2021-05-13 16:30:17 +00:00
parent a259ab4a8d
commit f3c6cda476
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/jdk/tools/jpackage/windows/WinInstallerUiTest.java
View File

@ -63,6 +63,21 @@ public class WinInstallerUiTest {
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});
}

24
test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java
View File

@ -61,6 +61,30 @@ public class WinShortcutPromptTest {
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});
}