Update tests for HttpURLConnection.disconnect() changes

These changes are associated with external/mockwebserver
and external/okhttp commits.

URLConnectionTest#testDisconnectedConnection
 - Affected by the bug fix.

URLConnectionTest#testSslFallback
  - Affected by changes to MockWebServer. Handshake failures
    are no longer queued/recorded.

HttpsURLConnectionTest
  - API changes related to MockWebServer.

Bug: 18083851
Change-Id: Iec211a1e1e713623ccc8f8ca1de79833abe2f961

2 files changed, 13 insertions, 9 deletions

diff --git a/luni/src/test/java/libcore/java/net/URLConnectionTest.java b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
index 40c9f5e..a2fd6f4 100644
--- a/luni/src/test/java/libcore/java/net/URLConnectionTest.java
+++ b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
@@ -53,6 +53,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.zip.GZIPInputStream;
@@ -780,7 +781,9 @@ public final class URLConnectionTest extends AbstractResourceLeakageDetectorTest
     }
 
     public void testDisconnectedConnection() throws IOException {
-        server.enqueue(new MockResponse().setBody("ABCDEFGHIJKLMNOPQR"));
+        server.enqueue(new MockResponse()
+                .throttleBody(2, 100, TimeUnit.MILLISECONDS)
+                .setBody("ABCD"));
         server.play();
 
         HttpURLConnection connection = (HttpURLConnection) server.getUrl("/").openConnection();
@@ -788,6 +791,9 @@ public final class URLConnectionTest extends AbstractResourceLeakageDetectorTest
         assertEquals('A', (char) in.read());
         connection.disconnect();
         try {
+            // Reading 'B' may succeed if it's buffered.
+            in.read();
+            // But 'C' shouldn't be buffered (the response is throttled) and this should fail.
             in.read();
             fail("Expected a connection closed exception");
         } catch (IOException expected) {
@@ -2211,8 +2217,6 @@ public final class URLConnectionTest extends AbstractResourceLeakageDetectorTest
         assertEquals("This required a 2nd handshake",
                 readAscii(connection.getInputStream(), Integer.MAX_VALUE));
 
-        RecordedRequest first = server.takeRequest();
-        assertEquals(0, first.getSequenceNumber());
         RecordedRequest retry = server.takeRequest();
         assertEquals(0, retry.getSequenceNumber());
         assertEquals("SSLv3", retry.getSslProtocol());
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https/HttpsURLConnectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https/HttpsURLConnectionTest.java
index 5258fd1..abf06e0 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https/HttpsURLConnectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https/HttpsURLConnectionTest.java
@@ -834,8 +834,8 @@ public class HttpsURLConnectionTest extends TestCase {
         }
 
         @Override
-        public SocketPolicy peekSocketPolicy() {
-            return delegates.getFirst().peekSocketPolicy();
+        public MockResponse peek() {
+            return delegates.getFirst().peek();
         }
     }
 
@@ -888,8 +888,8 @@ public class HttpsURLConnectionTest extends TestCase {
         }
 
         @Override
-        public SocketPolicy peekSocketPolicy() {
-            return SocketPolicy.UPGRADE_TO_SSL_AT_END;
+        public MockResponse peek() {
+            return new MockResponse().setSocketPolicy(SocketPolicy.UPGRADE_TO_SSL_AT_END);
         }
 
         private void log(String msg) {
@@ -939,8 +939,8 @@ public class HttpsURLConnectionTest extends TestCase {
         }
 
         @Override
-        public SocketPolicy peekSocketPolicy() {
-            return SocketPolicy.DISCONNECT_AT_END;
+        public MockResponse peek() {
+            return new MockResponse().setSocketPolicy(SocketPolicy.DISCONNECT_AT_END);
         }
 
         private void log(String msg) {