Skip to content

JDK-8340332 : Open source mixed AWT tests - Set3 #21271

Closed
honkar-jdk wants to merge 2 commits intoopenjdk:masterfrom
honkar-jdk:mixedTestBrSet3
Closed

JDK-8340332 : Open source mixed AWT tests - Set3 #21271
honkar-jdk wants to merge 2 commits intoopenjdk:masterfrom
honkar-jdk:mixedTestBrSet3

Conversation

@honkar-jdk
Copy link
Contributor

@honkar-jdk honkar-jdk commented Sep 30, 2024

Following tests are open-sourced in this PR:

  1. /java/awt/MouseInfo/ContainerResizeMousePositionTest.java - Automated
  2. [LINUX ONLY] /java/awt/color/XAWTDifference/XAWTDifference.java - Manual PFJ test

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

Warning

 ⚠️ Patch contains a binary file (test/jdk/java/awt/color/XAWTDifference/XAWTColors.jpg)

Issue

  • JDK-8340332: Open source mixed AWT tests - Set3 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21271

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2024

👋 Welcome back honkar! 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
Copy link

openjdk bot commented Sep 30, 2024

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

8340332: Open source mixed AWT tests - Set3

Reviewed-by: aivanov

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

  • a6b3188: 8337632: AES-GCM Algorithm optimization for x86_64
  • 5586f83: 8341064: Define anchor point and index term for "wrapper classes"
  • 4168faf: 8341100: Add index entries for terms used in java.lang.Class
  • f1bf469: 8341199: Use ClassFile's new API loadConstant(int)
  • 860d49d: 8211400: nsk.share.gc.Memory::getArrayLength returns wrong value
  • cff420d: 8339711: ZipFile.Source.initCEN needlessly reads END header
  • 180affc: 8320318: ObjectMonitor Responsible thread
  • e19c7d8: 8340874: Open source some of the AWT Geometry/Button tests
  • 58b6fc5: 8341197: [BACKOUT] 8322770: Implement C2 VectorizedHashCode on AArch64
  • 1cf26a5: 8341013: Optimize x86/aarch64 MD5 intrinsics by reducing data dependency
  • ... and 26 more: https://git.openjdk.org/jdk/compare/5d062e248ec4be7b35f85c341e76aa6d8d6d8b2b...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 openjdk bot added the rfr Pull request is ready for review label Sep 30, 2024
@openjdk
Copy link

openjdk bot commented Sep 30, 2024

@honkar-jdk The following label will be automatically applied to this pull request:

  • client

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.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Sep 30, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2024

Webrevs

Comment on lines +94 to +95
if (!eventCaught.await(2, TimeUnit.SECONDS)) {
if (!testSucceeded) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two conditions look independent.

If eventCaught.await returned false, the test should fail with a timeout.

Otherwise, the test fails if testSucceeded didn't become true.

Copy link
Contributor Author

@honkar-jdk honkar-jdk Sep 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean this way ? Condition updated

        if (eventCaught.await(2, TimeUnit.SECONDS)) {
            if (!testSucceeded) {
                throw new RuntimeException("Test Failed: Container.getMousePosition(boolean)"
                                           + " returned incorrect result while Container resized");
            }
        } else {
            throw new RuntimeException("Test timeout: Didn't receive"
                                       + " Component Resized Event");
        }

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather not put them into one condition either, even though the condition above looks correct.

        if (!eventCaught.await(2, TimeUnit.SECONDS)) {
            throw new RuntimeException("componentResized isn't received within a timeout");
        }

        if (!testSucceeded) {
            throw new RuntimeException("Container.getMousePosition(boolean)"
                                       + " returned incorrect result while Container resized");
        }

Copy link
Contributor Author

@honkar-jdk honkar-jdk Sep 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After re-reading the comment it makes sense to keep it separate. Thanks. Updated.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 30, 2024
@honkar-jdk
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 30, 2024

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

  • a6b3188: 8337632: AES-GCM Algorithm optimization for x86_64
  • 5586f83: 8341064: Define anchor point and index term for "wrapper classes"
  • 4168faf: 8341100: Add index entries for terms used in java.lang.Class
  • f1bf469: 8341199: Use ClassFile's new API loadConstant(int)
  • 860d49d: 8211400: nsk.share.gc.Memory::getArrayLength returns wrong value
  • cff420d: 8339711: ZipFile.Source.initCEN needlessly reads END header
  • 180affc: 8320318: ObjectMonitor Responsible thread
  • e19c7d8: 8340874: Open source some of the AWT Geometry/Button tests
  • 58b6fc5: 8341197: [BACKOUT] 8322770: Implement C2 VectorizedHashCode on AArch64
  • 1cf26a5: 8341013: Optimize x86/aarch64 MD5 intrinsics by reducing data dependency
  • ... and 26 more: https://git.openjdk.org/jdk/compare/5d062e248ec4be7b35f85c341e76aa6d8d6d8b2b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 30, 2024
@openjdk openjdk bot closed this Sep 30, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 30, 2024
@openjdk
Copy link

openjdk bot commented Sep 30, 2024

@honkar-jdk Pushed as commit bfdeb33.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

client client-libs-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants