Skip to content

8328110: Allow simultaneous use of PassFailJFrame with split UI and additional windows#18281

Closed
azvegint wants to merge 1 commit intoopenjdk:masterfrom
azvegint:testsprint_2024_03/8328110_simultaneous_splitui_windows
Closed

8328110: Allow simultaneous use of PassFailJFrame with split UI and additional windows#18281
azvegint wants to merge 1 commit intoopenjdk:masterfrom
azvegint:testsprint_2024_03/8328110_simultaneous_splitui_windows

Conversation

@azvegint
Copy link
Member

@azvegint azvegint commented Mar 13, 2024

It is currently blocked with an artificial check:

if (panelCreator != null) {
    if (splitUI && (testWindows != null || windowListCreator != null)) {
        // TODO Is it required? We can support both
        throw new IllegalStateException("Split UI is not allowed "
                                        + "with additional windows");
    }
}

We have a number of manual tests, which has some text area in the instruction window to print a feedback from the test to be evaluated by a tester.

Removing this check allows us to implement this.
We can consider making a special methods for this later.

This is required for the #18250


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-8328110: Allow simultaneous use of PassFailJFrame with split UI and additional windows (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18281

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 13, 2024

👋 Welcome back azvegint! 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 Mar 13, 2024

@azvegint 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 Mar 13, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 13, 2024

Webrevs

Copy link
Member

@aivanov-jdk aivanov-jdk left a comment

Choose a reason for hiding this comment

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

Let's go for it.

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

8328110: Allow simultaneous use of PassFailJFrame with split UI and additional windows

Reviewed-by: aivanov, honkar

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

  • 2edf408: 8328004: Minor updates to TrayIcon test DisposeInActionEventTest.java
  • 1ad3ebc: 8185862: AWT Assertion Failure in ::GetDIBits(hBMDC, hBM, 0, 1, 0, gpBitmapInfo, 0) 'awt_Win32GraphicsDevice.cpp', at line 185
  • 7f6b7eb: 8327242: Document supported CLDR versions in the javadoc
  • 8f9899b: 8325164: Named groups and signature schemes unavailable with SunPKCS11 in FIPS mode
  • eb45d5b: 8327999: Remove copy of unused registers for cpu features check in x86_64 AVX2 Poly1305 implementation
  • 5cae7d2: 8321299: runtime/logging/ClassLoadUnloadTest.java doesn't reliably trigger class unloading
  • 35b00e6: 8327824: Type annotation placed on incorrect array nesting levels

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Mar 13, 2024
@aivanov-jdk
Copy link
Member

I also considered extending PanelCreator to PanelListCreator, similar to how window lists are handled.

The first panel could be used as a split panel. (Two splits are possible but will it be good?) Additional panels would be converted to JDialogs like it's done for a single panel if split UI isn't enabled.

However, I'm unsure there's a use case for that. Using owned JDialogs results in easier switching to a running test.

Copy link
Contributor

@honkar-jdk honkar-jdk left a comment

Choose a reason for hiding this comment

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

Couple of similar tests can benefit by integrating this change of using testUI & splitUI in combination.

@azvegint
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2024

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

  • 1281e18: 8325613: CTW: Stale method cleanup requires GC after Sweeper removal
  • 49ce85f: 8327874: Convert javax/swing/JTree/4314199/bug4314199.java applet test to main
  • 481c866: 8327468: Do not restart close if errno is EINTR [macOS/linux]
  • 44aef38: 8327045: Consolidate -fvisibility=hidden as a basic flag for all compilation
  • fcf746d: 8328106: COMPARE_BUILD improvements
  • fadc4b1: 8327423: C2 remove_main_post_loops: check if main-loop belongs to pre-loop, not just assert
  • cff0747: 8326204: yield statements doesn't allow cast expressions with more than 1 type arguments
  • 6f2676d: 8328064: Remove obsolete comments in constantPool and metadataFactory
  • 7502dc9: 8328030: Convert javax/swing/text/GlyphView/4984669/bug4984669.java applet test to main
  • 357c912: 8325897: Parallel: Remove PSYoungGen::is_maximal_no_gc
  • ... and 11 more: https://git.openjdk.org/jdk/compare/be344e442b26c6c4c9cc66a0074e6e42379e1155...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 14, 2024

@azvegint Pushed as commit 11a3673.

💡 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.

3 participants