< prev index next >

test/jdk/javax/net/ssl/compatibility/Compatibility.java

Print this page

        

*** 1,7 **** /* ! * 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. --- 1,7 ---- /* ! * Copyright (c) 2017, 2019, 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.
*** 26,37 **** * @summary This test is used to check the interop compatibility on JSSE among * different JDK releases. * Note that, this is a manual test. For more details about the test and * its usages, please look through README. * ! * @library /test/lib ! * @compile -source 1.7 -target 1.7 JdkUtils.java Parameter.java Server.java Client.java * @run main/manual Compatibility */ import java.io.File; import java.io.FileOutputStream; --- 26,37 ---- * @summary This test is used to check the interop compatibility on JSSE among * different JDK releases. * Note that, this is a manual test. For more details about the test and * its usages, please look through README. * ! * @library /test/lib ../TLSCommon ! * @compile -source 1.7 -target 1.7 JdkUtils.java Server.java Client.java * @run main/manual Compatibility */ import java.io.File; import java.io.FileOutputStream;
*** 79,102 **** System.out.println(Utils.startHtml()); System.out.println(Utils.startPre()); for (UseCase useCase : UseCase.getAllUseCases()) { for (JdkInfo serverJdk : jdkInfos) { - if (useCase.ignoredByJdk(serverJdk)) { - continue; - } - Map<String, String> props = new LinkedHashMap<>(); if (debug) { ! props.put("javax.net.debug", "ssl"); } props.put("java.security.properties", javaSecurityFile); ! props.put(Utils.PROP_PROTOCOL, useCase.protocol.version); props.put(Utils.PROP_CIPHER_SUITE, useCase.cipherSuite.name()); ! props.put(Utils.PROP_CLIENT_AUTH, useCase.clientAuth.name()); ! if (useCase.appProtocol != AppProtocol.NONE) { props.put(Utils.PROP_APP_PROTOCOLS, Utils.join(Utils.VALUE_DELIMITER, useCase.appProtocol.appProtocols)); props.put(Utils.PROP_NEGO_APP_PROTOCOL, useCase.appProtocol.negoAppProtocol); --- 79,98 ---- System.out.println(Utils.startHtml()); System.out.println(Utils.startPre()); for (UseCase useCase : UseCase.getAllUseCases()) { for (JdkInfo serverJdk : jdkInfos) { Map<String, String> props = new LinkedHashMap<>(); if (debug) { ! props.put("javax.net.debug", "all"); } props.put("java.security.properties", javaSecurityFile); ! props.put(Utils.PROP_PROTOCOL, useCase.protocol.name); props.put(Utils.PROP_CIPHER_SUITE, useCase.cipherSuite.name()); ! props.put(Utils.PROP_CLIENT_AUTH, String.valueOf(useCase.clientAuth)); ! if (useCase.appProtocol != UseCase.AppProtocol.NONE) { props.put(Utils.PROP_APP_PROTOCOLS, Utils.join(Utils.VALUE_DELIMITER, useCase.appProtocol.appProtocols)); props.put(Utils.PROP_NEGO_APP_PROTOCOL, useCase.appProtocol.negoAppProtocol);
*** 107,124 **** serverJdk.supportsSNI + ""); props.put(Utils.PROP_SUPPORTS_ALPN_ON_SERVER, serverJdk.supportsALPN + ""); for (JdkInfo clientJdk : jdkInfos) { - if (useCase.ignoredByJdk(clientJdk)) { - continue; - } - TestCase testCase = new TestCase(serverJdk, clientJdk, useCase); System.out.println(Utils.anchorName(testCase.toString(), ! "----- Case start -----")); System.out.println(testCase.toString()); props.put(Utils.PROP_NEGATIVE_CASE_ON_SERVER, testCase.negativeCaseOnServer + ""); props.put(Utils.PROP_NEGATIVE_CASE_ON_CLIENT, --- 103,116 ---- serverJdk.supportsSNI + ""); props.put(Utils.PROP_SUPPORTS_ALPN_ON_SERVER, serverJdk.supportsALPN + ""); for (JdkInfo clientJdk : jdkInfos) { TestCase testCase = new TestCase(serverJdk, clientJdk, useCase); System.out.println(Utils.anchorName(testCase.toString(), ! "===== Case start =====")); System.out.println(testCase.toString()); props.put(Utils.PROP_NEGATIVE_CASE_ON_SERVER, testCase.negativeCaseOnServer + ""); props.put(Utils.PROP_NEGATIVE_CASE_ON_CLIENT,
*** 136,146 **** props.put(Utils.PROP_SUPPORTS_SNI_ON_CLIENT, clientJdk.supportsSNI + ""); props.put(Utils.PROP_SUPPORTS_ALPN_ON_CLIENT, clientJdk.supportsALPN + ""); ! if (useCase.serverName != ServerName.NONE) { props.put(Utils.PROP_SERVER_NAME, useCase.serverName.name); } Status clientStatus = null; --- 128,138 ---- props.put(Utils.PROP_SUPPORTS_SNI_ON_CLIENT, clientJdk.supportsSNI + ""); props.put(Utils.PROP_SUPPORTS_ALPN_ON_CLIENT, clientJdk.supportsALPN + ""); ! if (useCase.serverName != UseCase.ServerName.NONE) { props.put(Utils.PROP_SERVER_NAME, useCase.serverName.name); } Status clientStatus = null;
*** 156,166 **** testCases.add(testCase); System.out.printf( "ServerStatus=%s, ClientStatus=%s, CaseStatus=%s%n", serverStatus, clientStatus, testCase.getStatus()); ! System.out.println("----- Case end -----"); } } } System.out.println(Utils.endPre()); --- 148,158 ---- testCases.add(testCase); System.out.printf( "ServerStatus=%s, ClientStatus=%s, CaseStatus=%s%n", serverStatus, clientStatus, testCase.getStatus()); ! System.out.println("===== Case end ====="); } } } System.out.println(Utils.endPre());
*** 307,324 **** Utils.TEST_LOG, testCase.toString(), i + ""), testCase.serverJdk.version, testCase.clientJdk.version, ! testCase.useCase.protocol.version, testCase.useCase.cipherSuite, Utils.boolToStr( ! testCase.useCase.clientAuth == ClientAuth.TRUE), Utils.boolToStr( ! testCase.useCase.serverName == ServerName.EXAMPLE), Utils.boolToStr( ! testCase.useCase.appProtocol == AppProtocol.EXAMPLE), testCase.getStatus())); failed = failed || testCase.getStatus() == Status.FAIL || testCase.getStatus() == Status.UNEXPECTED_SUCCESS; } --- 299,316 ---- Utils.TEST_LOG, testCase.toString(), i + ""), testCase.serverJdk.version, testCase.clientJdk.version, ! testCase.useCase.protocol.name, testCase.useCase.cipherSuite, Utils.boolToStr( ! testCase.useCase.clientAuth), Utils.boolToStr( ! testCase.useCase.serverName == UseCase.ServerName.EXAMPLE), Utils.boolToStr( ! testCase.useCase.appProtocol == UseCase.AppProtocol.EXAMPLE), testCase.getStatus())); failed = failed || testCase.getStatus() == Status.FAIL || testCase.getStatus() == Status.UNEXPECTED_SUCCESS; }
< prev index next >