8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main #18360

azuev-java · 2024-03-18T20:36:53Z

Convert test to a main based;
Move test to an appropriate folder;
Remove old files;

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-8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main (Bug - P4)

Reviewers

Prasanta Sadhukhan (@prsadhuk - Reviewer)
Alexander Zvegintsev (@azvegint - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18360

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

Using diff file

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

Webrev

Link to Webrev Comment

Convert test to a main based; Move test to an appropriate folder; Remove old files;

bridgekeeper · 2024-03-18T20:37:27Z

👋 Welcome back kizune! 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-03-18T20:38:09Z

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

8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main

Reviewed-by: psadhukhan, 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 206 new commits pushed to the master branch:

e06b568: 8328602: Parallel: Incorrect assertion in fill_dense_prefix_end
528efe2: 8328484: Convert and Opensource few JFileChooser applet test to main
d379afb: 8328312: runtime/stack/Stack0*.java fails intermittently on libgraal
cd534f8: 8328673: Convert closed text/html/CSS manual applet test to main
38e3cda: 8328670: Automate and open source few closed manual applet test
b334a8e: 8328272: [AIX] Use flag kind "diagnostic" for platform specific flags
e669d14: 8328671: Mark allocate_new_tlab and unsafe_max_tlab_alloc of CollectedHeap as pure virtual
940d196: 8328604: remove on_aix() function
d44aaa3: 8326643: JDK server does not send a dummy change_cipher_spec record after HelloRetryRequest message
9bc741d: 8328339: Static import prevents source launcher from finding class with main method
... and 196 more: https://git.openjdk.org/jdk/compare/1f43fa0f8b0f956b41015e0ebc257e15a11ad99b...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-03-18T20:38:32Z

@azuev-java 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.

mlbridge · 2024-03-18T20:42:32Z

Webrevs

prsadhuk · 2024-03-21T16:16:55Z

test/jdk/java/awt/FileDialog/FileDialogForPackages.java

+        frame.add(textScrollPane, BorderLayout.CENTER);
+
+        fd = new FileDialog(new Frame(), "Open");
+        fd.setDirectory(APPLICATIONS_FOLDER);


guess APPLICATION_FOLDER can be made local

With Alexander's suggestion all variables could be made local. Fixing that.

prsadhuk · 2024-03-21T16:17:33Z

test/jdk/java/awt/FileDialog/FileDialogForPackages.java

+        JScrollPane textScrollPane = new JScrollPane(textOutput);
+        frame.add(textScrollPane, BorderLayout.CENTER);
+
+        fd = new FileDialog(new Frame(), "Open");


is there any need to mix Swing and AWT components in the test? I guess you can use the JFrame already created

Actually you don't need the textOutput, with recent changes you can add .logArea() to the PassFailJFrame builder

https://github.com/openjdk/jdk/blob/master/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java#L1200

and just use PassFailJFrame.log() wherever you need it.

So this method can be changed to return a JButton, and use it with splitUIBottom/splitUIRight instead of testUI

Ok, using the PassFailJFrame logger.

prsadhuk · 2024-03-21T16:18:22Z

test/jdk/java/awt/FileDialog/FileDialogForPackages.java

+                .instructions(instructions)
+                .rows((int) instructions.lines().count() + 1)
+                .columns(40)
+                .testUI(FileDialogForPackages::initialize)


It seems the filedialog is obscuring the instruction and test window...I guess it will be good if you can use
position(PassFailJFrame.Position.TOP_LEFT_CORNER)

Unfortunately i can not reposition the test instructions dialog and i got rid of the test window so newly created filedialog will block the instructions. Not sure i can find a reliable way to avoid that.

Made all variables local; Minor changes based on review comments;

azuev-java · 2024-03-22T15:52:02Z

/integrate

openjdk · 2024-03-22T15:52:54Z

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

739957c: 8328384: Convert java/awt/FileDialog/FileDialogOpenDirTest test to main
13cf070: 8328556: Do not extract large CKO_SECRET_KEY keys from the NSS Software Token
709410d: 8328679: Improve comment for UNSAFE_ENTRY_SCOPED in unsafe.cpp
f207aa9: 8326960: GHA: RISC-V sysroot cannot be debootstrapped due to ongoing Debian t64 transition
e80619a: 8328680: Introduce JDK_LIB, and clean up module native compilation
638708c: 8328697: SubMenuShowTest and SwallowKeyEvents tests stabilization
e06b568: 8328602: Parallel: Incorrect assertion in fill_dense_prefix_end
528efe2: 8328484: Convert and Opensource few JFileChooser applet test to main
d379afb: 8328312: runtime/stack/Stack0*.java fails intermittently on libgraal
cd534f8: 8328673: Convert closed text/html/CSS manual applet test to main
... and 202 more: https://git.openjdk.org/jdk/compare/1f43fa0f8b0f956b41015e0ebc257e15a11ad99b...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-03-22T15:52:59Z

@azuev-java Pushed as commit b7a51dd.

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

azuev-java added 2 commits March 18, 2024 13:35

8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main

cfb0224

Convert test to a main based; Move test to an appropriate folder; Remove old files;

Reorganize imports.

0cc79c1

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

openjdk bot added the client client-libs-dev@openjdk.org label Mar 18, 2024

Adding library and build clauses

3e84d47

prsadhuk reviewed Mar 21, 2024

View reviewed changes

Got rid of the test window, using OassFailJFrame instead;

4a000ae

Made all variables local; Minor changes based on review comments;

prsadhuk approved these changes Mar 22, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 22, 2024

azvegint approved these changes Mar 22, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Mar 22, 2024

openjdk bot closed this Mar 22, 2024

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main #18360

8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main #18360

azuev-java commented Mar 18, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Mar 18, 2024

openjdk bot commented Mar 18, 2024 •

edited

Loading

openjdk bot commented Mar 18, 2024

mlbridge bot commented Mar 18, 2024 •

edited

Loading

prsadhuk Mar 21, 2024

azuev-java Mar 22, 2024

prsadhuk Mar 21, 2024

azvegint Mar 21, 2024 •

edited

Loading

azuev-java Mar 22, 2024

prsadhuk Mar 21, 2024

azuev-java Mar 22, 2024

azuev-java commented Mar 22, 2024

openjdk bot commented Mar 22, 2024

openjdk bot commented Mar 22, 2024

8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main #18360

8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main #18360

Conversation

azuev-java commented Mar 18, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Mar 18, 2024

openjdk bot commented Mar 18, 2024 • edited Loading

openjdk bot commented Mar 18, 2024

mlbridge bot commented Mar 18, 2024 • edited Loading

Webrevs

prsadhuk Mar 21, 2024

Choose a reason for hiding this comment

azuev-java Mar 22, 2024

Choose a reason for hiding this comment

prsadhuk Mar 21, 2024

Choose a reason for hiding this comment

azvegint Mar 21, 2024 • edited Loading

Choose a reason for hiding this comment

azuev-java Mar 22, 2024

Choose a reason for hiding this comment

prsadhuk Mar 21, 2024

Choose a reason for hiding this comment

azuev-java Mar 22, 2024

Choose a reason for hiding this comment

azuev-java commented Mar 22, 2024

openjdk bot commented Mar 22, 2024

openjdk bot commented Mar 22, 2024

azuev-java commented Mar 18, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Mar 18, 2024 •

edited

Loading

mlbridge bot commented Mar 18, 2024 •

edited

Loading

azvegint Mar 21, 2024 •

edited

Loading