changeset 51732:44c355346475

8206443: Update security libs manual test to cope with removal of javac -source/-target 6 Summary: Change compile -source/-target from 1.6 to 1.7 Reviewed-by: xuelei
author jjiang
date Sat, 14 Jul 2018 07:31:26 +0800
parents 13ed0d538b89
children bb16beb8f792
files test/jdk/javax/net/ssl/compatibility/Compatibility.java test/jdk/javax/net/ssl/compatibility/JdkRelease.java test/jdk/javax/net/ssl/compatibility/Parameter.java test/jdk/javax/net/ssl/compatibility/README test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
diffstat 5 files changed, 20 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/javax/net/ssl/compatibility/Compatibility.java	Fri Jul 13 13:58:17 2018 -0400
+++ b/test/jdk/javax/net/ssl/compatibility/Compatibility.java	Sat Jul 14 07:31:26 2018 +0800
@@ -29,7 +29,7 @@
  *     its usages, please look through README.
  *
  * @library /test/lib
- * @compile -source 1.6 -target 1.6 JdkUtils.java Parameter.java Server.java Client.java
+ * @compile -source 1.7 -target 1.7 JdkUtils.java Parameter.java Server.java Client.java
  * @run main/manual Compatibility
  */
 
--- a/test/jdk/javax/net/ssl/compatibility/JdkRelease.java	Fri Jul 13 13:58:17 2018 -0400
+++ b/test/jdk/javax/net/ssl/compatibility/JdkRelease.java	Sat Jul 14 07:31:26 2018 +0800
@@ -26,12 +26,12 @@
  */
 public enum JdkRelease {
 
-    JDK6(6, "1.6"),
     JDK7(7, "1.7"),
     JDK8(8, "1.8"),
     JDK9(9, "9"),
     JDK10(10, "10"),
-    JDK11(11, "11");
+    JDK11(11, "11"),
+    JDK12(12, "12");
 
     public final int sequence;
     public final String release;
@@ -42,9 +42,7 @@
     }
 
     public static JdkRelease getRelease(String jdkVersion) {
-        if (jdkVersion.startsWith(JDK6.release)) {
-            return JDK6;
-        } else if (jdkVersion.startsWith(JDK7.release)) {
+        if (jdkVersion.startsWith(JDK7.release)) {
             return JDK7;
         } else if (jdkVersion.startsWith(JDK8.release)) {
             return JDK8;
@@ -54,6 +52,8 @@
             return JDK10;
         } else if (jdkVersion.startsWith(JDK11.release)) {
             return JDK11;
+        } else if (jdkVersion.startsWith(JDK12.release)) {
+            return JDK12;
         }
 
         return null;
--- a/test/jdk/javax/net/ssl/compatibility/Parameter.java	Fri Jul 13 13:58:17 2018 -0400
+++ b/test/jdk/javax/net/ssl/compatibility/Parameter.java	Sat Jul 14 07:31:26 2018 +0800
@@ -65,15 +65,15 @@
     TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384(
             Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_RSA_WITH_AES_256_CBC_SHA256(
-            Protocol.TLSV1_2, JdkRelease.JDK6),
+            Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384(
             Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384(
             Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_DHE_RSA_WITH_AES_256_CBC_SHA256(
-            Protocol.TLSV1_2, JdkRelease.JDK6),
+            Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_DHE_DSS_WITH_AES_256_CBC_SHA256(
-            Protocol.TLSV1_2, JdkRelease.JDK6),
+            Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA(),
     TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA(),
     TLS_RSA_WITH_AES_256_CBC_SHA(),
@@ -86,15 +86,15 @@
     TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256(
             Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_RSA_WITH_AES_128_CBC_SHA256(
-            Protocol.TLSV1_2, JdkRelease.JDK6),
+            Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256(
             Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256(
             Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_DHE_RSA_WITH_AES_128_CBC_SHA256(
-            Protocol.TLSV1_2, JdkRelease.JDK6),
+            Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_DHE_DSS_WITH_AES_128_CBC_SHA256(
-            Protocol.TLSV1_2, JdkRelease.JDK6),
+            Protocol.TLSV1_2, JdkRelease.JDK7),
     TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA(),
     TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA(),
     TLS_RSA_WITH_AES_128_CBC_SHA(),
@@ -142,11 +142,11 @@
     SSL_RSA_WITH_RC4_128_SHA(),
     SSL_RSA_WITH_3DES_EDE_CBC_SHA(),
     SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA(
-            Protocol.SSLV3_0, JdkRelease.JDK6),
+            Protocol.SSLV3_0, JdkRelease.JDK7),
     SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA(
-            Protocol.SSLV3_0, JdkRelease.JDK6),
+            Protocol.SSLV3_0, JdkRelease.JDK7),
     SSL_RSA_WITH_RC4_128_MD5(
-            Protocol.SSLV3_0, JdkRelease.JDK6);
+            Protocol.SSLV3_0, JdkRelease.JDK7);
 
     private static final boolean FULL_CIPHER_SUITES
             = Utils.getBoolProperty("fullCipherSuites");
@@ -172,7 +172,7 @@
     }
 
     private CipherSuite() {
-        this(Protocol.TLSV1_0, null, JdkRelease.JDK6, null);
+        this(Protocol.TLSV1_0, null, JdkRelease.JDK7, null);
     }
 
     boolean supportedByProtocol(Protocol protocol) {
--- a/test/jdk/javax/net/ssl/compatibility/README	Fri Jul 13 13:58:17 2018 -0400
+++ b/test/jdk/javax/net/ssl/compatibility/README	Sat Jul 14 07:31:26 2018 +0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2018, 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
@@ -113,7 +113,6 @@
 
 Example 2
 $ cat /path/to/jdkList
-/path/to/jdk6
 /path/to/jdk7
 /path/to/jdk8
 /path/to/jdk9
@@ -125,6 +124,6 @@
     -DjdkListFile=/path/to/jdkList \
     $JDK_WS/jdk/test/javax/net/ssl/compatibility/Compatibility.java
 The above example uses a file "/path/to/jdkList" to contain the paths of local
-different JDK builds through 6 to 10. The execution uses each of JDK builds as
+different JDK builds through 7 to 10. The execution uses each of JDK builds as
 server and client respectively. And it enables SSL debug flag, and tests the
 full parameter value set.
\ No newline at end of file
--- a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java	Fri Jul 13 13:58:17 2018 -0400
+++ b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java	Sat Jul 14 07:31:26 2018 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +36,7 @@
  *          java.base/sun.security.util
  *          java.base/sun.security.x509
  * @library /test/lib /lib/testlibrary ../warnings
- * @compile -source 1.6 -target 1.6 JdkUtils.java
+ * @compile -source 1.7 -target 1.7 JdkUtils.java
  * @run main/manual/othervm Compatibility
  */