stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8017456: [TEST_BUG] java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html: test frames remain after test execution

Browse Source 
Reviewed-by: serb, alexsch
This commit is contained in:
Konstantin Shefov 2014-02-17 18:52:01 +04:00
parent 6ec6843975
commit f37265f360
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java
View File

@ -1,5 +1,5 @@
/*
* 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.
*
* This code is free software; you can redistribute it and/or modify it
@ -24,5 +24,6 @@
interface InterprocessMessages {
final static int EXECUTION_IS_SUCCESSFULL = 0;
final static int DATA_IS_CORRUPTED = 212;
final static int NO_DROP_HAPPENED = 112;
}

4
jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html
View File

@ -1,5 +1,5 @@
<!--
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.
This code is free software; you can redistribute it and/or modify it
@ -24,7 +24,7 @@
<html>
<!--
@test
@bug 8005932
@bug 8005932 8017456
@summary Java 7 on mac os x only provides text clipboard formats
@author mikhail.cherkasov@oracle.com
@library ../../regtesthelpers

28
jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
View File

@ -1,5 +1,5 @@
/*
* 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.
*
* This code is free software; you can redistribute it and/or modify it
@ -21,17 +21,6 @@
* 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.datatransfer.DataFlavor;
import java.awt.event.*;
@ -47,6 +36,7 @@ import sun.awt.OSInfo;
import static java.lang.Thread.sleep;
public class MissedHtmlAndRtfBug extends Applet {
public void init() {
setLayout(new BorderLayout());
}//End init()
@ -82,9 +72,6 @@ public class MissedHtmlAndRtfBug extends Applet {
args.add(concatStrings(DataFlavorSearcher.RICH_TEXT_NAMES));
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(),
"." + File.separator + System.getProperty("java.class.path"), args.toArray(new String[]{}));
@ -117,6 +104,13 @@ public class MissedHtmlAndRtfBug extends Applet {
throw new RuntimeException("TEST IS FAILED: Target has received" +
" 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.verifyProcessExitValue(System.err);
processResults.printProcessStandartOutput(System.out);
@ -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),
InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extractInt(args));
Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extractInt(args),
@ -197,6 +191,8 @@ public class MissedHtmlAndRtfBug extends Applet {
} catch (InterruptedException e) {
e.printStackTrace();
}
sleep(5000);
System.exit(InterprocessMessages.NO_DROP_HAPPENED);
}