提交 a9865f97 编写于 作者: K kshefov

7124242: [macosx] Test doesn't work because of the frame round corners in the LaF

Reviewed-by: anthony, yan, alexsch
上级 34aaabd4
/* /*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 6796710 * @bug 6796710 7124242
* @summary Html content in JEditorPane is overlapping on swing components while resizing the application. * @summary Html content in JEditorPane is overlapping on swing components while resizing the application.
* @library ../../../regtesthelpers * @library ../../../regtesthelpers
* @build Util * @build Util
...@@ -31,11 +31,10 @@ ...@@ -31,11 +31,10 @@
@run main bug6796710 @run main bug6796710
*/ */
import sun.awt.SunToolkit;
import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import javax.swing.*;
import sun.awt.SunToolkit;
public class bug6796710 { public class bug6796710 {
// The page is inlined because we want to be sure that the JEditorPane filled synchronously // The page is inlined because we want to be sure that the JEditorPane filled synchronously
...@@ -68,9 +67,12 @@ public class bug6796710 { ...@@ -68,9 +67,12 @@ public class bug6796710 {
robot = new Robot(); robot = new Robot();
SwingUtilities.invokeAndWait(new Runnable() { SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() { public void run() {
frame = new JFrame(); frame = new JFrame();
frame.setUndecorated(true);
pnBottom = new JPanel(); pnBottom = new JPanel();
pnBottom.add(new JLabel("Some label")); pnBottom.add(new JLabel("Some label"));
pnBottom.add(new JButton("A button")); pnBottom.add(new JButton("A button"));
...@@ -95,9 +97,13 @@ public class bug6796710 { ...@@ -95,9 +97,13 @@ public class bug6796710 {
((SunToolkit) SunToolkit.getDefaultToolkit()).realSync(); ((SunToolkit) SunToolkit.getDefaultToolkit()).realSync();
// This delay should be added for MacOSX, realSync is not enough
Thread.sleep(1000);
BufferedImage bufferedImage = getPnBottomImage(); BufferedImage bufferedImage = getPnBottomImage();
SwingUtilities.invokeAndWait(new Runnable() { SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() { public void run() {
frame.setSize(400, 150); frame.setSize(400, 150);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册