Merge "Merge "Merge "[conflict] Merge "Use tls 1.3 by default in Test…

…SSLContext." into android11-tests-dev am: e6549ff" into android12-tests-dev am: 70664d6" into android12L-tests-dev am: acba7b1" into android13-tests-dev am: 8ab3932 am: bd0efde am: 798b956 Original change: https://android-review.googlesource.com/c/platform/libcore/+/2673916 Change-Id: Ic5ead847ae67b4aedf21bb99e100e5bd3fa21b9f Signed-off-by: Automerger Merge Worker <[email protected]>
intuitionUI · Jul 25, 2023 · f38c9bc · f38c9bc
2 parents d396539 + 798b956
commit f38c9bc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/luni/src/test/java/libcore/java/net/URLConnectionTest.java b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
@@ -567,7 +567,7 @@ private void checkConnectViaHttps() throws IOException, InterruptedException {
 
         RecordedRequest request = server.takeRequest();
         assertEquals("GET /foo HTTP/1.1", request.getRequestLine());
-        assertEquals("TLSv1.2", request.getSslProtocol());
+        assertEquals("TLSv1.3", request.getSslProtocol());
     }
 
     @Test public void connectViaHttpsReusingConnections() throws IOException, InterruptedException {
@@ -2288,7 +2288,7 @@ private void testResponseRedirectedWithPost(int redirectCode) throws Exception {
                     + "CN=Local Host 3, "
                     + "CN=Test Intermediate Certificate Authority 2, "
                     + "CN=Test Root Certificate Authority 1"
-                    + "] ECDHE_RSA"),
+                    + "] GENERIC"),
                     trustManager.calls);
         } finally {
             HttpsURLConnection.setDefaultHostnameVerifier(defaultHostnameVerifier);