infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-10 21:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

8064934: Incorrect Exception message from java.awt.Desktop.open()

Browse Source 
Reviewed-by: azvegint, serb
This commit is contained in:
Dmitry Markov 2015-02-03 11:51:30 +04:00
parent afa1e6d670
commit 5a65a2cc13
2 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp
View File

@ -52,6 +52,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_ShellExecute
// 6457572: ShellExecute possibly changes FPU control word - saving it here
unsigned oldcontrol87 = _control87(0, 0);
HINSTANCE retval = ::ShellExecute(NULL, verb_c, fileOrUri_c, NULL, NULL, SW_SHOWNORMAL);
DWORD error = ::GetLastError();
_control87(oldcontrol87, 0xffffffff);
JNU_ReleaseStringPlatformChars(env, fileOrUri_j, fileOrUri_c);
@ -65,7 +66,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_ShellExecute
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
(int)retval,
error,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
(LPTSTR)&buffer,
0,

83
jdk/test/java/awt/Desktop/8064934/bug8064934.java Normal file
View File

@ -0,0 +1,83 @@
/*
* Copyright (c) 2015, 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
* 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8064934
* @summary Incorrect Exception message from java.awt.Desktop.open()
* @author Dmitry Markov
* @run main bug8064934
*/
import sun.awt.OSInfo;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.security.AccessController;
public class bug8064934 {
private static final String NO_ASSOCIATION_ERROR_MESSAGE = "Error message: No application is associated with" +
" the specified file for this operation.";
public static void main(String[] args) {
// This test is intended only for Windows
if (AccessController.doPrivileged(OSInfo.getOSTypeAction()) != OSInfo.OSType.WINDOWS) {
System.out.println("The test is for Windows platform only");
return;
}
// Test whether Desktop is supported of not
if (!Desktop.isDesktopSupported()) {
System.out.println("Desktop is not supported");
return;
}
Desktop desktop = Desktop.getDesktop();
// Test whether open action is supported or not
if (!desktop.isSupported(Desktop.Action.OPEN)) {
System.out.println("Desktop.Action.OPEN is not supported");
return;
}
File file = null;
try {
file = File.createTempFile("test", ".foo");
if (!file.exists()) {
throw new RuntimeException("Can not create temp file");
}
desktop.open(file);
} catch (IOException ioe) {
String errorMessage = ioe.getMessage().trim();
if (errorMessage != null && !errorMessage.endsWith(NO_ASSOCIATION_ERROR_MESSAGE)) {
throw new RuntimeException("Test FAILED! Wrong Error message: \n" +
"Actual " + errorMessage.substring(errorMessage.indexOf("Error message:")) + "\n" +
"Expected " + NO_ASSOCIATION_ERROR_MESSAGE);
}
} finally {
if (file != null) {
file.delete();
}
}
System.out.println("Test PASSED!");
}
}