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

8039816: Some tests depend on internal API sun.security.action.GetPropertyAction

Browse Source 
Replace sun.security.action.GetPropertyAction usages with lambda expressions creating java.security.PrivilegedAction.

Reviewed-by: alanb, mchung, chegar
This commit is contained in:
Alexandre Iline 2014-04-21 13:16:32 -07:00 committed by Alexandre Iline
parent 092e29980a
commit e613bf3290
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 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
@ -39,13 +39,13 @@ import com.sun.nio.sctp.SctpChannel;
import com.sun.nio.sctp.SctpServerChannel;
import com.sun.nio.sctp.SctpSocketOption;
import java.security.AccessController;
import sun.security.action.GetPropertyAction;
import java.security.PrivilegedAction;
import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
import static java.lang.System.out;
public class SocketOptionTests {
final String osName = AccessController.doPrivileged(
new GetPropertyAction("os.name"));
(PrivilegedAction<String>)() -> System.getProperty("os.name"));
<T> void checkOption(SctpChannel sc, SctpSocketOption<T> name,
T expectedValue) throws IOException {

6
jdk/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 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
@ -47,13 +47,13 @@ import com.sun.nio.sctp.SctpMultiChannel;
import com.sun.nio.sctp.SctpServerChannel;
import com.sun.nio.sctp.SctpSocketOption;
import java.security.AccessController;
import sun.security.action.GetPropertyAction;
import java.security.PrivilegedAction;
import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
import static java.lang.System.out;
public class SocketOptionTests {
final String osName = AccessController.doPrivileged(
new GetPropertyAction("os.name"));
(PrivilegedAction<String>)() -> System.getProperty("os.name"));
<T> void checkOption(SctpMultiChannel smc, SctpSocketOption<T> name,
T expectedValue) throws IOException {

14
jdk/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -36,6 +36,8 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.charset.Charset;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@ -89,12 +91,10 @@ public class NIOCharsetAvailabilityTest {
private static void addCharsets(Set charsets, final String packageName)
throws Exception {
String classPath =
(String) java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("sun.boot.class.path"));
String s =
(String) java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("java.class.path"));
String classPath = AccessController.doPrivileged(
(PrivilegedAction<String>)() -> System.getProperty("sun.boot.class.path"));
String s = AccessController.doPrivileged(
(PrivilegedAction<String>)() -> System.getProperty("java.class.path"));
// Search combined system and application class path
if (s != null && s.length() != 0) {

8
jdk/test/sun/security/tools/jarsigner/CertChainUnclosed.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
@ -30,13 +30,15 @@
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Locale;
public class CertChainUnclosed {
public static void main(String[] args) throws Exception {
String os = java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("os.name"));
String os = AccessController.doPrivileged(
(PrivilegedAction<String>)() -> System.getProperty("os.name"));
if (!os.toUpperCase(Locale.US).contains("WINDOWS")) {
System.out.println("Not Windows. Skip test.");
return;