From 6f04b2e76a81b2457d7b00cd952ab7eb248606cc Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Tue, 28 Jun 2016 18:29:03 +0100
Subject: [PATCH] Tidy up MockWebServer usage

Delay creation of MockWebServer until setUp() and
add shutdown logic in one case.

Bug: 29820565
Change-Id: Iea43f8692b8425d05405a8fe86382d6d12197b2d
---
 .../src/android/app/DownloadManagerBaseTest.java          | 6 ++++++
 .../tests/coretests/src/android/net/http/CookiesTest.java | 8 +++++++-
 .../src/android/net/http/DefaultHttpClientTest.java       | 8 +++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/core/tests/coretests/src/android/app/DownloadManagerBaseTest.java b/core/tests/coretests/src/android/app/DownloadManagerBaseTest.java
index af2a9446f3483..ab40e0f638e93 100644
--- a/core/tests/coretests/src/android/app/DownloadManagerBaseTest.java
+++ b/core/tests/coretests/src/android/app/DownloadManagerBaseTest.java
@@ -245,6 +245,12 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase {
         // Note: callers overriding this should call mServer.play() with the desired port #
     }
 
+    @Override
+    public void tearDown() throws Exception {
+        mServer.shutdown();
+        super.tearDown();
+    }
+
     /**
      * Helper to build a response from the MockWebServer with no body.
      *
diff --git a/core/tests/coretests/src/android/net/http/CookiesTest.java b/core/tests/coretests/src/android/net/http/CookiesTest.java
index 29e590f746125..a53330e7b42a1 100644
--- a/core/tests/coretests/src/android/net/http/CookiesTest.java
+++ b/core/tests/coretests/src/android/net/http/CookiesTest.java
@@ -36,7 +36,13 @@ import org.apache.http.impl.client.DefaultHttpClient;
 
 public final class CookiesTest extends TestCase {
 
-    private MockWebServer server = new MockWebServer();
+    private MockWebServer server;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        server = new MockWebServer();
+    }
 
     @Override protected void tearDown() throws Exception {
         server.shutdown();
diff --git a/core/tests/coretests/src/android/net/http/DefaultHttpClientTest.java b/core/tests/coretests/src/android/net/http/DefaultHttpClientTest.java
index cf9e6e6f435c1..80c7a4c4b09e7 100644
--- a/core/tests/coretests/src/android/net/http/DefaultHttpClientTest.java
+++ b/core/tests/coretests/src/android/net/http/DefaultHttpClientTest.java
@@ -41,7 +41,13 @@ import org.apache.http.message.BasicHeader;
  */
 public final class DefaultHttpClientTest extends TestCase {
 
-    private MockWebServer server = new MockWebServer();
+    private MockWebServer server;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        server = new MockWebServer();
+    }
 
     @Override protected void tearDown() throws Exception {
         server.shutdown();