Skip to content
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

8316025: Use testUI() method of PassFailJFrame.Builder in FileChooserSymLinkTest.java #15666

Closed

Conversation

aivanov-jdk
Copy link
Member

@aivanov-jdk aivanov-jdk commented Sep 11, 2023

This update to FileChooserSymLinkTest.java demonstrates the usage of the testUI method of the PassFailJFrame.Builder class to streamline creating the UI for manual tests.

The main method is a simple sequence of calls:

    public static void main(String[] args) throws Exception {
        PassFailJFrame.builder()
                      .instructions(INSTRUCTIONS)
                      .rows(35)
                      .columns(50)
                      .testUI(FileChooserSymLinkTest::createTestUI)
                      .build()
                      .awaitAndCheck();
    }

It's the most streamlined way of creating a manual test.

This change depends on #15665 and JDK-8294156 as well as #15661, both of which depend on #15660.


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-8316025: Use testUI() method of PassFailJFrame.Builder in FileChooserSymLinkTest.java (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15666

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

Using diff file

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

Webrev

Link to Webrev Comment

Instructions for FileChooserSymLinkTest are rendered in HTML.
Each text component (JTextArea or JEditorPane) are configured
in its own dedicated method. This avoids unnecessary type casts.
It reverts the accidental change where I unwrapped call to createUI
Moved it to a named class, saved the instance in a field.
It's to be used with test windows.
The Builder now provides a method to create test UI,
PassFailJFrame automatically invokes the method reference
on the EDT and then shows both the instruction frame and
the test window.
Also clean up the doc for disposeWindows().
The WindowClosingHandler is used both for the instruction
frame and for test UI windows.
Also add blank lines to separate different parts of the class.
It's not supposed to be extended.
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 11, 2023

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 11, 2023
@openjdk
Copy link

openjdk bot commented Sep 11, 2023

@aivanov-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 11, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 11, 2023

Webrevs

The windows can be positioned in advance, or
a call back PositionWindows interface can be used
to define their positions after the instruction UI
frame is positioned on the screen.
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 11, 2023

@aivanov-jdk This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/15665 to master October 25, 2023 11:36
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8316025-testUI-SymLinkTest
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

@aivanov-jdk this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8316025-testUI-SymLinkTest
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Oct 25, 2023

⚠️ @aivanov-jdk This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Oct 25, 2023
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Oct 25, 2023
@aivanov-jdk
Copy link
Member Author

aivanov-jdk commented Oct 25, 2023

@prrace, @azvegint Could you take a look?

The PRs on which this one depends have been integrated now. The PR #15661 updated the instructions to HTML, this PR uses the functional style of creating test UI introduced in #15665.

@openjdk
Copy link

openjdk bot commented Oct 27, 2023

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

8316025: Use testUI() method of PassFailJFrame.Builder in FileChooserSymLinkTest.java

Reviewed-by: azvegint

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

  • d226014: 8318850: Duplicate code in the LCMSImageLayout
  • c593f8b: 8318091: Remove empty initIDs functions
  • 4f9f195: 8318753: hsdis binutils may place libs in lib64
  • 2915d74: 8318837: javac generates wrong ldc instruction for dynamic constant loads
  • ddd0716: 8317661: [REDO] store/load order not preserved when handling memory pool due to weakly ordered memory architecture of aarch64
  • 141dae8: 8318811: Compiler directives parser swallows a character after line comments
  • 667cca9: 8288899: java/util/concurrent/ExecutorService/CloseTest.java failed with "InterruptedException: sleep interrupted"
  • b9dcd4b: 8318964: Fix build failures caused by 8315097
  • d52a995: 8315097: Rename createJavaProcessBuilder
  • 957703b: 8307168: Inconsistent validation and handling of --system flag arguments
  • ... and 31 more: https://git.openjdk.org/jdk/compare/c587211bf8c60a7a1f6cc63770c38ede6cb4e173...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 ready Pull request is ready to be integrated label Oct 27, 2023
@aivanov-jdk
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 1, 2023

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

  • 36de19d: 8317048: VerifyError with unnamed pattern variable and more than one components
  • ab19348: 8318647: Serial: Refactor BlockOffsetTable
  • b4f5379: 8304939: os::win32::exit_process_or_thread should be marked noreturn
  • 0461d9a: 8318016: Per-compilation memory ceiling
  • 2a76ad9: 8318683: compiler/c2/irTests/TestPhiDuplicatedConversion.java "Failed IR Rules (2) of Methods (2)"
  • b3fec6b: 8306980: Generated docs should contain correct Legal Documents
  • 1139482: 8316132: CDSProtectionDomain::get_shared_protection_domain should check for exception
  • 2182c93: 8313643: Update HarfBuzz to 8.2.2
  • 613a3cc: 8301846: Invalid TargetDataLine after screen lock when using JFileChooser or COM library
  • 613d32c: 8169475: WheelModifier.java fails by timeout
  • ... and 74 more: https://git.openjdk.org/jdk/compare/c587211bf8c60a7a1f6cc63770c38ede6cb4e173...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 1, 2023

@aivanov-jdk Pushed as commit 7f47c51.

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

@aivanov-jdk aivanov-jdk deleted the 8316025-testUI-SymLinkTest branch November 10, 2023 14:54
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
2 participants