summaryrefslogtreecommitdiffstats
path: root/luni/src/test
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-05-06 14:27:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-06 14:27:27 -0700
commit18a8a6f6a4cf8822f0192e0192db526aa3dad8fe (patch)
tree9bfa6495f88ebabc51f86c8dcadbfce3b7e396d0 /luni/src/test
parent3ca33005c15349600524935a56071ec1156cd69b (diff)
parenta41da0416f165216cacddff29d7e1359dcda0d7d (diff)
downloadlibcore-18a8a6f6a4cf8822f0192e0192db526aa3dad8fe.zip
libcore-18a8a6f6a4cf8822f0192e0192db526aa3dad8fe.tar.gz
libcore-18a8a6f6a4cf8822f0192e0192db526aa3dad8fe.tar.bz2
am a41da041: Merge "Make it clearer that a new MockWebServer is created for each test run"
* commit 'a41da0416f165216cacddff29d7e1359dcda0d7d': Make it clearer that a new MockWebServer is created for each test run
Diffstat (limited to 'luni/src/test')
-rw-r--r--luni/src/test/java/libcore/java/net/URLConnectionTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/luni/src/test/java/libcore/java/net/URLConnectionTest.java b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
index ac38eb8..1b4279f 100644
--- a/luni/src/test/java/libcore/java/net/URLConnectionTest.java
+++ b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
@@ -80,12 +80,13 @@ import static com.google.mockwebserver.SocketPolicy.SHUTDOWN_INPUT_AT_END;
import static com.google.mockwebserver.SocketPolicy.SHUTDOWN_OUTPUT_AT_END;
public final class URLConnectionTest extends TestCase {
- private MockWebServer server = new MockWebServer();
+ private MockWebServer server;
private HttpResponseCache cache;
private String hostName;
@Override protected void setUp() throws Exception {
super.setUp();
+ server = new MockWebServer();
hostName = server.getHostName();
}
@@ -1835,7 +1836,6 @@ public final class URLConnectionTest extends TestCase {
}
public void testGetKeepAlive() throws Exception {
- MockWebServer server = new MockWebServer();
server.enqueue(new MockResponse().setBody("ABC"));
server.play();