commit 2440623105409d48ec0a3717bb6f3da711a0f15d
author Neil Fuller <nfuller@google.com> Wed Jun 29 15:25:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 29 15:25:41 2016 +0000
tree 00e7f1cd1c919b30ac621f4cf43dcef22bb3f424
parent 69ca35f6fd7f1f49ff2ac8b44b43b7e9578fd5c7
parent d680f43b995aae01123ee6bc7adb690dafcc47fe

Merge \\\\"Initialize MockWebServer in setUp() not construction time\\\\" am: f3c312b25a am: aa66709b3b am: 7057017d19
am: d680f43b99

Change-Id: I73305b91a6cf63b244b5a8f3e0d14c5ec416a017

src/test/java/com/google/mockwebserver/MockWebServerTest.java

diff --git a/src/test/java/com/google/mockwebserver/MockWebServerTest.java b/src/test/java/com/google/mockwebserver/MockWebServerTest.java
index a8d5331..64c0f68 100644
--- a/src/test/java/com/google/mockwebserver/MockWebServerTest.java
+++ b/src/test/java/com/google/mockwebserver/MockWebServerTest.java
@@ -32,7 +32,13 @@
 
 public final class MockWebServerTest 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();