8044157: [TEST_BUG] Improve recently submitted AWT_Mixing tests

Reviewed-by: pchelko
This commit is contained in:
Yuri Nesterenko 2014-06-04 17:24:13 +04:00
parent e31033ff1a
commit 28f895afc9
46 changed files with 113 additions and 20 deletions

View File

@ -63,11 +63,6 @@ public class FrameBorderCounter {
public void run() {
frame = new Frame("Frame");
frame.setBounds(200, 200, 100, 100);
frame.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
System.exit(0);
}
});
frame.setVisible(true);
}
});

View File

@ -30,6 +30,7 @@ import java.lang.reflect.InvocationTargetException;
import javax.swing.JFrame;
import javax.swing.SpringLayout;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* Base class for testing overlapping of Swing and AWT component put into GlassPane.

View File

@ -76,7 +76,6 @@ public class HierarchyBoundsListenerMixingTest {
@Override
public void windowClosing(WindowEvent event) {
System.err.println("User closed the window");
System.exit(1);
}
});
@ -131,7 +130,7 @@ public class HierarchyBoundsListenerMixingTest {
Thread.sleep(delay * 10);
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
throw new RuntimeException("Robot creation exception.");
}
robot.mouseMove((int) components[0].getLocationOnScreen().x + components[0].getSize().width / 2,
@ -595,7 +594,7 @@ class Sysout {
public static void createDialogWithInstructions(String[] instructions) {
dialog = new TestDialog(new Frame(), "Instructions");
dialog.printInstructions(instructions);
dialog.setVisible(true);
//dialog.setVisible(true);
println("Any messages for the tester will display here.");
}
@ -603,7 +602,7 @@ class Sysout {
dialog = new TestDialog(new Frame(), "Instructions");
String[] defInstr = {"Instructions will appear here. ", ""};
dialog.printInstructions(defInstr);
dialog.setVisible(true);
//dialog.setVisible(true);
println("Any messages for the tester will display here.");
}
@ -643,7 +642,7 @@ class TestDialog extends Dialog {
pack();
setVisible(true);
//setVisible(true);
}// TestDialog()
//DO NOT call this directly, go through Sysout

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JButton
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JButtonInGlassPaneOverlapping
*/
public class JButtonInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JButton
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JButtonOverlapping
*/
public class JButtonOverlapping extends SimpleOverlappingTestBase {

View File

@ -31,6 +31,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JColorChooser
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JColorChooserOverlapping
*/
public class JColorChooserOverlapping extends SimpleOverlappingTestBase {

View File

@ -30,6 +30,8 @@ import java.awt.event.ActionListener;
import javax.swing.BoxLayout;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for {@link javax.swing.JCombobox } component.
@ -40,6 +42,8 @@ import javax.swing.JFrame;
@test
@summary Overlapping test for javax.swing.JScrollPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JComboBoxOverlapping
*/
public class JComboBoxOverlapping extends OverlappingTestBase {

View File

@ -33,6 +33,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JLabel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JEditorPaneInGlassPaneOverlapping
*/
public class JEditorPaneInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -31,6 +31,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JLabel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JEditorPaneOverlapping
*/
public class JEditorPaneOverlapping extends SimpleOverlappingTestBase {

View File

@ -31,6 +31,7 @@ import java.awt.event.MouseEvent;
import javax.swing.JFrame;
import javax.swing.JInternalFrame;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test with JInternalFrame being put in GlassPane.
@ -43,6 +44,8 @@ import javax.swing.SwingUtilities;
@bug 6637655 6985776
@summary Overlapping test for javax.swing.JScrollPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JGlassPaneInternalFrameOverlapping
*/
public class JGlassPaneInternalFrameOverlapping extends OverlappingTestBase {
@ -63,7 +66,7 @@ public class JGlassPaneInternalFrameOverlapping extends OverlappingTestBase {
});
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
throw new RuntimeException("Where is internal frame?");
}
// run robot
Robot robot = Util.createRobot();

View File

@ -32,6 +32,7 @@ import java.awt.event.MouseEvent;
import javax.swing.JFrame;
import javax.swing.JInternalFrame;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test with JInternalFrame being moved in GlassPane.
@ -44,6 +45,8 @@ import javax.swing.SwingUtilities;
@bug 6637655 6981919
@summary Overlapping test for javax.swing.JScrollPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JGlassPaneMoveOverlapping
*/
public class JGlassPaneMoveOverlapping extends OverlappingTestBase {
@ -70,7 +73,7 @@ public class JGlassPaneMoveOverlapping extends OverlappingTestBase {
});
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
throw new RuntimeException("Where is internal frame?");
}
// run robot

View File

@ -30,6 +30,7 @@ import javax.swing.JButton;
import javax.swing.JDesktopPane;
import javax.swing.JFrame;
import javax.swing.JInternalFrame;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for {@link javax.swing.JInternalFrame } component during move.
@ -40,6 +41,8 @@ import javax.swing.JInternalFrame;
@bug 6985399
@summary Overlapping test for javax.swing.JScrollPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JInternalFrameMoveOverlapping
*/
public class JInternalFrameMoveOverlapping extends OverlappingTestBase {

View File

@ -30,6 +30,7 @@ import javax.swing.JButton;
import javax.swing.JDesktopPane;
import javax.swing.JFrame;
import javax.swing.JInternalFrame;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for {@link javax.swing.JInternalFrame } component.
@ -39,6 +40,8 @@ import javax.swing.JInternalFrame;
@test
@summary Overlapping test for javax.swing.JScrollPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JInternalFrameOverlapping
*/
public class JInternalFrameOverlapping extends OverlappingTestBase {

View File

@ -33,6 +33,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JLabel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JLabelInGlassPaneOverlapping
*/
public class JLabelInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JLabel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JLabelOverlapping
*/
public class JLabelOverlapping extends SimpleOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JList
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JListInGlassPaneOverlapping
*/
public class JListInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -31,6 +31,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JList
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JListOverlapping
*/
public class JListOverlapping extends SimpleOverlappingTestBase {

View File

@ -36,6 +36,7 @@ import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JSeparator;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for {@link javax.swing.JMenuBar } and {@link javax.swing.JSeparator} components.
@ -46,6 +47,8 @@ import javax.swing.SwingUtilities;
@test
@summary Overlapping test for javax.swing.JScrollPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JMenuBarOverlapping
*/
public class JMenuBarOverlapping extends OverlappingTestBase {
@ -132,7 +135,7 @@ public class JMenuBarOverlapping extends OverlappingTestBase {
});
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
throw new RuntimeException("Where is separator?");
}
sepLoc.translate(20, 1);
clickAndBlink(robot, sepLoc, false);

View File

@ -33,6 +33,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JPanel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JPanelInGlassPaneOverlapping
*/
public class JPanelInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JPanel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JPanelOverlapping
*/
public class JPanelOverlapping extends SimpleOverlappingTestBase {

View File

@ -33,6 +33,7 @@ import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.SpringLayout;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for {@link javax.swing.JPopupMenu } component.
@ -43,6 +44,8 @@ import javax.swing.SwingUtilities;
@test
@summary Overlapping test for javax.swing.JScrollPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JPopupMenuOverlapping
*/
public class JPopupMenuOverlapping extends OverlappingTestBase {

View File

@ -33,6 +33,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JProgressBar
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JProgressBarInGlassPaneOverlapping
*/
public class JProgressBarInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JProgressBar
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JProgressBarOverlapping
*/
public class JProgressBarOverlapping extends SimpleOverlappingTestBase {

View File

@ -36,6 +36,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JScrollBar
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JScrollBarInGlassPaneOverlapping
*/
public class JScrollBarInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -35,6 +35,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JScrollBar
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JScrollBarOverlapping
*/
public class JScrollBarOverlapping extends SimpleOverlappingTestBase {

View File

@ -32,6 +32,7 @@ import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for {@link javax.swing.JScrollPane } component.
@ -41,6 +42,8 @@ import javax.swing.SwingUtilities;
@test
@summary Overlapping test for javax.swing.JScrollPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JScrollPaneOverlapping
*/
public class JScrollPaneOverlapping extends OverlappingTestBase {

View File

@ -33,6 +33,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JSlider
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JSliderInGlassPaneOverlapping
*/
public class JSliderInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JSlider
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JSliderOverlapping
*/
public class JSliderOverlapping extends SimpleOverlappingTestBase {

View File

@ -35,6 +35,8 @@ import javax.swing.event.ChangeListener;
@test
@summary Simple Overlapping test for javax.swing.JSpinner
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JSpinnerInGlassPaneOverlapping
*/
public class JSpinnerInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -34,6 +34,8 @@ import javax.swing.event.ChangeListener;
@test
@summary Simple Overlapping test for javax.swing.JSpinner
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JSpinnerOverlapping
*/
public class JSpinnerOverlapping extends SimpleOverlappingTestBase {

View File

@ -36,6 +36,7 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for {@link javax.swing.JSplitPane } component.
@ -47,6 +48,8 @@ import javax.swing.SwingUtilities;
@bug 6986109
@summary Overlapping test for javax.swing.JSplitPane
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JSplitPaneOverlapping
*/
public class JSplitPaneOverlapping extends OverlappingTestBase {
@ -99,7 +102,7 @@ public class JSplitPaneOverlapping extends OverlappingTestBase {
});
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
throw new RuntimeException("Where is splitter?");
}
// run robot
Robot robot = Util.createRobot();

View File

@ -35,6 +35,8 @@ import javax.swing.event.TableModelListener;
@test
@summary Simple Overlapping test for JTable
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JTableInGlassPaneOverlapping
*/
public class JTableInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -31,6 +31,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for JTable
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JTableOverlapping
*/
public class JTableOverlapping extends SimpleOverlappingTestBase {

View File

@ -33,6 +33,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JLabel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JTextAreaInGlassPaneOverlapping
*/
public class JTextAreaInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JLabel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JTextAreaOverlapping
*/
public class JTextAreaOverlapping extends SimpleOverlappingTestBase {

View File

@ -33,6 +33,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JLabel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JTextFieldInGlassPaneOverlapping
*/
public class JTextFieldInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JLabel
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JTextFieldOverlapping
*/
public class JTextFieldOverlapping extends SimpleOverlappingTestBase {

View File

@ -32,6 +32,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JToggleButton
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JToggleButtonInGlassPaneOverlapping
*/
public class JToggleButtonInGlassPaneOverlapping extends GlassPaneOverlappingTestBase {

View File

@ -31,6 +31,8 @@ import javax.swing.*;
@test
@summary Simple Overlapping test for javax.swing.JToggleButton
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main JToggleButtonOverlapping
*/
public class JToggleButtonOverlapping extends SimpleOverlappingTestBase {

View File

@ -29,6 +29,7 @@ import java.awt.event.InputEvent;
import javax.swing.JFrame;
import javax.swing.SpringLayout;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test.
@ -40,6 +41,8 @@ import javax.swing.SwingUtilities;
@bug 6777370
@summary Issues when resizing the JFrame with HW components
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main MixingFrameResizing
*/
public class MixingFrameResizing extends OverlappingTestBase {
@ -77,7 +80,7 @@ public class MixingFrameResizing extends OverlappingTestBase {
});
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
throw new RuntimeException("Where is frame?");
}
Robot robot = Util.createRobot();
robot.setAutoDelay(ROBOT_DELAY/2);

View File

@ -26,6 +26,7 @@ import java.awt.*;
import java.awt.event.InputEvent;
import javax.swing.*;
import java.io.*;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for Panel and JPanel behavior during resizing.
@ -36,6 +37,8 @@ import java.io.*;
@bug 6786219
@summary Issues when resizing the frame after mixing of heavy weight & light weight components
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@build FrameBorderCounter
@run main MixingPanelsResizing
*/
@ -365,7 +368,7 @@ class Sysout {
public static void createDialogWithInstructions(String[] instructions) {
dialog = new TestDialog(new Frame(), "Instructions");
dialog.printInstructions(instructions);
dialog.setVisible(true);
//dialog.setVisible(true);
println("Any messages for the tester will display here.");
}
@ -373,7 +376,7 @@ class Sysout {
dialog = new TestDialog(new Frame(), "Instructions");
String[] defInstr = {"Instructions will appear here. ", ""};
dialog.printInstructions(defInstr);
dialog.setVisible(true);
//dialog.setVisible(true);
println("Any messages for the tester will display here.");
}
@ -413,7 +416,7 @@ class TestDialog extends Dialog {
pack();
setVisible(true);
//setVisible(true);
}// TestDialog()
//DO NOT call this directly, go through Sysout

View File

@ -33,6 +33,7 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JButton;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for opaque Swing components.
@ -44,6 +45,8 @@ import javax.swing.SwingUtilities;
@test
@bug 6776743
@summary Opaque overlapping test for each AWT component
@library ../../regtesthelpers
@build Util
@run main OpaqueOverlapping
*/
public class OpaqueOverlapping extends OverlappingTestBase {

View File

@ -31,6 +31,8 @@
@test
@bug 6994264
@summary Opaque overlapping test for Choice AWT component
@library ../../regtesthelpers
@build Util
@run main OpaqueOverlappingChoice
*/
public class OpaqueOverlappingChoice extends OpaqueOverlapping {

View File

@ -31,6 +31,7 @@ import java.util.ArrayList;
import javax.swing.*;
import sun.awt.*;
import java.io.*;
import test.java.awt.regtesthelpers.Util;
/**
* <p>This class provides basis for AWT Mixing testing.
@ -131,7 +132,7 @@ public abstract class OverlappingTestBase {
isFrameBorderCalculated = true;
} catch (IOException e) {
e.printStackTrace();
System.exit(1);
throw new RuntimeException("Problem calculating a native border size");
}
}
return borderShift;

View File

@ -24,6 +24,7 @@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import test.java.awt.regtesthelpers.Util;
/**
* Base class for testing overlapping of Swing and AWT component put into one frame.

View File

@ -37,6 +37,7 @@ import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import test.java.awt.regtesthelpers.Util;
/**
* AWT/Swing overlapping test for viewport
@ -49,6 +50,8 @@ import javax.swing.SwingUtilities;
@bug 6778882
@summary Viewport overlapping test for each AWT component
@author sergey.grinev@oracle.com: area=awt.mixing
@library ../../regtesthelpers
@build Util
@run main ViewportOverlapping
*/
public class ViewportOverlapping extends OverlappingTestBase {
@ -116,7 +119,7 @@ public class ViewportOverlapping extends OverlappingTestBase {
});
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
throw new RuntimeException("Problem preparing test GUI.");
}
// run robot
Robot robot = Util.createRobot();