8344322: Improve capabilities of jpackage test lib to validate error output of jpackage #22207

alexeysemenyukoracle · 2024-11-18T13:41:49Z

Support using jpackage l10n keys instead of string values when examining jpackage error output.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8344322: Improve capabilities of jpackage test lib to validate error output of jpackage (Enhancement - P4)

Reviewers

Alexander Matveev (@sashamatveev - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22207/head:pull/22207
$ git checkout pull/22207

Update a local copy of the PR:
$ git checkout pull/22207
$ git pull https://git.openjdk.org/jdk.git pull/22207/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22207

View PR using the GUI difftool:
$ git pr show -t 22207

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22207.diff

Using Webrev

Link to Webrev Comment

… strings from jpackage resource bundle. - test harness can better match values produced by @jdk.jpackage.test.Annotations.Parameters functions with test class ctors. - converted ErrorTest to use the new features

…rameter supplying method(s)

…not be cast to class java.lang.Comparable" error

…control on whet OS test method can be executed

@test

…nment. Can control items annotated with @Paremeter, @ParemeterSupplier, and @Paremeters and addition to those with @test annotation

@Args

…spaces (Use @=args instead of @Args)

…le belongs to some app launcher

… tests and make test case descriptions more helpful

… TestBuilder to TestMethodSupplier class

…erriding the current OS in tests

- Make TestBuilderConfig package private. - Fix "--mac-dmg-content" test case data in InOutPathTest

- Use new test annotations to improve InOutPathTest test

… in parameterized test

…ass when building the total set of all test descs

bridgekeeper · 2024-11-18T13:42:22Z

👋 Welcome back asemenyuk! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2024-11-18T13:43:09Z

@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:

8344322: Improve capabilities of jpackage test lib to validate error output of jpackage

Reviewed-by: almatvee

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 17 new commits pushed to the master branch:

5cb0d43: 8293040: Argfile documentation for java launcher tool is confusing regarding usage of wildcards
8d43e0d: 8344331: SM cleanup in java.scripting
f636674: 8344247: Move objectWaiter field to VirtualThread instance
de6e013: 8344310: Remove Security Manager dependencies from javax.crypto and com.sun.crypto packages
92271af: 8344058: Remove doPrivileged calls from macos platform sources in the java.desktop module
70eb95f: 8344187: Remove SecurityManager and related calls from java.instrument
922b12f: 8344078: Remove security manager dependency in java.nio
2649406: 8344352: 32-bit builds crash after JDK-8305895
e9e4200: 8343125: Correct the documentation for TreeMap's getFloorEntry and getCeilingEntry
c59adf6: 8344330: Remove AccessController.doPrivileged() from jdk.charsets module
... and 7 more: https://git.openjdk.org/jdk/compare/dfddbcaab886b9baa731cd748bb7f547e1903b64...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2024-11-18T13:43:50Z

@alexeysemenyukoracle The following label will be automatically applied to this pull request:

core-libs

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.

mlbridge · 2024-11-18T13:47:57Z

Webrevs

00: Full (521e1fd5)

alexeysemenyukoracle · 2024-11-18T14:38:08Z

@sashamatveev ptal

sashamatveev

Looks good.

alexeysemenyukoracle · 2024-11-19T13:53:00Z

/integrate

openjdk · 2024-11-19T13:53:49Z

Going to push as commit 0714114.
Since your change was applied there have been 31 commits pushed to the master branch:

41436bb: 8336087: Doccheck: the jpackage command page doesn't show the correct command-line options
cc8bd63: 8344036: Tests tools/jlink/runtimeImage fail on AIX after JDK-8311302
2359736: 8344534: Remove leftover import of java.security.AccessControlContext in JavaLangAccess
0d66689: 8344393: RISC-V: Remove option UseRVVForBigIntegerShiftIntrinsics
7540fa2: 8343884: [s390x] Disallow OptoScheduling
9d60300: 8344199: Incorrect excluded field value set by getEventWriter intrinsic
8bd080b: 8341901: Using 'var' keyword switch pattern matching causes compiler error
76a55c3: 8341334: CDS: Parallel relocation
499186b: 8343902: javax/swing/plaf/nimbus/8041642/bug8041642.java fails in ubuntu22.04
b12c5b4: 8344218: Remove calls to SecurityManager and and doPrivileged in java.net.NetworkInterface after JEP 486 integration
... and 21 more: https://git.openjdk.org/jdk/compare/dfddbcaab886b9baa731cd748bb7f547e1903b64...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-11-19T13:53:57Z

@alexeysemenyukoracle Pushed as commit 0714114.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

alexeysemenyukoracle added 30 commits November 4, 2024 23:57

Added @ParameterSupplier annotation to allow link test method with pa…

86e832d

…rameter supplying method(s)

Fix "java.lang.ClassCastException: class java.lang.reflect.Method can…

9553295

…not be cast to class java.lang.Comparable" error

Add @Test.includeOn() and @Test.excludeOn() annotation parameters to …

a6b8107

…control on whet OS test method can be executed

More granular control on what test cases executed in the given enviro…

bf0abac

…nment. Can control items annotated with @Paremeter, @ParemeterSupplier, and @Paremeters and addition to those with @test annotation

Merge branch 'master' into TKit.ParameterSupplier

ed51e09

Support @command-file

e8b8331

Can read command file without splitting lines into arguments at white…

1dfd315

…spaces (Use @=args instead of @Args)

Bugfix

1b5acd9

LinuxHelper.verifyDesktopFile() will verify that the given desktop fi…

d09f8b5

…le belongs to some app launcher

Bugfix

01cef8f

Added CannedFormattedString to simplify using string resources in the…

9d0ad98

… tests and make test case descriptions more helpful

Bugfix for the case of empty arguments passed into foo(String ... args)

d7ef6b9

Update copyright year

ac8d913

Run blessed-modifier-order.sh script on changed files

0825485

Trailing whitespaces removed

25a26db

Bugfix

4d87507

Move code handling annotations and other reflection-related work from…

e754e51

… TestBuilder to TestMethodSupplier class

Add unit testing for the new annotations

92eacaa

Add unit tests for ifOS and ifNotOS annotation properties. Support ov…

1591c58

…erriding the current OS in tests

Test summary reworded

0b7101d

- Minor cleanup.

01bffbd

- Make TestBuilderConfig package private. - Fix "--mac-dmg-content" test case data in InOutPathTest

Merge branch 'master' into TKit.ParameterSupplier

7bf7597

- add test coverage to @Parameters.ifOS and @Parameters.ifNotOS.

f939b19

- Use new test annotations to improve InOutPathTest test

Merge branch 'master' into JDK-8343876

f222964

Use Comparator

b13e36d

Full test class name in test case description

2630249

Add test case to validate static test case will be executed only once…

ea454ac

… in parameterized test

Don't create intermediate set of expected test descs for very test cl…

767a8a7

…ass when building the total set of all test descs

Don't run static test methods with test instances

998d993

alexeysemenyukoracle added 7 commits November 8, 2024 22:23

Use "validate" instead of "verify" for the new API

4c6d78e

Merge branch 'master' into JDK-8343876

27f2447

Minor cleanup

1c7e059

Fix finding in the review

66c1583

Remove redundant "method.setAccessible(true);" calls

ba89798

Merge branch 'master' into JDK-8343876.JPackageErrorOutputVerify

916e29f

Comment reworded

521e1fd

openjdk bot added the rfr Pull request is ready for review label Nov 18, 2024

openjdk bot added the core-libs core-libs-dev@openjdk.org label Nov 18, 2024

sashamatveev approved these changes Nov 18, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 18, 2024

openjdk bot added the integrated Pull request has been integrated label Nov 19, 2024

openjdk bot closed this Nov 19, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 19, 2024

alexeysemenyukoracle deleted the JDK-8344322 branch November 19, 2024 14:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8344322: Improve capabilities of jpackage test lib to validate error output of jpackage #22207

8344322: Improve capabilities of jpackage test lib to validate error output of jpackage #22207

alexeysemenyukoracle commented Nov 18, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 18, 2024

openjdk bot commented Nov 18, 2024 •

edited

Loading

openjdk bot commented Nov 18, 2024

mlbridge bot commented Nov 18, 2024

alexeysemenyukoracle commented Nov 18, 2024

sashamatveev left a comment

alexeysemenyukoracle commented Nov 19, 2024

openjdk bot commented Nov 19, 2024

openjdk bot commented Nov 19, 2024

8344322: Improve capabilities of jpackage test lib to validate error output of jpackage #22207

8344322: Improve capabilities of jpackage test lib to validate error output of jpackage #22207

Conversation

alexeysemenyukoracle commented Nov 18, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 18, 2024

openjdk bot commented Nov 18, 2024 • edited Loading

openjdk bot commented Nov 18, 2024

mlbridge bot commented Nov 18, 2024

Webrevs

alexeysemenyukoracle commented Nov 18, 2024

sashamatveev left a comment

Choose a reason for hiding this comment

alexeysemenyukoracle commented Nov 19, 2024

openjdk bot commented Nov 19, 2024

openjdk bot commented Nov 19, 2024

alexeysemenyukoracle commented Nov 18, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Nov 18, 2024 •

edited

Loading