[jdk11u-dev] RFR: 8211978: Move testlibrary/jdk/testlibrary/SimpleSSLContext.java and testkeys to network testlibrary
Matthias Baesken
mbaesken at openjdk.org
Thu Dec 7 12:22:38 UTC 2023
On Mon, 4 Dec 2023 10:36:45 GMT, Amos Shi <ashi at openjdk.org> wrote:
> Backport of [JDK-8211978](https://bugs.openjdk.org/browse/JDK-8211978)
>
> The following files need manual merge:
> - `test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java`
> - `Copyright (c) year` sections cannot be auto merged
> - The curent `year` in [jdk11u-dev](https://github.com/openjdk/jdk11u-dev) is newer, so the change can be considered as **clean**
> - `test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java`
> - `Copyright (c) year` sections cannot be auto merged
> - The curent `year` in [jdk11u-dev](https://github.com/openjdk/jdk11u-dev) is newer, so the change can be considered as **clean**
> - `test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java`
> - The base line number is different so cannot be auto merged;
> - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/HttpsTunnelTest.java`
> - The base line number is different so cannot be auto merged;
> - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/InvalidSSLContextTest.java`
> - The base line number is different so cannot be auto merged;
> - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/ShortResponseBody.java`
> - `@library /lib/testlibrary` and `@build jdk.testlibrary.SimpleSSLContext` lines does not exist, just as [jdk](https://github.com/openjdk/jdk) repo, so we san safely ignore them, so the change is **clean**
> - `test/jdk/java/net/httpclient/SmokeTest.java`
> - The base line number is different so cannot be auto merged;
> - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/SpecialHeadersTest.java`
> - The base line number is different so cannot be auto merged;
> - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/UnknownBodyLengthTest.java`
> - The base line number is different so cannot be auto merged;
> - the changes are the same as original commit in [jdk](https://github.com/openjdk/jdk) repo, so the change is **clean**
> - `test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java`
> - `Copyright (c) yea...
I found 70 occurrences of "import jdk.testlibrary.SimpleSSLContext;" in your change that were replaced.
But when doing a grep on current 11u-dev/test dir I find 80 occurrences, what happens to the other 10, are they replaced in another change or kept for good reason ?
jdk/com/sun/net/httpserver/SelCacheTest.java:34:import jdk.testlibrary.SimpleSSLContext;
jdk/com/sun/net/httpserver/Test1.java:41:import jdk.testlibrary.SimpleSSLContext;
jdk/com/sun/net/httpserver/Test12.java:39:import jdk.testlibrary.SimpleSSLContext;
jdk/com/sun/net/httpserver/Test13.java:40:import jdk.testlibrary.SimpleSSLContext;
jdk/com/sun/net/httpserver/Test6a.java:39:import jdk.testlibrary.SimpleSSLContext;
jdk/com/sun/net/httpserver/Test7a.java:39:import jdk.testlibrary.SimpleSSLContext;
jdk/com/sun/net/httpserver/Test8a.java:39:import jdk.testlibrary.SimpleSSLContext;
jdk/com/sun/net/httpserver/Test9.java:39:import jdk.testlibrary.SimpleSSLContext;
jdk/com/sun/net/httpserver/Test9a.java:39:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java:42:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/URLPermission/URLTest.java:41:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ALPNProxyFailureTest.java:46:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/AbstractNoBody.java:38:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/AbstractThrowingPublishers.java:27:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/AbstractThrowingPushPromises.java:43:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/AbstractThrowingSubscribers.java:27:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/AsFileDownloadTest.java:70:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/BasicRedirectTest.java:56:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/CancelledResponse.java:29:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ConcurrentResponses.java:70:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/CookieHeaderTest.java:46:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/CustomRequestPublisher.java:65:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/CustomResponseSubscriber.java:60:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/DependentActionsTest.java:46:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/DependentPromiseActionsTest.java:43:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/DigestEchoClient.java:54:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/EchoHandler.java:35:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/EncodedCharsInURI.java:45:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/EscapedOctetsInURI.java:61:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ExpectContinue.java:52:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/FlowAdapterPublisherTest.java:46:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/FlowAdapterSubscriberTest.java:51:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ForbiddenHeadTest.java:50:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/HeadTest.java:45:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/HttpClientBuilderTest.java:51:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/HttpEchoHandler.java:35:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/HttpVersionsTest.java:51:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/HttpsTunnelTest.java:26:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ImmutableFlowItems.java:60:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java:41:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/InvalidSSLContextTest.java:51:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/InvalidSubscriptionRequest.java:42:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/LightWeightHttpServer.java:53:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/LineBodyHandlerTest.java:55:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ManyRequests.java:66:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ManyRequestsLegacy.java:73:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/MappingResponseSubscriber.java:65:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/MaxStreams.java:63:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/NonAsciiCharsInURI.java:61:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ProxySelectorTest.java:51:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ProxyTest.java:59:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/RedirectMethodChange.java:53:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/RedirectWithCookie.java:58:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/Response204V2Test.java:61:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ResponseBodyBeforeError.java:55:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ResponsePublisher.java:43:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/RetryWithCookie.java:45:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ServerCloseTest.java:38:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/ShortResponseBody.java:47:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/SmokeTest.java:93:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/SpecialHeadersTest.java:49:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/SplitResponse.java:43:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/StreamingBody.java:56:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/TimeoutBasic.java:34:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/UnauthorizedTest.java:49:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/UnknownBodyLengthTest.java:42:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/UserCookieTest.java:79:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/http2/BadHeadersTest.java:41:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/http2/BasicTest.java:50:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/http2/ContinuationFrameTest.java:58:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/http2/ErrorTest.java:49:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/http2/FixedThreadPoolTest.java:43:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/http2/NoBodyTest.java:48:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/http2/ProxyTest2.java:55:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java:42:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/websocket/WebSocketProxyTest.java:62:import jdk.testlibrary.SimpleSSLContext;
jdk/java/net/httpclient/websocket/HandshakeUrlEncodingTest.java:42:import jdk.testlibrary.SimpleSSLContext;
jdk/javax/net/ssl/HttpsURLConnection/Equals.java:37:import jdk.testlibrary.SimpleSSLContext;
jdk/sun/net/www/protocol/http/RedirectOnPost.java:42:import jdk.testlibrary.SimpleSSLContext;
jdk/sun/security/krb5/auto/HttpsCB.java:97:import jdk.testlibrary.SimpleSSLContext;
-------------
PR Review: https://git.openjdk.org/jdk11u-dev/pull/2330#pullrequestreview-1770038154
More information about the jdk-updates-dev
mailing list