Skip to content

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

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.

Sign up for GitHub

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

Closed
aivanov-jdk wants to merge 19 commits into from
Closed

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

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0d5343a
Enable HTML display if instructions start with <html>
aivanov-jdk Oct 12, 2022
db08cfc
Improve instruction formatting
aivanov-jdk Sep 11, 2023
80fec8a
Refactor configuration of a text component for instructions
aivanov-jdk Oct 12, 2022
7753b3f
Revert changes to FileChooserSymLinkTest.java
aivanov-jdk Sep 11, 2023
c388d73
Wrap createUI call
aivanov-jdk Sep 11, 2023
b78c62b
Refactor windowClosing listener
aivanov-jdk Oct 12, 2022
3fc976d
Build functional test UI
aivanov-jdk Oct 12, 2022
338416f
Use statically imported invokeAndWait and isEDT
aivanov-jdk Oct 13, 2022
fd5689b
Use functional style for disposing of windows
aivanov-jdk Oct 13, 2022
bdfc39d
Use invokeOnEDT in getInstructionFrameBounds
aivanov-jdk Oct 13, 2022
62a477e
Amend message in window closing handler
aivanov-jdk Sep 11, 2023
37a8489
Mark the Builder class final
aivanov-jdk Sep 11, 2023
70256b6
Remove trailing whitespace
aivanov-jdk Sep 11, 2023
cb18355
Use testUI() and builder pattern to create test UI
aivanov-jdk Sep 11, 2023
62521e3
8294156: Allow creating several test windows
aivanov-jdk Sep 13, 2023
082da7e
Merge branch '8294156-func-manual-TestUI' into 8316025-testUI-SymLink…
aivanov-jdk Sep 13, 2023
a813fe8
8316025: Update the return type of createTestUI
aivanov-jdk Sep 13, 2023
29b8399
Merge master
aivanov-jdk Oct 25, 2023
0f4f67b
Amend indentation of nested <li> elements
aivanov-jdk Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 63 additions & 70 deletions test/jdk/javax/swing/JFileChooser/FileChooserSymLinkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
*/

import java.awt.BorderLayout;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.List;

import javax.swing.JCheckBox;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTextArea;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import javax.swing.JTextArea;
import javax.swing.WindowConstants;

/*
Expand All @@ -51,87 +51,80 @@
* @run main/manual FileChooserSymLinkTest
*/
public class FileChooserSymLinkTest {
private static final String INSTRUCTIONS = """
<html><body>
Instructions to Test:
<ol>
<li>Open an elevated <i>Command Prompt</i>.
<li>Paste the following commands:
<pre><code>cd /d C:\\
mkdir FileChooserTest
cd FileChooserTest
mkdir target
mklink /d link target</code></pre>

<li>Navigate to <code>C:\\FileChooserTest</code> in
the <code>JFileChooser</code>.
<li>Perform testing in single- and multi-selection modes:
<ul style="margin-bottom: 0px">
<li><strong>Single-selection:</strong>
<ol>
<li>Ensure <b>Enable multi-selection</b> is cleared
(the default state).
<li>Click <code>link</code> directory,
the absolute path of the symbolic
link should be displayed.<br>
If it's <code>null</code>, click <b>Fail</b>.
<li>Click <code>target</code> directory,
its absolute path should be displayed.
</ol>
<li><strong>Multi-selection:</strong>
<ol>
<li>Select <b>Enable multi-selection</b>.
<li>Click <code>link</code>,
<li>Press <kbd>Ctrl</kbd> and
then click <code>target</code>.
<li>Both should be selected and
their absolute paths should be displayed.
<li>If <code>link</code> can't be selected or
if its absolute path is <code>null</code>,
click <b>Fail</b>.
</ol>
</ul>
<p>If <code>link</code> can be selected in both
single- and multi-selection modes, click <b>Pass</b>.</p>
<li>When done with testing, paste the following commands to
remove the <code>FileChooserTest</code> directory:
<pre><code>cd \\
rmdir /s /q C:\\FileChooserTest</code></pre>

or use File Explorer to clean it up.
</ol>
""";

static JFrame frame;
static JFileChooser jfc;
static JPanel panel;
static JTextArea pathList;
static JCheckBox multiSelection;
static PassFailJFrame passFailJFrame;

public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
try {
initialize();
} catch (InterruptedException | InvocationTargetException e) {
throw new RuntimeException(e);
}
}
});
passFailJFrame.awaitAndCheck();
PassFailJFrame.builder()
.instructions(INSTRUCTIONS)
.rows(35)
.columns(50)
.testUI(FileChooserSymLinkTest::createTestUI)
.build()
.awaitAndCheck();
}

static void initialize() throws InterruptedException, InvocationTargetException {
//Initialize the components
final String INSTRUCTIONS = """
<html><body>
Instructions to Test:
<ol>
<li>Open an elevated <i>Command Prompt</i>.
<li>Paste the following commands:
<pre><code>cd /d C:\\
mkdir FileChooserTest
cd FileChooserTest
mkdir target
mklink /d link target</code></pre>

<li>Navigate to <code>C:\\FileChooserTest</code> in
the <code>JFileChooser</code>.
<li>Perform testing in single- and multi-selection modes:
<ul style="margin-bottom: 0px">
<li><strong>Single-selection:</strong>
<ol>
<li>Ensure <b>Enable multi-selection</b> is cleared
(the default state).
<li>Click <code>link</code> directory,
the absolute path of the symbolic
link should be displayed.<br>
If it's <code>null</code>, click <b>Fail</b>.
<li>Click <code>target</code> directory,
its absolute path should be displayed.
</ol>
<li><strong>Multi-selection:</strong>
<ol>
<li>Select <b>Enable multi-selection</b>.
<li>Click <code>link</code>,
<li>Press <kbd>Ctrl</kbd> and
then click <code>target</code>.
<li>Both should be selected and
their absolute paths should be displayed.
<li>If <code>link</code> can't be selected or
if its absolute path is <code>null</code>,
click <b>Fail</b>.
</ol>
</ul>
<p>If <code>link</code> can be selected in both
single- and multi-selection modes, click <b>Pass</b>.</p>
<li>When done with testing, paste the following commands to
remove the <code>FileChooserTest</code> directory:
<pre><code>cd \\
rmdir /s /q C:\\FileChooserTest</code></pre>

or use File Explorer to clean it up.
</ol>
""";
private static List<Window> createTestUI() {
frame = new JFrame("JFileChooser Symbolic Link test");
panel = new JPanel(new BorderLayout());
multiSelection = new JCheckBox("Enable Multi-Selection");
pathList = new JTextArea(10, 50);
jfc = new JFileChooser(new File("C:\\"));
passFailJFrame = new PassFailJFrame("Test Instructions", INSTRUCTIONS, 5L, 35, 50);

PassFailJFrame.addTestWindow(frame);
PassFailJFrame.positionTestWindow(frame, PassFailJFrame.Position.HORIZONTAL);
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
panel.add(multiSelection, BorderLayout.EAST);
panel.add(new JScrollPane(pathList), BorderLayout.WEST);
Expand Down Expand Up @@ -166,6 +159,6 @@ public void propertyChange(PropertyChangeEvent evt) {
frame.add(panel, BorderLayout.NORTH);
frame.add(jfc, BorderLayout.CENTER);
frame.pack();
frame.setVisible(true);
return List.of(frame);
}
}