Merge \\"Initialize MockWebServer in setUp() not construction time\\" am: f3c312b25a

am: aa66709b3b

Change-Id: I641c85f0874ac84f1ebd3ea3cc2750e95095b8ef

1 files changed, 7 insertions, 1 deletions

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 @@ import junit.framework.TestCase;
 
 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();