stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8144709: [hidpi] [TestBug] java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java, java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java are failing

Browse Source 
Reviewed-by: alexsch, rchamyal
This commit is contained in:
Prem Balakrishnan 2016-07-22 12:16:33 +05:30
parent 40c1e2c376
commit e5c0bbdf38
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2016, 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
@ -34,14 +34,13 @@ import java.awt.event.*;
* depending on the preferred sizes and gaps and click the cornors
* of the components to check if events are triggered
* @library ../../../../lib/testlibrary/
* @build ExtendedRobot
* @run main ChangeGridSize
* @run main ChangeGridSize -hg 20 -vg 20
*/
public class ChangeGridSize {
private int width = 200;
private int width = 300;
private int height = 200;
private final int hGap, vGap;
private final int rows = 3;
@ -51,7 +50,7 @@ public class ChangeGridSize {
private Button[] buttons;
private Frame frame;
private ExtendedRobot robot;
private Robot robot;
private GridLayout layout;
private volatile boolean actionPerformed = false;
@ -59,7 +58,7 @@ public class ChangeGridSize {
public ChangeGridSize(int hGap, int vGap) throws Exception {
this.hGap = hGap;
this.vGap = vGap;
robot = new ExtendedRobot();
robot = new Robot();
EventQueue.invokeAndWait( () -> {
frame = new Frame("Test frame");
frame.setSize(width, height);
@ -123,10 +122,12 @@ public class ChangeGridSize {
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(500);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle(3000);
robot.delay(3000);
if(!actionPerformed)
if (!actionPerformed) {
frame.dispose();
throw new RuntimeException("Clicking on the left top of button did not trigger action event");
}
actionPerformed = false;
robot.mouseMove(bottomRightX, bottomRightY);
@ -134,10 +135,12 @@ public class ChangeGridSize {
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(500);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle(3000);
robot.delay(3000);
if(!actionPerformed)
if (!actionPerformed) {
frame.dispose();
throw new RuntimeException("Clicking on the bottom right of button did not trigger action event");
}
}
private void doTest() throws Exception {
@ -155,6 +158,7 @@ public class ChangeGridSize {
for (int i = 0; i < buttons.length; i++) {
if (buttons[i].getSize().width != componentWidth ||
buttons[i].getSize().height != componentHeight) {
frame.dispose();
throw new RuntimeException(
"FAIL: Button " + i + " not of proper size" +
"Expected: " + componentWidth + "*" + componentHeight +

22
jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2016, 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
@ -34,14 +34,13 @@ import java.awt.event.InputEvent;
* depending on the preferred sizes and gaps and click the cornors
* of the components to check if events are triggered
* @library ../../../../lib/testlibrary/
* @build ExtendedRobot
* @run main ComponentPreferredSize
* @run main ComponentPreferredSize -hg 20 -vg 20
*/
public class ComponentPreferredSize {
private int width = 200;
private int width = 300;
private int height = 200;
private final int hGap, vGap;
private final int rows = 3;
@ -51,7 +50,7 @@ public class ComponentPreferredSize {
private Button[] buttons;
private Frame frame;
private ExtendedRobot robot;
private Robot robot;
private GridLayout layout;
private volatile boolean actionPerformed = false;
@ -59,7 +58,7 @@ public class ComponentPreferredSize {
public ComponentPreferredSize(int hGap, int vGap) throws Exception {
this.hGap = hGap;
this.vGap = vGap;
robot = new ExtendedRobot();
robot = new Robot();
EventQueue.invokeAndWait( () -> {
frame = new Frame("Test frame");
frame.setSize(width, height);
@ -116,10 +115,12 @@ public class ComponentPreferredSize {
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(500);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle(3000);
robot.delay(3000);
if(!actionPerformed)
if (!actionPerformed) {
frame.dispose();
throw new RuntimeException("Clicking on the left top of button did not trigger action event");
}
actionPerformed = false;
robot.mouseMove(bottomRightX, bottomRightY);
@ -127,10 +128,12 @@ public class ComponentPreferredSize {
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(500);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle(3000);
robot.delay(3000);
if(!actionPerformed)
if (!actionPerformed) {
frame.dispose();
throw new RuntimeException("Clicking on the bottom right of button did not trigger action event");
}
}
private void doTest() throws Exception {
@ -147,6 +150,7 @@ public class ComponentPreferredSize {
for (int i = 0; i < buttons.length; i++) {
if (buttons[i].getSize().width != componentWidth ||
buttons[i].getSize().height != componentHeight) {
frame.dispose();
throw new RuntimeException(
"FAIL: Button " + i + " not of proper size" +
"Expected: " + componentWidth + "*" + componentHeight +