rollback fixes for FullscreenAfterSplash and TranserFocusToWindow and @key headful
diff --git a/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java b/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java
index 6131070..8790e92 100644
--- a/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java
+++ b/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java
@@ -23,13 +23,12 @@
/*
@test
- @key headful
- @bug 6562853 7035459
- @summary Tests that focus transfered directy to window w/o transfering it to frame.
- @author Oleg Sukhodolsky: area=awt.focus
- @library ../../regtesthelpers
- @build Util
- @run main TranserFocusToWindow
+ @bug 6562853
+ @summary Tests that focus transfered directy to window w/o transfering it to frame.
+ @author Oleg Sukhodolsky: area=awt.focus
+ @library ../../regtesthelpers
+ @build Util
+ @run main TranserFocusToWindow
*/
import java.awt.Button;
@@ -45,13 +44,10 @@
public class TranserFocusToWindow
{
- private static final int WIDTH = 300;
- private static final int HEIGHT = 200;
-
public static void main(String[] args) {
Robot robot = Util.createRobot();
Frame owner_frame = new Frame("Owner frame");
- owner_frame.setBounds(0, 0, WIDTH, HEIGHT);
+ owner_frame.setBounds(0, 0, 200, 200);
owner_frame.setVisible(true);
Util.waitForIdle(robot);
@@ -59,7 +55,7 @@
Button btn1 = new Button("button for focus");
window.add(btn1);
window.pack();
- window.setLocation(0, HEIGHT + 100);
+ window.setLocation(0, 300);
window.setVisible(true);
Util.waitForIdle(robot);
@@ -67,10 +63,17 @@
Button btn2 = new Button("button in a frame");
another_frame.add(btn2);
another_frame.pack();
- another_frame.setLocation(WIDTH + 100, 0);
+ another_frame.setLocation(300, 0);
another_frame.setVisible(true);
Util.waitForIdle(robot);
+ Util.clickOnTitle(owner_frame, robot);
+ Util.waitForIdle(robot);
+
+ setFocus(btn1, robot);
+
+ setFocus(btn2, robot);
+
owner_frame.addWindowFocusListener(new WindowFocusListener() {
public void windowLostFocus(WindowEvent we) {
System.out.println(we);
@@ -97,10 +100,6 @@
}
});
- Util.clickOnTitle(owner_frame, robot);
- Util.waitForIdle(robot);
- setFocus(btn1, robot);
- setFocus(btn2, robot);
// we need this delay so WM can not treat two clicks on title as double click
robot.delay(500);
Util.clickOnTitle(owner_frame, robot);
@@ -121,4 +120,4 @@
throw new RuntimeException("can not set focus on " + comp);
}
}
-}
\ No newline at end of file
+}
diff --git a/test/java/awt/Mixing/HWDisappear.java b/test/java/awt/Mixing/HWDisappear.java
index c4818b2..6a8e7ea 100644
--- a/test/java/awt/Mixing/HWDisappear.java
+++ b/test/java/awt/Mixing/HWDisappear.java
@@ -23,7 +23,6 @@
/*
@test %W% %E%
- @key headful
@bug 6769511
@summary AWT components are invisible for a while after frame is moved & menu items are visible
@author anthony.petrov@...: area=awt.mixing
diff --git a/test/java/awt/Paint/bug8024864.java b/test/java/awt/Paint/bug8024864.java
index e24a071..707699d 100644
--- a/test/java/awt/Paint/bug8024864.java
+++ b/test/java/awt/Paint/bug8024864.java
@@ -23,7 +23,6 @@
/*
* @test
- * @key headful
* @bug 8024864 8031422
* @summary [macosx] Problems with rendering of controls
* @author Petr Pchelko
diff --git a/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java b/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java
index bceb939..b5e019e 100644
--- a/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java
+++ b/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 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
@@ -21,8 +21,9 @@
* questions.
*/
-import java.awt.Point;
-import java.awt.Window;
+import sun.awt.OSInfo;
+
+import java.awt.*;
import java.awt.Robot;
import java.awt.event.InputEvent;
import java.lang.InterruptedException;
@@ -30,19 +31,13 @@
import java.lang.Thread;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
+import javax.swing.*;
/*
* @test
* @bug 8024185
* @summary Native Mac OS X full screen does not work after showing the splash
- * @requires (os.family == "mac")
* @library ../
- * @library ../../../../lib/testlibrary
- * @modules java.desktop/sun.awt
- * java.desktop/com.apple.eawt
* @build GenerateTestImage
* @run main GenerateTestImage
* @author Petr Pchelko area=awt.event
@@ -57,10 +52,13 @@
public static void main(String[] args) throws Exception {
+ if (OSInfo.getOSType() != OSInfo.OSType.MACOSX) {
+ System.out.println("The test is applicable only to Mac OS X. Passed");
+ return;
+ }
try {
//Move the mouse out, because it could interfere with the test.
Robot r = new Robot();
- r.setAutoDelay(50);
r.mouseMove(0, 0);
sleep();
@@ -68,10 +66,7 @@
sleep();
Point fullScreenButtonPos = frame.getLocation();
- if(System.getProperty("os.version").equals("10.9"))
- fullScreenButtonPos.translate(frame.getWidth() - 10, frame.getHeight()/2);
- else
- fullScreenButtonPos.translate(55,frame.getHeight()/2);
+ fullScreenButtonPos.translate(frame.getWidth() - 10, 10);
r.mouseMove(fullScreenButtonPos.x, fullScreenButtonPos.y);
//Cant use waitForIdle for full screen transition.
@@ -142,4 +137,4 @@
Thread.sleep(500);
} catch (InterruptedException ignored) { }
}
-}
\ No newline at end of file
+}
diff --git a/test/jbProblemsList.txt b/test/jbProblemsList.txt
index dacc222..a4422e8 100644
--- a/test/jbProblemsList.txt
+++ b/test/jbProblemsList.txt
@@ -215,6 +215,10 @@
# https://bugs.openjdk.java.net/browse/JDK-7156130
java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html generic-all
+# http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6848810
+# https://bugs.openjdk.java.net/browse/JDK-7035459
+java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java generic-all
+
# https://bugs.openjdk.java.net/browse/JDK-6986253
java/awt/Focus/TypeAhead/TestFocusFreeze.java windows-all
@@ -422,6 +426,9 @@
java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java generic-all
java/awt/ScrollPane/bug8077409Test.java generic-all
+# https://bugs.openjdk.java.net/browse/JDK-8140329
+java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java generic-all
+
# https://bugs.openjdk.java.net/browse/JDK-8159592
java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java generic-all
