Skip to content

Commit

Permalink
8306575: Clean up and open source four Dialog related tests
Browse files Browse the repository at this point in the history
Backport-of: 8d696aea9e1cefca97a760c017a5fde545facaa9
  • Loading branch information
GoeLin committed Jul 3, 2023
1 parent a72bdbf commit 2f31b3f
Show file tree
Hide file tree
Showing 4 changed files with 587 additions and 0 deletions.
129 changes: 129 additions & 0 deletions test/jdk/java/awt/Dialog/DialogDeadlockTest.java
@@ -0,0 +1,129 @@
/*
* Copyright (c) 2004, 2023, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

/*
@test
@bug 5006427
@summary Shows many modal dialog and checks if there is a deadlock or thread race.
@key headful
@run main DialogDeadlockTest
*/

import java.awt.BorderLayout;
import java.awt.Button;
import java.awt.Dialog;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Window;
import java.lang.reflect.InvocationTargetException;
import java.util.LinkedList;
import java.util.List;

public class DialogDeadlockTest {
public static final int MAX_COUNT = 200;
private static Dialog lastDialog;
private static Runnable r;
private static volatile int count;
private static volatile int cumul;

public static void main(String[] args) throws InterruptedException,
InvocationTargetException {
DialogDeadlockTest ddt = new DialogDeadlockTest();
ddt.start();
}

public void start() {
final Frame frame = new Frame("abc");
final List<Window> toDispose = new LinkedList<>();

try {
frame.setLocation(300, 0);
frame.add(new Button("def"));
frame.pack();
frame.setVisible(true);
cumul = 0;

r = new Runnable() {
public void run() {
count++;
if (count < 10) {
Dialog xlastDialog = lastDialog;
cumul += count;
Dialog d = new Dialog(frame, "Dialog "
+ cumul, true);
d.setLayout(new BorderLayout());
d.add(new Button("button " + count), BorderLayout.CENTER);
d.pack();
toDispose.add(d);
lastDialog = d;
EventQueue.invokeLater(r);
d.setVisible(true);
if (xlastDialog != null) {
xlastDialog.setVisible(false);
} else {
if (cumul < MAX_COUNT) {
count = 0;
lastDialog = null;
EventQueue.invokeLater(r);
}
}
} else {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {
}
lastDialog.setVisible(false);
lastDialog = null;
}
}
};
try {
EventQueue.invokeAndWait(r);
} catch (InterruptedException ignore) {
} catch (Exception e) {
throw new RuntimeException("Unexpected exception: "
+ e.getLocalizedMessage());
}
while (cumul < MAX_COUNT - 1) {
try {
Thread.sleep(1000);
} catch (InterruptedException ignore) {}
}
System.out.println("Test PASSED");
} finally {
try {
EventQueue.invokeAndWait(() -> {
frame.setVisible(false);
frame.dispose();
for (Window w: toDispose) {
w.dispose();
}
});
} catch (InterruptedException e) {
throw new RuntimeException(e);
} catch (InvocationTargetException e) {
throw new RuntimeException(e);
}
}
}
}
182 changes: 182 additions & 0 deletions test/jdk/java/awt/Dialog/DialogLocationTest.java
@@ -0,0 +1,182 @@
/*
* Copyright (c) 1999, 2023, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

/*
@test
@bug 4101437
@summary Dialog.setLocation(int,int) works unstable when the dialog is visible
@key headful
@run main DialogLocationTest
*/

import java.awt.AWTException;
import java.awt.Container;
import java.awt.Dialog;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.GraphicsEnvironment;
import java.awt.Panel;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Robot;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.lang.reflect.InvocationTargetException;
import java.util.Random;

public class DialogLocationTest extends Panel {
private volatile int count = 0;
private Dialog my_dialog;
private volatile boolean waitingForEvent = false;
private volatile int newX, newY;
Random random = new Random();

public void init() {
Container f = getParent();

while (!(f instanceof Frame)) {
f = f.getParent();
}

my_dialog = new Dialog((Frame) f, "TestDialog");
my_dialog.setSize(150, 100);

setSize(200, 200);
}

public void start() throws InterruptedException,
InvocationTargetException {
Robot robot;
try {
robot = new Robot();
EventQueue.invokeAndWait(() -> {
my_dialog.setLocationRelativeTo(null);
my_dialog.setVisible(true);
});
robot.waitForIdle();
robot.delay(1000);
my_dialog.addComponentListener(new CL());
setDialogLocation(my_dialog);
} catch (AWTException e) {
throw new RuntimeException(e);
} finally {
EventQueue.invokeAndWait(() -> {
my_dialog.setVisible(false);
my_dialog.dispose();
});
}
}

public void setDialogLocation(Dialog dialog) {
int height, width, insetX, insetY;
Point curLoc;
int i;

Rectangle screen = GraphicsEnvironment
.getLocalGraphicsEnvironment()
.getMaximumWindowBounds();
height = screen.height;
width = screen.width;
insetX = screen.x;
insetY = screen.y;

String message = "Failed on iteration %d expect:[%d,%d] "
+ "reported:[%d,%d] diff:[%d,%d]";

for (i = 0; i < 100; i++) {
newX = random.nextInt(insetX, width - 300);
newY = random.nextInt(insetY, height - 400);

if (newX == 0 && newY == 0) {
i--;
continue;
}

waitingForEvent = true;

EventQueue.invokeLater(() -> {
dialog.setLocation(newX, newY);
});

while (waitingForEvent) {
Thread.yield();
}

curLoc = dialog.getLocation();
if (curLoc.x != newX || curLoc.y != newY) {
count++;
System.out.println(message.formatted(i, newX, newY,
curLoc.x, curLoc.y, curLoc.x - newX, curLoc.y - newY));
System.out.flush();
}
}

if (count > 0) {
throw new RuntimeException("Dialog Location was set incorrectly");
}
}

public class CL extends ComponentAdapter {
int lastX, lastY;
String message = "Failed in componentMoved() expect:[%d,%d]"
+ " reported: [%d,%d] diff [%d,%d]";

public void componentMoved(ComponentEvent e) {
if (e.getComponent() == my_dialog) {
Point eventLoc = e.getComponent().getLocation();
if (lastX != eventLoc.x || lastY != eventLoc.y) {
lastX = eventLoc.x;
lastY = eventLoc.y;
if (newX != 0 && newY != 0 && (eventLoc.x != newX || eventLoc.y != newY)) {
count++;
System.out.println(message.formatted(newX, newY,
eventLoc.x, eventLoc.y,
eventLoc.x - newX, eventLoc.y - newY));
System.out.flush();
}
waitingForEvent = false;
}
}
}
}

public static void main(String[] args) throws InterruptedException,
InvocationTargetException {
Frame frame = new Frame("DialogLocationTest");
try {
DialogLocationTest test = new DialogLocationTest();
EventQueue.invokeAndWait(() -> {
frame.add(test);
test.init();
frame.setVisible(true);
});
test.start();
} finally {
EventQueue.invokeLater(() -> {
frame.setVisible(false);
frame.dispose();
});
}
}
}

1 comment on commit 2f31b3f

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.