summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Liu <luciferleo@google.com>2015-09-01 09:14:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 09:14:41 +0000
commit9f0f4b7ab930dd91fa5dcfaed8186906692a880d (patch)
tree3d00821b44d57d8d54d605bacd31d515cab10049
parent105e5e79e50c16f3b76df71164fd0b804aa9e69c (diff)
parent5c1aebcfab85fc64ddfb1e5fdcdde182365d523a (diff)
downloadlibcore-9f0f4b7ab930dd91fa5dcfaed8186906692a880d.zip
libcore-9f0f4b7ab930dd91fa5dcfaed8186906692a880d.tar.gz
libcore-9f0f4b7ab930dd91fa5dcfaed8186906692a880d.tar.bz2
am 5c1aebcf: Merge "Fix libcore.java.net.OldCookieHandlerTest#test_get_put()" into lmp-sprout-dev
* commit '5c1aebcfab85fc64ddfb1e5fdcdde182365d523a': Fix libcore.java.net.OldCookieHandlerTest#test_get_put()
-rw-r--r--luni/src/test/java/libcore/java/net/OldCookieHandlerTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/test/java/libcore/java/net/OldCookieHandlerTest.java b/luni/src/test/java/libcore/java/net/OldCookieHandlerTest.java
index 6992cae..0e11d50 100644
--- a/luni/src/test/java/libcore/java/net/OldCookieHandlerTest.java
+++ b/luni/src/test/java/libcore/java/net/OldCookieHandlerTest.java
@@ -41,6 +41,7 @@ public class OldCookieHandlerTest extends TestCase {
CookieHandler.setDefault(mch);
MockWebServer server = new MockWebServer();
+ server.play();
server.enqueue(new MockResponse().addHeader("Set-Cookie2: a=\"android\"; "
+ "Comment=\"this cookie is delicious\"; "
+ "CommentURL=\"http://google.com/\"; "
@@ -51,7 +52,6 @@ public class OldCookieHandlerTest extends TestCase {
+ "Port=\"80,443," + server.getPort() + "\"; "
+ "Secure; "
+ "Version=\"1\""));
- server.play();
URLConnection connection = server.getUrl("/path/foo").openConnection();
connection.getContent();