8272232: javax/swing/JTable/4275046/bug4275046.java failed with "Expected value in the cell: 'rededited' but found 'redEDITED'."
8257540: javax/swing/JFileChooser/8041694/bug8041694.java failed with "RuntimeException: The selected directory name is not the expected 'd ' but 'D '." Reviewed-by: serb
This commit is contained in:
parent
14a3ac09fe
commit
cec6c068b0
test/jdk
java/awt
javax/swing
@ -56,6 +56,7 @@ public class ActionEventTest extends Frame {
|
||||
add(list);
|
||||
setSize(400,400);
|
||||
setLayout(new FlowLayout());
|
||||
setLocationRelativeTo(null);
|
||||
pack();
|
||||
setVisible(true);
|
||||
}
|
||||
@ -70,9 +71,9 @@ public class ActionEventTest extends Frame {
|
||||
|
||||
if ((md & expectedMask) != expectedMask) {
|
||||
|
||||
robot.keyRelease(KeyEvent.VK_ALT);
|
||||
robot.keyRelease(KeyEvent.VK_SHIFT);
|
||||
robot.keyRelease(KeyEvent.VK_CONTROL);
|
||||
robot.keyRelease(KeyEvent.VK_SHIFT);
|
||||
robot.keyRelease(KeyEvent.VK_ALT);
|
||||
dispose();
|
||||
throw new RuntimeException("Action Event modifiers are not"
|
||||
+ " set correctly.");
|
||||
@ -87,9 +88,9 @@ public class ActionEventTest extends Frame {
|
||||
// Press Enter on list item, to generate action event.
|
||||
robot.keyPress(KeyEvent.VK_ENTER);
|
||||
robot.keyRelease(KeyEvent.VK_ENTER);
|
||||
robot.keyRelease(KeyEvent.VK_ALT);
|
||||
robot.keyRelease(KeyEvent.VK_SHIFT);
|
||||
robot.keyRelease(KeyEvent.VK_CONTROL);
|
||||
robot.keyRelease(KeyEvent.VK_SHIFT);
|
||||
robot.keyRelease(KeyEvent.VK_ALT);
|
||||
}
|
||||
|
||||
public static void main(String args[]) {
|
||||
|
@ -90,6 +90,7 @@ public class RecognizedActionTest implements AWTEventListener {
|
||||
dragGestureListener);
|
||||
|
||||
frame.getToolkit().addAWTEventListener(this, AWTEvent.MOUSE_EVENT_MASK);
|
||||
frame.setLocationRelativeTo(null);
|
||||
frame.setVisible(true);
|
||||
Thread.sleep(100);
|
||||
|
||||
@ -165,10 +166,10 @@ public class RecognizedActionTest implements AWTEventListener {
|
||||
break;
|
||||
|
||||
case InputEvent.SHIFT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK:
|
||||
robot.keyRelease(KeyEvent.VK_CONTROL);
|
||||
robot.waitForIdle();
|
||||
robot.keyRelease(KeyEvent.VK_SHIFT);
|
||||
robot.waitForIdle();
|
||||
robot.keyRelease(KeyEvent.VK_CONTROL);
|
||||
robot.waitForIdle();
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -102,11 +102,11 @@ public class bug8041694 {
|
||||
}
|
||||
System.out.println(String.format(
|
||||
"The selected directory is '%s'.", selectedDir.getAbsolutePath()));
|
||||
if (selectedDir.getName().equals("d")) {
|
||||
if (selectedDir.getName().toLowerCase().equals("d")) {
|
||||
throw new RuntimeException(
|
||||
"JFileChooser removed trailing spaces in the selected directory name. " +
|
||||
"Expected 'd ' got '" + selectedDir.getName() + "'.");
|
||||
} else if (!selectedDir.getName().equals("d ")) {
|
||||
} else if (!selectedDir.getName().toLowerCase().equals("d ")) {
|
||||
throw new RuntimeException("The selected directory name is not "
|
||||
+ "the expected 'd ' but '" + selectedDir.getName() + "'.");
|
||||
}
|
||||
|
@ -297,8 +297,8 @@ public class bug8033699 {
|
||||
private static void hitKey(Robot robot, int mode, int keycode) {
|
||||
robot.keyPress(mode);
|
||||
robot.keyPress(keycode);
|
||||
robot.keyRelease(mode);
|
||||
robot.keyRelease(keycode);
|
||||
robot.keyRelease(mode);
|
||||
robot.waitForIdle();
|
||||
}
|
||||
}
|
||||
|
@ -87,6 +87,7 @@ public class bug4275046 {
|
||||
table.getColumnModel().getColumn(1).setCellEditor(comboEditor);
|
||||
|
||||
frame.add(table);
|
||||
frame.setLocationRelativeTo(null);
|
||||
frame.pack();
|
||||
frame.setSize(550, 400);
|
||||
frame.setVisible(true);
|
||||
@ -117,6 +118,7 @@ public class bug4275046 {
|
||||
|
||||
private void runTest() throws Exception {
|
||||
robot.waitForIdle();
|
||||
robot.delay(1000);
|
||||
|
||||
// Click the first cell in the "color" column
|
||||
SwingUtilities.invokeAndWait(new Runnable() {
|
||||
@ -175,6 +177,7 @@ public class bug4275046 {
|
||||
public void run() {
|
||||
// Read the edited value of from the cell
|
||||
editedValue = table.getModel().getValueAt(0, 1);
|
||||
editedValue = ((String)editedValue).toLowerCase();
|
||||
System.out.println("The edited value is = " + editedValue);
|
||||
testResult = editedValue.equals(EXPECTED_VALUE);
|
||||
if (testResult) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user