Make WebServiceWorkerResponse support ResponseType

Source/modules/serviceworkers/ResponseTest.cpp

Index: Source/modules/serviceworkers/ResponseTest.cpp
diff --git a/Source/modules/serviceworkers/ResponseTest.cpp b/Source/modules/serviceworkers/ResponseTest.cpp
index eabe9d64f9cf7b2cf3c1863f8e4e323949fde58c..4d2719110c85d8c56cfde61d3ce30dd679cf2f6e 100644
--- a/Source/modules/serviceworkers/ResponseTest.cpp
+++ b/Source/modules/serviceworkers/ResponseTest.cpp
@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 
 #include "config.h"
+#include "modules/serviceworkers/Response.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
 #include "core/frame/Frame.h"
 #include "core/testing/DummyPageHolder.h"
-#include "modules/serviceworkers/Response.h"
 #include "modules/serviceworkers/FetchResponseData.h"
 #include "public/platform/WebServiceWorkerResponse.h"
 #include <gtest/gtest.h>
@@ -17,6 +17,26 @@
 namespace blink {
 namespace {
 
+PassOwnPtr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse()
+{
+    const KURL url(ParsedURLString, "http://www.webresponse.com/");
+    const unsigned short status = 200;
+    const String statusText = "the best status text";
+    struct {
+        const char* key;
+        const char* value;
+    } headers[] = { { "cache-control", "no-cache" }, { "set-cookie", "foop" }, { "foo", "bar" }, { 0, 0 } };
+
+    OwnPtr<WebServiceWorkerResponse> webResponse = adoptPtr(new WebServiceWorkerResponse());
+    webResponse->setURL(url);
+    webResponse->setStatus(status);
+    webResponse->setStatusText(statusText);
+    webResponse->setResponseType(WebServiceWorkerResponse::DefaultType);
+    for (int i = 0; headers[i].key; ++i)
+        webResponse->setHeader(WebString::fromUTF8(headers[i].key), WebString::fromUTF8(headers[i].value));
+    return webResponse.release();
+}
+
 class ServiceWorkerResponseTest : public ::testing::Test {
 public:
     ServiceWorkerResponseTest()
@@ -44,36 +64,80 @@ TEST_F(ServiceWorkerResponseTest, FromFetchResponseData)
 
 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponse)
 {
-    const KURL url(ParsedURLString, "http://www.webresponse.com/");
-    const unsigned short status = 200;
-    const String statusText = "the best status text";
-    struct { const char* key; const char* value; } headers[] = { {"X-Foo", "bar"}, {"X-Quux", "foop"}, {0, 0} };
-
-    WebServiceWorkerResponse webResponse;
-    webResponse.setURL(url);
-    webResponse.setStatus(status);
-    webResponse.setStatusText(statusText);
-    for (int i = 0; headers[i].key; ++i)
-        webResponse.setHeader(WebString::fromUTF8(headers[i].key), WebString::fromUTF8(headers[i].value));
-
-    Response* response = Response::create(executionContext(), webResponse);
+    OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
+    Response* response = Response::create(executionContext(), *webResponse);
     ASSERT(response);
-    EXPECT_EQ(url, response->url());
-    EXPECT_EQ(status, response->status());
-    EXPECT_EQ(statusText, response->statusText());
+    EXPECT_EQ(webResponse->url(), response->url());
+    EXPECT_EQ(webResponse->status(), response->status());
+    EXPECT_STREQ(webResponse->statusText().utf8().c_str(), response->statusText().utf8().data());
 
     Headers* responseHeaders = response->headers();
 
-    WTF::HashMap<String, String> headersMap;
-    for (int i = 0; headers[i].key; ++i)
-        headersMap.add(headers[i].key, headers[i].value);
-    EXPECT_EQ(headersMap.size(), responseHeaders->headerList()->size());
-    for (WTF::HashMap<String, String>::iterator iter = headersMap.begin(); iter != headersMap.end(); ++iter) {
+    WebVector<WebString> keys = webResponse->getHeaderKeys();
+    EXPECT_EQ(keys.size(), responseHeaders->headerList()->size());
+    for (size_t i = 0, max = keys.size(); i < max; ++i) {
+        WebString key = keys[i];
         TrackExceptionState exceptionState;
-        EXPECT_EQ(iter->value, responseHeaders->get(iter->key, exceptionState));
+        EXPECT_STREQ(webResponse->getHeader(key).utf8().c_str(), responseHeaders->get(key, exceptionState).utf8().data());
         EXPECT_FALSE(exceptionState.hadException());
     }
 }
 
+TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseDefault)
+{
+    OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
+    webResponse->setResponseType(WebServiceWorkerResponse::DefaultType);
+    Response* response = Response::create(executionContext(), *webResponse);
+
+    Headers* responseHeaders = response->headers();
+    TrackExceptionState exceptionState;
+    EXPECT_STREQ("foop", responseHeaders->get("set-cookie", exceptionState).utf8().data());
+    EXPECT_STREQ("bar", responseHeaders->get("foo", exceptionState).utf8().data());
+    EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionState).utf8().data());
+    EXPECT_FALSE(exceptionState.hadException());
+}
+
+TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseBasic)
+{
+    OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
+    webResponse->setResponseType(WebServiceWorkerResponse::BasicType);
+    Response* response = Response::create(executionContext(), *webResponse);
+
+    Headers* responseHeaders = response->headers();
+    TrackExceptionState exceptionState;
+    EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().data());
+    EXPECT_STREQ("bar", responseHeaders->get("foo", exceptionState).utf8().data());
+    EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionState).utf8().data());
+    EXPECT_FALSE(exceptionState.hadException());
+}
+
+TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseCORS)
+{
+    OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
+    webResponse->setResponseType(WebServiceWorkerResponse::CORSType);
+    Response* response = Response::create(executionContext(), *webResponse);
+
+    Headers* responseHeaders = response->headers();
+    TrackExceptionState exceptionState;
+    EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().data());
+    EXPECT_STREQ("", responseHeaders->get("foo", exceptionState).utf8().data());
+    EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionState).utf8().data());
+    EXPECT_FALSE(exceptionState.hadException());
+}
+
+TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseOpaque)
+{
+    OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerResponse();
+    webResponse->setResponseType(WebServiceWorkerResponse::OpaqueType);
+    Response* response = Response::create(executionContext(), *webResponse);
+
+    Headers* responseHeaders = response->headers();
+    TrackExceptionState exceptionState;
+    EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().data());
+    EXPECT_STREQ("", responseHeaders->get("foo", exceptionState).utf8().data());
+    EXPECT_STREQ("", responseHeaders->get("cache-control", exceptionState).utf8().data());
+    EXPECT_FALSE(exceptionState.hadException());
+}
+
 } // namespace
 } // namespace blink