infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-06 14:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8378865: After fix for JDK-8378385 two tests are failing on windows

Browse Source 
Reviewed-by: kizune
This commit is contained in:
Phil Race 2026-02-27 22:24:02 +00:00
parent 4bee207d0a
commit b0318fee71
2 changed files with 0 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
View File

@ -1,119 +0,0 @@
/*
* Copyright (c) 2014, 2025, 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.
*/
import java.awt.Dialog;
import java.awt.Frame;
import java.io.*;
import javax.swing.*;
import sun.awt.SunToolkit;
import java.util.concurrent.atomic.AtomicReference;
/**
* @test
* @key headful
* @bug 8043705
* @summary Can't exit color chooser dialog when running in non-default AppContext
* @modules java.desktop/sun.awt
* @run main CloseDialogTest
*/
public class CloseDialogTest {
private static volatile Frame frame;
private static volatile Dialog dialog;
private static volatile InputStream testErrorStream;
private static final PrintStream systemErrStream = System.err;
private static final AtomicReference<Exception> caughtException
= new AtomicReference<>();
public static void main(String[] args) throws Exception {
// redirect System err
PipedOutputStream errorOutputStream = new PipedOutputStream();
testErrorStream = new PipedInputStream(errorOutputStream);
System.setErr(new PrintStream(errorOutputStream));
ThreadGroup swingTG = new ThreadGroup(getRootThreadGroup(), "SwingTG");
try {
new Thread(swingTG, () -> {
SunToolkit.createNewAppContext();
SwingUtilities.invokeLater(() -> {
frame = new Frame();
frame.setSize(300, 300);
frame.setVisible(true);
dialog = new Dialog(frame);
dialog.setSize(200, 200);
dialog.setModal(true);
dialog.setVisible(true);
});
}).start();
Thread.sleep(400);
Thread disposeThread = new Thread(swingTG, () ->
SwingUtilities.invokeLater(() -> {
try {
while (dialog == null || !dialog.isVisible()) {
Thread.sleep(100);
}
dialog.setVisible(false);
dialog.dispose();
frame.dispose();
} catch (Exception e) {
caughtException.set(e);
}
}));
disposeThread.start();
disposeThread.join();
Thread.sleep(500);
// read System err
final char[] buffer = new char[2048];
System.err.print("END");
System.setErr(systemErrStream);
try (Reader in = new InputStreamReader(testErrorStream, "UTF-8")) {
int size = in.read(buffer, 0, buffer.length);
String errorString = new String(buffer, 0, size);
if (!errorString.startsWith("END")) {
System.err.println(errorString.
substring(0, errorString.length() - 4));
throw new RuntimeException("Error output is not empty!");
}
}
} finally {
if (caughtException.get() != null) {
throw new RuntimeException("Failed. Caught exception!",
caughtException.get());
}
}
}
private static ThreadGroup getRootThreadGroup() {
ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
while (threadGroup.getParent() != null) {
threadGroup = threadGroup.getParent();
}
return threadGroup;
}
}

133
test/jdk/java/awt/Toolkit/DisplayChangesException/DisplayChangesException.java
View File

@ -1,133 +0,0 @@
/*
* Copyright (c) 2018, 2020, 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.
*/
import java.awt.EventQueue;
import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import java.lang.reflect.Method;
import java.util.concurrent.CountDownLatch;
import javax.swing.JButton;
import javax.swing.JFrame;
import sun.awt.DisplayChangedListener;
import sun.awt.SunToolkit;
/**
* @test
* @key headful
* @bug 8207070
* @modules java.desktop/sun.java2d
* java.desktop/sun.awt
* java.desktop/sun.awt.windows:open
*/
public final class DisplayChangesException {
private static boolean fail;
private static CountDownLatch go = new CountDownLatch(1);
static final class TestThread extends Thread {
private JFrame frame;
private TestThread(ThreadGroup tg, String threadName) {
super(tg, threadName);
}
public void run() {
try {
test();
} catch (final Exception e) {
throw new RuntimeException(e);
}
}
private void test() throws Exception {
SunToolkit.createNewAppContext();
EventQueue.invokeAndWait(() -> {
frame = new JFrame();
final JButton b = new JButton();
b.addPropertyChangeListener(evt -> {
if (!SunToolkit.isDispatchThreadForAppContext(b)) {
System.err.println("Wrong thread:" + currentThread());
fail = true;
}
});
frame.add(b);
frame.setSize(100, 100);
frame.setLocationRelativeTo(null);
frame.pack();
});
go.await();
EventQueue.invokeAndWait(() -> {
frame.dispose();
});
}
}
public static void main(final String[] args) throws Exception {
ThreadGroup tg0 = new ThreadGroup("ThreadGroup0");
ThreadGroup tg1 = new ThreadGroup("ThreadGroup1");
TestThread t0 = new TestThread(tg0, "TestThread 0");
TestThread t1 = new TestThread(tg1, "TestThread 1");
t0.start();
t1.start();
Thread.sleep(1500); // Cannot use Robot.waitForIdle
testToolkit();
Thread.sleep(1500);
testGE();
Thread.sleep(1500);
go.countDown();
if (fail) {
throw new RuntimeException();
}
}
private static void testGE() {
Object ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
if (!(ge instanceof DisplayChangedListener)) {
return;
}
((DisplayChangedListener) ge).displayChanged();
}
private static void testToolkit() {
final Class toolkit;
try {
toolkit = Class.forName("sun.awt.windows.WToolkit");
} catch (final ClassNotFoundException ignored) {
return;
}
try {
final Method displayChanged = toolkit.getMethod("displayChanged");
displayChanged.invoke(Toolkit.getDefaultToolkit());
} catch (final Exception e) {
e.printStackTrace();
fail = true;
}
}
}