提交 6ae611c9 编写于 作者: A ant

6609607: test/closed/java/awt/Focus/AppletInitialFocusTest should be rewritten

Summary: Using test.java.awt.regtesthelpers.Util. Refactoring.
Reviewed-by: volk
上级 5e852cbc
<html> <html>
<!-- <!--
test @test
@bug 4041703 4096228 4025223 4260929 @bug 4041703 4096228 4025223 4260929
@summary Ensures that appletviewer sets a reasonable default focus @summary Ensures that appletviewer sets a reasonable default focus for an Applet on start
for an Applet on start
@author das area=appletviewer @author das area=appletviewer
@run shell AppletInitialFocusTest.sh @library ../../regtesthelpers
@build Util
@run applet AppletInitialFocusTest.html
--> -->
<head> <head>
<title> AppletInitialFocusTest </title> <title> AppletInitialFocusTest </title>
......
...@@ -23,81 +23,37 @@ ...@@ -23,81 +23,37 @@
/* /*
test test
@bug 4041703 4096228 4025223 4260929 @bug 4041703 4096228 4025223 4260929
@summary Ensures that appletviewer sets a reasonable default focus @summary Ensures that appletviewer sets a reasonable default focus for an Applet on start
for an Applet on start
@author das area=appletviewer @author das area=appletviewer
@run shell AppletInitialFocusTest.sh @run applet AppletInitialFocusTest.html
*/ */
import java.applet.Applet; import java.applet.Applet;
import java.awt.*; import java.awt.Button;
import java.awt.event.*; import java.awt.Component;
import java.awt.Robot;
class MyKeyboardFocusManager extends DefaultKeyboardFocusManager { import java.awt.Window;
public Window getGlobalFocusedWindow() { import test.java.awt.regtesthelpers.Util;
return super.getGlobalFocusedWindow();
}
}
public class AppletInitialFocusTest extends Applet { public class AppletInitialFocusTest extends Applet {
Robot robot = Util.createRobot();
Window window;
Button button = new Button("Button"); Button button = new Button("Button");
MyKeyboardFocusManager manager = new MyKeyboardFocusManager();
Object lock = new Object();
public void init() { public void init() {
KeyboardFocusManager.setCurrentKeyboardFocusManager(manager);
Component parent = this;
while (parent != null && !(parent instanceof Window)) {
parent = parent.getParent();
}
/*
* This applet is designed to be run only with appletviewer,
* so there always should be a toplevel frame.
*/
if (parent == null) {
synchronized (lock) {
System.err.println("appletviewer not running");
System.exit(3);
}
}
window = (Window)parent;
button.addFocusListener(new FocusAdapter() {
public void focusGained(FocusEvent e) {
synchronized (lock) {
System.err.println("passed");
System.exit(0);
}
}
});
add(button); add(button);
} }
public void start() { public void start() {
Thread thread = new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { Util.waitTillShown(button);
Thread.sleep(1000); robot.delay(1000); // delay the thread to let EDT to start dispatching focus events
synchronized (lock) { Util.waitForIdle(robot);
Window focused = manager.getGlobalFocusedWindow(); if (!button.hasFocus()) {
if (window == focused) { throw new RuntimeException("Appletviewer doesn't set default focus correctly.");
System.err.println("failed");
System.exit(2);
} else {
System.err.println("window never activated");
System.err.println(focused);
System.exit(0);
}
} }
} catch(InterruptedException e) {
} }
} }).start();
});
thread.start();
} }
} }
<html> <html>
<!-- <!--
test @test
@bug 4411534 4517274 @bug 4411534 4517274
@summary ensures that user's requestFocus() during applet initialization @summary ensures that user's requestFocus() during applet initialization
is not ignored is not ignored
@author prs area=appletviewer @author prs area=appletviewer
@run shell AppletInitialFocusTest1.sh @library ../../regtesthelpers
@build Util
@run applet AppletInitialFocusTest1.html
--> -->
<head> <head>
<title> AppletInitialFocusTest1 </title> <title> AppletInitialFocusTest1 </title>
......
/* /*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. test %W% %E%
* 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
test
@bug 4411534 4517274 @bug 4411534 4517274
@summary ensures that user's requestFocus() during applet initialization @summary ensures that user's requestFocus() during applet initialization
is not ignored. is not ignored.
@author prs area=appletviewer @author prs@sparc.spb.su area=appletviewer
@run shell AppletInitialFocusTest1.sh @run shell AppletInitialFocusTest1.sh
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册