diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index ed709e1b7ccbe..a7491c400bc36 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -151,42 +151,13 @@ java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java 7080150 macosx-all java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java 8168646 generic-all java/awt/List/KeyEventsTest/KeyEventsTest.java 8201307 linux-all java/awt/Paint/ListRepaint.java 8201307 linux-all -java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java 8049405 macosx-all -java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java 8294264 windows-x64 java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java 8048171 generic-all -java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java 8159451 linux-all,windows-all,macosx-all +java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java 8159451 macosx-all java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java 6986109 generic-all java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java 6986109 windows-all -java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java 8049405 generic-all +java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java 8049405 macosx-all java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java 8049405 macosx-all java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java 8049405 macosx-all -java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JListOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JTableOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java 8158801 windows-all -java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java 8158801 windows-all java/awt/Mixing/NonOpaqueInternalFrame.java 7124549 macosx-all java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8298823 macosx-all java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java 6829264 generic-all diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java index f67e71b1b19e1..49fbe36e33537 100644 --- a/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java +++ b/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java @@ -61,7 +61,7 @@ protected void prepareControls() { } f = new JFrame("Mixing : GlassPane Overlapping test"); f.setLayout(new SpringLayout()); - f.setSize(200, 200); + f.setSize(FRAME_WIDTH, FRAME_HEIGHT); propagateAWTControls(f); diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java index cc02e9afbeb76..e7d5167d10ea4 100644 --- a/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java +++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java @@ -63,7 +63,7 @@ public class JComboBoxOverlapping extends OverlappingTestBase { protected void prepareControls() { frame = new JFrame("Mixing : Dropdown Overlapping test"); frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); - frame.setSize(200, 200); + frame.setSize(FRAME_WIDTH, FRAME_HEIGHT); frame.setVisible(true); cb = new JComboBox(petStrings); diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java index 792831c2d8d23..34f1cba6e5d33 100644 --- a/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java +++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java @@ -71,7 +71,7 @@ public class JMenuBarOverlapping extends OverlappingTestBase { protected void prepareControls() { frame = new JFrame("Mixing : Dropdown Overlapping test"); frame.setLayout(new GridLayout(0,1)); - frame.setSize(200, 200); + frame.setSize(FRAME_WIDTH, FRAME_HEIGHT); frame.setVisible(true); menuBar = new JMenuBar(); diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java index d4b50287dc644..e6cf0353a3d6f 100644 --- a/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java +++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java @@ -67,7 +67,7 @@ protected void prepareControls() { } frame = new JFrame("Mixing : Dropdown Overlapping test"); frame.setLayout(new SpringLayout()); - frame.setSize(200, 200); + frame.setSize(FRAME_WIDTH, FRAME_HEIGHT); popup = new JPopupMenu(); ActionListener menuListener = new ActionListener() { diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java index 794578a59076f..eebf4e2e24f9e 100644 --- a/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java +++ b/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java @@ -80,6 +80,8 @@ * @author Sergey Grinev */ public abstract class OverlappingTestBase { + protected static final int FRAME_WIDTH = 300; + protected static final int FRAME_HEIGHT = 200; // working variables private static volatile boolean wasHWClicked = false; private static volatile boolean passed = true; @@ -163,13 +165,12 @@ protected int frameBorderCounter() { public void getVerifyColor() { try { - final int size = 200; final Point[] p = new Point[1]; SwingUtilities.invokeAndWait(new Runnable() { public void run(){ JFrame frame = new JFrame("set back"); frame.getContentPane().setBackground(AWT_BACKGROUND_COLOR); - frame.setSize(size, size); + frame.setSize(FRAME_WIDTH, FRAME_HEIGHT); frame.setUndecorated(true); frame.setVisible(true); frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); @@ -179,7 +180,8 @@ public void run(){ Robot robot = new Robot(); robot.waitForIdle(); Thread.sleep(ROBOT_DELAY); - AWT_VERIFY_COLOR = robot.getPixelColor(p[0].x+size/2, p[0].y+size/2); + AWT_VERIFY_COLOR = robot.getPixelColor(p[0].x+FRAME_WIDTH/2, + p[0].y+FRAME_HEIGHT/2); System.out.println("Color will be compared with " + AWT_VERIFY_COLOR + " instead of " + AWT_BACKGROUND_COLOR); } catch (Exception e) { System.err.println("Cannot get verify color: "+e.getMessage()); diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java index 928a5c437cb6b..d82153f7a9e7e 100644 --- a/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java +++ b/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java @@ -91,7 +91,7 @@ protected void prepareControls() { final JFrame f = new JFrame("Mixing : Simple Overlapping test"); f.setLayout(new SpringLayout()); - f.setSize(200, 200); + f.setSize(FRAME_WIDTH, FRAME_HEIGHT); testedComponent = getSwingComponent();