summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/tests/coretests/src/android/app/DownloadManagerBaseTest.java6
-rw-r--r--core/tests/coretests/src/android/net/http/CookiesTest.java8
-rw-r--r--core/tests/coretests/src/android/net/http/DefaultHttpClientTest.java8
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 af2a9446f348..ab40e0f638e9 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 29e590f74612..a53330e7b42a 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 cf9e6e6f435c..80c7a4c4b09e 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();