8044157: [TEST_BUG] Improve recently submitted AWT_Mixing tests
Reviewed-by: pchelko
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java Wed Jun 04 17:24:13 2014 +0400
@@ -63,11 +63,6 @@
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);
}
});
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java Wed Jun 04 17:24:13 2014 +0400
@@ -30,6 +30,7 @@
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.
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java Wed Jun 04 17:24:13 2014 +0400
@@ -76,7 +76,6 @@
@Override
public void windowClosing(WindowEvent event) {
System.err.println("User closed the window");
- System.exit(1);
}
});
@@ -131,7 +130,7 @@
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 @@
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 @@
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 @@
pack();
- setVisible(true);
+ //setVisible(true);
}// TestDialog()
//DO NOT call this directly, go through Sysout
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -31,6 +31,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -30,6 +30,8 @@
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 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -31,6 +31,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -31,6 +31,7 @@
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 @@
@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 @@
});
} catch (Exception e) {
e.printStackTrace();
- System.exit(1);
+ throw new RuntimeException("Where is internal frame?");
}
// run robot
Robot robot = Util.createRobot();
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,7 @@
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 @@
@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 @@
});
} catch (Exception e) {
e.printStackTrace();
- System.exit(1);
+ throw new RuntimeException("Where is internal frame?");
}
// run robot
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -30,6 +30,7 @@
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 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -30,6 +30,7 @@
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 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -31,6 +31,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -36,6 +36,7 @@
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 @@
@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 @@
});
} catch (Exception e) {
e.printStackTrace();
- System.exit(1);
+ throw new RuntimeException("Where is separator?");
}
sepLoc.translate(20, 1);
clickAndBlink(robot, sepLoc, false);
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,7 @@
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 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -36,6 +36,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -35,6 +35,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,7 @@
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 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -35,6 +35,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -34,6 +34,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -36,6 +36,7 @@
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 @@
@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 @@
});
} catch (Exception e) {
e.printStackTrace();
- System.exit(1);
+ throw new RuntimeException("Where is splitter?");
}
// run robot
Robot robot = Util.createRobot();
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -35,6 +35,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -31,6 +31,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -32,6 +32,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -31,6 +31,8 @@
@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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java Wed Jun 04 17:24:13 2014 +0400
@@ -29,6 +29,7 @@
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 @@
@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 @@
});
} catch (Exception e) {
e.printStackTrace();
- System.exit(1);
+ throw new RuntimeException("Where is frame?");
}
Robot robot = Util.createRobot();
robot.setAutoDelay(ROBOT_DELAY/2);
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java Wed Jun 04 17:24:13 2014 +0400
@@ -26,6 +26,7 @@
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 @@
@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 @@
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 @@
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 @@
pack();
- setVisible(true);
+ //setVisible(true);
}// TestDialog()
//DO NOT call this directly, go through Sysout
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -33,6 +33,7 @@
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 @@
@test
@bug 6776743
@summary Opaque overlapping test for each AWT component
+@library ../../regtesthelpers
+@build Util
@run main OpaqueOverlapping
*/
public class OpaqueOverlapping extends OverlappingTestBase {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java Wed Jun 04 17:24:13 2014 +0400
@@ -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 {
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java Wed Jun 04 17:24:13 2014 +0400
@@ -31,6 +31,7 @@
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 @@
isFrameBorderCalculated = true;
} catch (IOException e) {
e.printStackTrace();
- System.exit(1);
+ throw new RuntimeException("Problem calculating a native border size");
}
}
return borderShift;
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java Wed Jun 04 17:24:13 2014 +0400
@@ -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.
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java Wed Jun 04 17:14:56 2014 +0400
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java Wed Jun 04 17:24:13 2014 +0400
@@ -37,6 +37,7 @@
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 @@
@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 @@
});
} catch (Exception e) {
e.printStackTrace();
- System.exit(1);
+ throw new RuntimeException("Problem preparing test GUI.");
}
// run robot
Robot robot = Util.createRobot();