-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8334238: Enhance AddLShortcutTest jpackage test #26584
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
8334238: Enhance AddLShortcutTest jpackage test #26584
Conversation
…ageFile: support additional launchers.
…I bundles. With this patch, there is no longer a need to install an MSI package to verify shortcuts.
… verify the contents of an icon file or just verify the icon file's availability.
…nShortcutVerifier class
…: follow-up for function renames in the AdditionalLauncher.
…ditionalLauncher. Introduce LauncherShortcut, LauncherVerifier, LauncherVerifier verifies attributes of any launcher - the main or additional. Add JPackageCommand.createMutableCopy(), hide the copy ctor.
…installed in the system folder on package install and uninstalled on package uninstall. Always verify contents of .desktop files.
…Output` Java property to redirect output
…reamline verifyDesktopFile()
…auncherShortcuts()
…ations of startup directory in the main launcher and in the additional launcher; add testInvokeShortcuts() to invoke launchers through shortcuts and verify work directory; cover shortcuts in the predefined app image
👋 Welcome back asemenyuk! A progress list of the required criteria for merging this PR into |
@alexeysemenyukoracle This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
@alexeysemenyukoracle The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
…ithout JDK-8308349 mods
Webrevs
|
…ithout JDK-8308349 mods
…ent list as it interferes with extracting arguments with optional values.
…corded in .jpackage.xml file
…ed(). Make it public.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
/integrate |
Going to push as commit 7e484e2. |
@alexeysemenyukoracle Pushed as commit 7e484e2. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Additionally, rework launcher verification: move launcher icon and shortcut verification code from AdditionalLauncher into LauncherVerifier. This way launcher verification code is encapsulated in a single class that is applied to the main and additional launchers.
Rework launcher shortcut verification on Windows: Read shortcuts from MSI tables. This allows testing of expected and actual shortcuts without installing the MSI. This refactoring removed duplicated checks of file associations: It was performed for every additional launcher; now it is executed for the main launcher only. File association is bound to the main launcher, there is no point to verify it as many times as the number of launchers.
Implement launching launchers through shortcuts on Linux and Windows. The new
AddLShortcutTest.testInvokeShortcuts
test uses this new functionality.Not directly related to the subject of the PR:
verifyMutable()
calls. Converted "jpt-unpacked-folder" option into the member field. AddedJPackageCommand.createMutableCopy()
complementary to the existingJPackageCommand.createImmutableCopy()
.TKit.waitForFileCreated()
to use classes from thejava.time
package.test/jdk/tools/jpackage/clean_test_output.sh
Bash script filtering test logs to minimize noise in diffs.Compared traces of IconTest, AddlauncherTest, and AddLShortcutTest tests with and without this patch to verify no unexpected changes in the coverage.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26584/head:pull/26584
$ git checkout pull/26584
Update a local copy of the PR:
$ git checkout pull/26584
$ git pull https://git.openjdk.org/jdk.git pull/26584/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26584
View PR using the GUI difftool:
$ git pr show -t 26584
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26584.diff
Using Webrev
Link to Webrev Comment