Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 0b131bb4 编写于 作者: K kshefov
浏览文件
操作

8017456: [TEST_BUG]... 

8017456: [TEST_BUG] java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html: test frames remain after test execution
Reviewed-by: serb, alexsch
上级 4f65cdb6
隐藏空白更改
内联 并排
Showing with 16 addition and 19 deletion
test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java
浏览文件 @ 0b131bb4
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, 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
...@@ -24,5 +24,6 @@ ...@@ -24,5 +24,6 @@
interface InterprocessMessages { interface InterprocessMessages {
final static int EXECUTION_IS_SUCCESSFULL = 0; final static int EXECUTION_IS_SUCCESSFULL = 0;
final static int DATA_IS_CORRUPTED = 212; final static int DATA_IS_CORRUPTED = 212;
final static int NO_DROP_HAPPENED = 112;
} }
test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html
浏览文件 @ 0b131bb4
<!-- <!--
Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2013, 2014, 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
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<html> <html>
<!-- <!--
@test @test
@bug 8005932 @bug 8005932 8017456
@summary Java 7 on mac os x only provides text clipboard formats @summary Java 7 on mac os x only provides text clipboard formats
@author mikhail.cherkasov@oracle.com @author mikhail.cherkasov@oracle.com
@library ../../regtesthelpers @library ../../regtesthelpers
......
test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
浏览文件 @ 0b131bb4
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, 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
...@@ -21,17 +21,6 @@ ...@@ -21,17 +21,6 @@
* questions. * questions.
*/ */
/*
@bug 8005932
@summary Java 7 on mac os x only provides text clipboard formats
@author mikhail.cherkasov@oracle.com
@library ../../regtesthelpers
@library ../../regtesthelpers/process
@build Util
@build ProcessResults ProcessCommunicator
@run applet/othervm MissedHtmlAndRtfBug.html
*/
import java.awt.*; import java.awt.*;
import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.DataFlavor;
import java.awt.event.*; import java.awt.event.*;
...@@ -47,6 +36,7 @@ import sun.awt.OSInfo; ...@@ -47,6 +36,7 @@ import sun.awt.OSInfo;
import static java.lang.Thread.sleep; import static java.lang.Thread.sleep;
public class MissedHtmlAndRtfBug extends Applet { public class MissedHtmlAndRtfBug extends Applet {
public void init() { public void init() {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
}//End init() }//End init()
...@@ -82,9 +72,6 @@ public class MissedHtmlAndRtfBug extends Applet { ...@@ -82,9 +72,6 @@ public class MissedHtmlAndRtfBug extends Applet {
args.add(concatStrings(DataFlavorSearcher.RICH_TEXT_NAMES)); args.add(concatStrings(DataFlavorSearcher.RICH_TEXT_NAMES));
ProcessResults processResults = ProcessResults processResults =
// ProcessCommunicator.executeChildProcess(this.getClass(), "/Users/mcherkasov/ws/clipboard/DataFlover/out/production/DataFlover" +
// " -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 ",
// args.toArray(new String[0]));
ProcessCommunicator.executeChildProcess(this.getClass(), ProcessCommunicator.executeChildProcess(this.getClass(),
"." + File.separator + System.getProperty("java.class.path"), args.toArray(new String[]{})); "." + File.separator + System.getProperty("java.class.path"), args.toArray(new String[]{}));
...@@ -117,6 +104,13 @@ public class MissedHtmlAndRtfBug extends Applet { ...@@ -117,6 +104,13 @@ public class MissedHtmlAndRtfBug extends Applet {
throw new RuntimeException("TEST IS FAILED: Target has received" + throw new RuntimeException("TEST IS FAILED: Target has received" +
" corrupted data."); " corrupted data.");
} }
if (InterprocessMessages.NO_DROP_HAPPENED ==
processResults.getExitValue()) {
processResults.printProcessErrorOutput(System.err);
throw new RuntimeException("Error. Drop did not happen." +
" Target frame is possibly covered by a window of other application." +
" Please, rerun the test with all windows minimized.");
}
processResults.verifyStdErr(System.err); processResults.verifyStdErr(System.err);
processResults.verifyProcessExitValue(System.err); processResults.verifyProcessExitValue(System.err);
processResults.printProcessStandartOutput(System.out); processResults.printProcessStandartOutput(System.out);
...@@ -184,7 +178,7 @@ public class MissedHtmlAndRtfBug extends Applet { ...@@ -184,7 +178,7 @@ public class MissedHtmlAndRtfBug extends Applet {
} }
} }
public static void main(String[] args) { public static void main(String[] args) throws InterruptedException {
Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extractInt(args), Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extractInt(args),
InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extractInt(args)); InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extractInt(args));
Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extractInt(args), Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extractInt(args),
...@@ -197,6 +191,8 @@ public class MissedHtmlAndRtfBug extends Applet { ...@@ -197,6 +191,8 @@ public class MissedHtmlAndRtfBug extends Applet {
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
sleep(5000);
System.exit(InterprocessMessages.NO_DROP_HAPPENED);
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或