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
6972078: Can not select single directory with GTKLookAndFeel #10866
Closed
Closed
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
99f317d
Single directory selection fix
kumarabhi006 551a790
Whitespace error fix
kumarabhi006 b87bd67
Merge
kumarabhi006 c129d18
Review comment fix
kumarabhi006 970eca4
Test for all installed LAF
kumarabhi006 8e7adb1
Subtest added for file selection mode
kumarabhi006 0b7d1a6
Review comment fix
kumarabhi006 5c5c564
Review comment fix
kumarabhi006 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
218 changes: 218 additions & 0 deletions
218
test/jdk/com/sun/java/swing/plaf/gtk/TestFileChooserSingleDirectorySelection.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,218 @@ | ||||||
/* | ||||||
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||||||
* | ||||||
* This code is free software; you can redistribute it and/or modify it | ||||||
* under the terms of the GNU General Public License version 2 only, as | ||||||
* published by the Free Software Foundation. | ||||||
* | ||||||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||||||
* version 2 for more details (a copy is included in the LICENSE file that | ||||||
* accompanied this code). | ||||||
* | ||||||
* You should have received a copy of the GNU General Public License version | ||||||
* 2 along with this work; if not, write to the Free Software Foundation, | ||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||||||
* | ||||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||||||
* or visit www.oracle.com if you need additional information or have any | ||||||
* questions. | ||||||
*/ | ||||||
|
||||||
/* | ||||||
* @test | ||||||
* @bug 6972078 | ||||||
* @key headful | ||||||
* @requires (os.family == "linux") | ||||||
* @summary Verifies if user is able to select single directory if multi selection | ||||||
* is enabled for JFileChooser. | ||||||
* @run main TestFileChooserSingleDirectorySelection | ||||||
*/ | ||||||
|
||||||
import java.io.File; | ||||||
import java.awt.BorderLayout; | ||||||
import java.awt.event.ActionEvent; | ||||||
import java.awt.event.ActionListener; | ||||||
import java.awt.event.InputEvent; | ||||||
import java.awt.Point; | ||||||
import java.awt.Robot; | ||||||
import javax.swing.JButton; | ||||||
import javax.swing.JFileChooser; | ||||||
import javax.swing.JFrame; | ||||||
import javax.swing.SwingUtilities; | ||||||
import javax.swing.UIManager; | ||||||
import javax.swing.UnsupportedLookAndFeelException; | ||||||
|
||||||
public class TestFileChooserSingleDirectorySelection { | ||||||
private static JFrame frame; | ||||||
private static JFileChooser fileChooser; | ||||||
private static JButton getSelectedFilesButton; | ||||||
private static Robot robot; | ||||||
private static boolean passed; | ||||||
private static File[] testDir; | ||||||
private static File[] tempFile; | ||||||
|
||||||
public static void main(String[] args) throws Exception { | ||||||
System.setProperty("sun.java2d.uiScale", "1.0"); | ||||||
robot = new Robot(); | ||||||
robot.setAutoDelay(100); | ||||||
|
||||||
try { | ||||||
// create test directory | ||||||
String tmpDir = System.getProperty("user.home"); | ||||||
testDir = new File[1]; | ||||||
testDir[0] = new File(tmpDir, "testDir"); | ||||||
if (!testDir[0].exists()) | ||||||
testDir[0].mkdir(); | ||||||
testDir[0].deleteOnExit(); | ||||||
|
||||||
// create temporary files inside testDir | ||||||
tempFile = new File[5]; | ||||||
for (int i = 0; i < 5; ++i) { | ||||||
tempFile[i] = File.createTempFile("temp", ".txt", | ||||||
new File(testDir[0].getAbsolutePath())); | ||||||
tempFile[i].deleteOnExit(); | ||||||
} | ||||||
} catch (Exception e) { | ||||||
e.printStackTrace(); | ||||||
} | ||||||
for (UIManager.LookAndFeelInfo laf : | ||||||
UIManager.getInstalledLookAndFeels()) { | ||||||
System.out.println("Testing LAF: " + laf.getClassName()); | ||||||
SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf)); | ||||||
checkFileOnlyTest(laf); | ||||||
checkDirectoriesOnlyTest(laf); | ||||||
checkFilesAndDirectoriesTest(laf); | ||||||
System.out.println("Passed"); | ||||||
} | ||||||
} | ||||||
|
||||||
private static void checkFileOnlyTest(UIManager.LookAndFeelInfo laf) | ||||||
throws Exception { | ||||||
System.out.println("Testing File Only mode"); | ||||||
try { | ||||||
SwingUtilities.invokeAndWait(() -> { | ||||||
createAndShowUI(); | ||||||
fileChooser.setCurrentDirectory(testDir[0]); | ||||||
}); | ||||||
|
||||||
robot.waitForIdle(); | ||||||
robot.delay(1000); | ||||||
fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); | ||||||
doTesting(laf, 230); | ||||||
} finally { | ||||||
SwingUtilities.invokeAndWait(() -> { | ||||||
if (frame != null) { | ||||||
frame.dispose(); | ||||||
} | ||||||
}); | ||||||
} | ||||||
} | ||||||
|
||||||
private static void checkDirectoriesOnlyTest(UIManager.LookAndFeelInfo laf) | ||||||
throws Exception { | ||||||
System.out.println("Testing Directories Only mode"); | ||||||
try { | ||||||
SwingUtilities.invokeAndWait(() -> { | ||||||
createAndShowUI(); | ||||||
}); | ||||||
robot.waitForIdle(); | ||||||
robot.delay(1000); | ||||||
fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); | ||||||
doTesting(laf, 50); | ||||||
} finally { | ||||||
SwingUtilities.invokeAndWait(() -> { | ||||||
if (frame != null) { | ||||||
frame.dispose(); | ||||||
} | ||||||
}); | ||||||
} | ||||||
} | ||||||
|
||||||
private static void checkFilesAndDirectoriesTest(UIManager.LookAndFeelInfo laf) | ||||||
throws Exception { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
System.out.println("Testing Files and Directories mode"); | ||||||
try { | ||||||
SwingUtilities.invokeAndWait(() -> { | ||||||
createAndShowUI(); | ||||||
}); | ||||||
robot.waitForIdle(); | ||||||
robot.delay(1000); | ||||||
fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); | ||||||
doTesting(laf, 50); | ||||||
} finally { | ||||||
SwingUtilities.invokeAndWait(() -> { | ||||||
if (frame != null) { | ||||||
frame.dispose(); | ||||||
} | ||||||
}); | ||||||
} | ||||||
} | ||||||
|
||||||
private static void createAndShowUI() { | ||||||
frame = new JFrame("Test File Chooser Single Directory Selection"); | ||||||
frame.getContentPane().setLayout(new BorderLayout()); | ||||||
fileChooser = new JFileChooser("user.home"); | ||||||
fileChooser.setMultiSelectionEnabled(true); | ||||||
fileChooser.setControlButtonsAreShown(false); | ||||||
|
||||||
getSelectedFilesButton = new JButton(); | ||||||
getSelectedFilesButton.setText("Print selected Files"); | ||||||
getSelectedFilesButton.addActionListener(new ActionListener() { | ||||||
public void actionPerformed(ActionEvent evt) { | ||||||
passed = false; | ||||||
File files[] = fileChooser.getSelectedFiles(); | ||||||
if (files.length != 0) { | ||||||
passed = true; | ||||||
} | ||||||
} | ||||||
}); | ||||||
|
||||||
frame.getContentPane().add(fileChooser, BorderLayout.CENTER); | ||||||
frame.getContentPane().add(getSelectedFilesButton, BorderLayout.SOUTH); | ||||||
frame.pack(); | ||||||
frame.setLocationRelativeTo(null); | ||||||
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); | ||||||
frame.setVisible(true); | ||||||
} | ||||||
|
||||||
private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) { | ||||||
try { | ||||||
UIManager.setLookAndFeel(laf.getClassName()); | ||||||
} catch (UnsupportedLookAndFeelException ignored) { | ||||||
System.out.println("Unsupported LAF: " + laf.getClassName()); | ||||||
} catch (ClassNotFoundException | InstantiationException | ||||||
| IllegalAccessException e) { | ||||||
throw new RuntimeException(e); | ||||||
} | ||||||
} | ||||||
|
||||||
private static void doTesting(UIManager.LookAndFeelInfo laf, int xOffset) { | ||||||
Point frameLocation = fileChooser.getLocationOnScreen(); | ||||||
int frameWidth = frame.getWidth(); | ||||||
int frameHeight = frame.getHeight(); | ||||||
|
||||||
Point btnLocation = getSelectedFilesButton.getLocationOnScreen(); | ||||||
int btnWidth = getSelectedFilesButton.getWidth(); | ||||||
int btnHeight = getSelectedFilesButton.getHeight(); | ||||||
clickMouse(frameLocation, 0, frameHeight, xOffset); | ||||||
clickMouse(btnLocation, btnWidth, btnHeight, 0); | ||||||
checkResult(laf); | ||||||
} | ||||||
|
||||||
private static void clickMouse(Point point, int width, int height, | ||||||
int xOffset) { | ||||||
robot.mouseMove(point.x + width/2 + xOffset , point.y + height/3); | ||||||
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); | ||||||
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); | ||||||
robot.delay(100); | ||||||
} | ||||||
|
||||||
private static void checkResult(UIManager.LookAndFeelInfo laf) { | ||||||
if (!passed) | ||||||
throw new RuntimeException("getSelectedFiles returned " + | ||||||
"empty array for LAF: "+laf.getClassName()); | ||||||
} | ||||||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.