changeset 9780:b3cc1d52ebb0

8039816: Some tests depend on internal API sun.security.action.GetPropertyAction Summary: Replace sun.security.action.GetPropertyAction usages with lambda expressions creating java.security.PrivilegedAction. Reviewed-by: alanb, mchung, chegar Contributed-by: Alexandre Iline <alexandre.iline@oracle.com>
author shurailine
date Mon, 21 Apr 2014 13:16:32 -0700
parents 3b50efed107a
children 3aeb306d985c
files test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java test/sun/security/tools/jarsigner/CertChainUnclosed.java
diffstat 4 files changed, 18 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java	Mon Apr 21 13:12:22 2014 -0700
+++ b/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java	Mon Apr 21 13:16:32 2014 -0700
@@ -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.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 {
--- a/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java	Mon Apr 21 13:12:22 2014 -0700
+++ b/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java	Mon Apr 21 13:16:32 2014 -0700
@@ -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.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 {
--- a/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java	Mon Apr 21 13:12:22 2014 -0700
+++ b/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java	Mon Apr 21 13:16:32 2014 -0700
@@ -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.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 @@
     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) {
--- a/test/sun/security/tools/jarsigner/CertChainUnclosed.java	Mon Apr 21 13:12:22 2014 -0700
+++ b/test/sun/security/tools/jarsigner/CertChainUnclosed.java	Mon Apr 21 13:16:32 2014 -0700
@@ -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;