Testing that URLConnection uses CookieManager for send and receive.
These all fail on Dalvik because we haven't wired these together.
On the RI, everything passes except for the two tests that check
parsing for multiple cookies in a single HTTP header.
Change-Id: Idb10c5b51b7ae5ca400dc564f2926f0d5792093d
diff --git a/luni/src/test/java/java/net/CookiesTest.java b/luni/src/test/java/java/net/CookiesTest.java
new file mode 100644
index 0000000..d77f046
--- /dev/null
+++ b/luni/src/test/java/java/net/CookiesTest.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package java.net;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import junit.framework.TestCase;
+import tests.http.MockResponse;
+import tests.http.MockWebServer;
+import tests.http.RecordedRequest;
+
+public class CookiesTest extends TestCase {
+
+ /**
+ * The Netscape cookie spec is officially obsolete, but widely used in practice. It's awkward to
+ * parse because the expires header includes a comma which is supposed to only be used for
+ * listing multiple values of a header on a single line. The use of an explicit date is also
+ * unloved because it is vulnerable to clock skew.
+ */
+ public void testNetscapeResponse() throws Exception {
+ CookieManager cookieManager = new CookieManager(null, CookiePolicy.ACCEPT_ALL);
+ CookieHandler.setDefault(cookieManager);
+ MockWebServer server = new MockWebServer();
+ server.play();
+
+ server.enqueue(new MockResponse().addHeader("Set-Cookie: a=apple; "
+ + "expires=Fri, 31-Dec-9999 23:59:59 GMT; "
+ + "path=/path; "
+ + "domain=localhost; "
+ + "secure"));
+ get(server);
+
+ List<HttpCookie> cookies = cookieManager.getCookieStore().getCookies();
+ assertEquals(1, cookies.size());
+ HttpCookie cookie = cookies.get(0);
+ assertEquals("a", cookie.getName());
+ assertEquals("apple", cookie.getValue());
+ assertEquals(null, cookie.getComment());
+ assertEquals(null, cookie.getCommentURL());
+ assertEquals(false, cookie.getDiscard());
+ assertEquals("localhost", cookie.getDomain());
+ assertTrue(cookie.getMaxAge() > 100000000000L);
+ assertEquals("/path", cookie.getPath());
+ assertEquals(true, cookie.getSecure());
+ assertEquals(0, cookie.getVersion());
+ }
+
+ /**
+ * RFC 2109 formalizes the Netscape cookie spec. It replaces the {@code expires} attribute with
+ * {@code Max-Age} and adds {@code Comment} and {@code Version} attributes.
+ */
+ public void testRfc2109Response() throws Exception {
+ CookieManager cookieManager = new CookieManager(null, CookiePolicy.ACCEPT_ALL);
+ CookieHandler.setDefault(cookieManager);
+ MockWebServer server = new MockWebServer();
+ server.play();
+
+ server.enqueue(new MockResponse().addHeader("Set-Cookie: a=apple; "
+ + "Comment=this cookie is delicious; "
+ + "Domain=localhost; "
+ + "Max-Age=60; "
+ + "Path=/path; "
+ + "Secure; "
+ + "Version=1"));
+ get(server);
+
+ List<HttpCookie> cookies = cookieManager.getCookieStore().getCookies();
+ assertEquals(1, cookies.size());
+ HttpCookie cookie = cookies.get(0);
+ assertEquals("a", cookie.getName());
+ assertEquals("apple", cookie.getValue());
+ assertEquals("this cookie is delicious", cookie.getComment());
+ assertEquals(null, cookie.getCommentURL());
+ assertEquals(false, cookie.getDiscard());
+ assertEquals("localhost", cookie.getDomain());
+ assertEquals(60, cookie.getMaxAge());
+ assertEquals("/path", cookie.getPath());
+ assertEquals(true, cookie.getSecure());
+ assertEquals(1, cookie.getVersion());
+ }
+
+ /**
+ * RFC 2965 refines RFC 2109. It adds {@code Discard}, {@code Port}, and {@code CommentURL}
+ * attributes and renames the header from {@code Set-Cookie} to {@code Set-Cookie2}.
+ */
+ public void testRfc2965Response() throws Exception {
+ CookieManager cookieManager = new CookieManager(null, CookiePolicy.ACCEPT_ALL);
+ CookieHandler.setDefault(cookieManager);
+ MockWebServer server = new MockWebServer();
+ server.play();
+
+ server.enqueue(new MockResponse().addHeader("Set-Cookie2: a=apple; "
+ + "Comment=this cookie is delicious; "
+ + "CommentURL=\"http://google.com/\"; "
+ + "Discard; "
+ + "Domain=localhost; "
+ + "Max-Age=60; "
+ + "Path=/path; "
+ + "Port=\"80,443," + server.getPort() + "\"; "
+ + "Secure; "
+ + "Version=1"));
+ get(server);
+
+ List<HttpCookie> cookies = cookieManager.getCookieStore().getCookies();
+ assertEquals(1, cookies.size());
+ HttpCookie cookie = cookies.get(0);
+ assertEquals("a", cookie.getName());
+ assertEquals("apple", cookie.getValue());
+ assertEquals("this cookie is delicious", cookie.getComment());
+ assertEquals("http://google.com/", cookie.getCommentURL());
+ assertEquals(true, cookie.getDiscard());
+ assertEquals("localhost", cookie.getDomain());
+ assertEquals(60, cookie.getMaxAge());
+ assertEquals("/path", cookie.getPath());
+ assertEquals("80,443," + server.getPort(), cookie.getPortlist());
+ assertEquals(true, cookie.getSecure());
+ assertEquals(1, cookie.getVersion());
+ }
+
+ public void testResponseWithMultipleCookieHeaderLines() throws Exception {
+ CookieManager cookieManager = new CookieManager(null, CookiePolicy.ACCEPT_ALL);
+ CookieHandler.setDefault(cookieManager);
+ MockWebServer server = new MockWebServer();
+ server.play();
+
+ server.enqueue(new MockResponse()
+ .addHeader("Set-Cookie: a=apple")
+ .addHeader("Set-Cookie: b=banana"));
+ get(server);
+
+ List<HttpCookie> cookies = sortedCopy(cookieManager.getCookieStore().getCookies());
+ assertEquals(2, cookies.size());
+ HttpCookie cookieA = cookies.get(0);
+ assertEquals("a", cookieA.getName());
+ assertEquals("apple", cookieA.getValue());
+ HttpCookie cookieB = cookies.get(1);
+ assertEquals("b", cookieB.getName());
+ assertEquals("banana", cookieB.getValue());
+ }
+
+ public void testResponseWithMultipleCookiesInOneHeaderLine() throws Exception {
+ CookieManager cookieManager = new CookieManager(null, CookiePolicy.ACCEPT_ALL);
+ CookieHandler.setDefault(cookieManager);
+ MockWebServer server = new MockWebServer();
+ server.play();
+
+ server.enqueue(new MockResponse().addHeader("Set-Cookie: "
+ + "a=apple, "
+ + "b=banana"));
+ get(server);
+
+ List<HttpCookie> cookies = sortedCopy(cookieManager.getCookieStore().getCookies());
+ assertEquals(2, cookies.size());
+ HttpCookie cookieA = cookies.get(0);
+ assertEquals("a", cookieA.getName());
+ assertEquals("apple", cookieA.getValue());
+ HttpCookie cookieB = cookies.get(1);
+ assertEquals("b", cookieB.getName());
+ assertEquals("banana", cookieB.getValue());
+ }
+
+ public void testResponseWithMultipleNetscapeCookiesInOneHeaderLine() throws Exception {
+ CookieManager cookieManager = new CookieManager(null, CookiePolicy.ACCEPT_ALL);
+ CookieHandler.setDefault(cookieManager);
+ MockWebServer server = new MockWebServer();
+ server.play();
+
+ server.enqueue(new MockResponse().addHeader("Set-Cookie: "
+ + "a=apple; expires=Fri, 31-Dec-9999 23:59:59 GMT; "
+ + "b=banana; expires=Fri, 31-Dec-9999 23:59:59 GMT"));
+ get(server);
+
+ List<HttpCookie> cookies = sortedCopy(cookieManager.getCookieStore().getCookies());
+ assertEquals(2, cookies.size());
+ HttpCookie cookieA = cookies.get(0);
+ assertEquals("a", cookieA.getName());
+ assertEquals("apple", cookieA.getValue());
+ HttpCookie cookieB = cookies.get(1);
+ assertEquals("b", cookieB.getName());
+ assertEquals("banana", cookieB.getValue());
+ }
+
+ public void testSendingCookiesFromStore() throws Exception {
+ MockWebServer server = new MockWebServer();
+ server.enqueue(new MockResponse());
+ server.play();
+
+ CookieManager cookieManager = new CookieManager(null, CookiePolicy.ACCEPT_ALL);
+ HttpCookie cookieA = new HttpCookie("a", "apple");
+ cookieA.setDomain("localhost");
+ cookieA.setPath("/");
+ cookieManager.getCookieStore().add(server.getUrl("/").toURI(), cookieA);
+ HttpCookie cookieB = new HttpCookie("b", "banana");
+ cookieB.setDomain("localhost");
+ cookieB.setPath("/");
+ cookieManager.getCookieStore().add(server.getUrl("/").toURI(), cookieB);
+ CookieHandler.setDefault(cookieManager);
+
+ get(server);
+ RecordedRequest request = server.takeRequest();
+
+ List<String> receivedHeaders = request.getHeaders();
+ assertContains(receivedHeaders, "Cookie: $Version=\"1\"; "
+ + "a=\"apple\";$Path=\"/\";$Domain=\"localhost\"; "
+ + "b=\"banana\";$Path=\"/\";$Domain=\"localhost\"");
+ }
+
+ private <T> void assertContains(Collection<T> collection, T element) {
+ if (!collection.contains(element)) {
+ fail("No " + element + " in " + collection);
+ }
+ }
+
+ private List<HttpCookie> sortedCopy(List<HttpCookie> cookies) {
+ List<HttpCookie> result = new ArrayList<HttpCookie>(cookies);
+ Collections.sort(result, new Comparator<HttpCookie>() {
+ public int compare(HttpCookie a, HttpCookie b) {
+ return a.getName().compareTo(b.getName());
+ }
+ });
+ return result;
+ }
+
+ private Map<String,List<String>> get(MockWebServer server) throws Exception {
+ URLConnection connection = server.getUrl("/").openConnection();
+ Map<String, List<String>> headers = connection.getHeaderFields();
+ connection.getInputStream().close();
+ return headers;
+ }
+}
diff --git a/support/src/test/java/tests/http/MockWebServer.java b/support/src/test/java/tests/http/MockWebServer.java
index 1ab0776..e3df2e8 100644
--- a/support/src/test/java/tests/http/MockWebServer.java
+++ b/support/src/test/java/tests/http/MockWebServer.java
@@ -43,9 +43,6 @@
static final String ASCII = "US-ASCII";
- /** sentinel object to shut down the server */
- private static final MockResponse NO_MORE_REQUESTS = new MockResponse();
-
private final BlockingQueue<RecordedRequest> requestQueue
= new LinkedBlockingQueue<RecordedRequest>();
private final BlockingQueue<MockResponse> responseQueue
@@ -80,9 +77,6 @@
}
public void enqueue(MockResponse response) {
- if (port != -1) {
- throw new IllegalStateException("Cannot enqueue responses after calling play().");
- }
responseQueue.add(response);
}
@@ -99,20 +93,21 @@
* down.
*/
public void play() throws IOException {
- responseQueue.add(NO_MORE_REQUESTS);
final ServerSocket ss = new ServerSocket(0);
ss.setReuseAddress(true);
port = ss.getLocalPort();
executor.submit(new Callable<Void>() {
public Void call() throws Exception {
+ int count = 0;
while (true) {
- if (responseQueue.peek() == NO_MORE_REQUESTS) {
+ if (count > 0 && responseQueue.isEmpty()) {
ss.close();
executor.shutdown();
return null;
}
serveConnection(ss.accept());
+ count++;
}
}
});
@@ -211,7 +206,7 @@
* Returns a response to satisfy {@code request}.
*/
private MockResponse computeResponse(RecordedRequest request) throws InterruptedException {
- if (responseQueue.peek() == NO_MORE_REQUESTS) {
+ if (responseQueue.isEmpty()) {
throw new IllegalStateException("Unexpected request: " + request);
}
return responseQueue.take();