commit f1026cb99ee79a035b0adbb50dec9eb5185ce58f
author Neil Fuller <nfuller@google.com> Tue Aug 09 16:06:23 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 09 16:06:23 2016 +0000
tree 41def7400ce2d2568c98c7df1298071e46575478
parent 60bd0b56fb447fa1021f9f48008297479dcc3d4f
parent a87e5240cc29979270520dca070b43f54e82c5a6

Merge "Initialize MockWebServer in setUp() not construction time"

tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java

diff --git a/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java b/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java
index 545541d..7987a50 100644
--- a/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java
+++ b/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java
@@ -38,10 +38,11 @@
 public final class HttpResponseCacheTest extends TestCase {
 
     private File cacheDir;
-    private MockWebServer server = new MockWebServer();
+    private MockWebServer server;
 
     @Override public void setUp() throws Exception {
         super.setUp();
+        server = new MockWebServer();
         String tmp = System.getProperty("java.io.tmpdir");
         cacheDir = new File(tmp, "HttpCache-" + UUID.randomUUID());
         cacheDir.mkdirs();