OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "modules/fetch/Request.h" | 6 #include "modules/fetch/Request.h" |
7 | 7 |
8 #include "bindings/core/v8/ExceptionState.h" | 8 #include "bindings/core/v8/ExceptionState.h" |
9 #include "bindings/core/v8/ScriptState.h" | 9 #include "bindings/core/v8/ScriptState.h" |
10 #include "core/dom/Document.h" | 10 #include "core/dom/Document.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 | 62 |
63 const KURL url(ParsedURLString, "http://www.example.com/"); | 63 const KURL url(ParsedURLString, "http://www.example.com/"); |
64 const String method = "GET"; | 64 const String method = "GET"; |
65 struct { | 65 struct { |
66 const char* key; | 66 const char* key; |
67 const char* value; | 67 const char* value; |
68 } headers[] = { {"X-Foo", "bar"}, {"X-Quux", "foop"}, {0, 0} }; | 68 } headers[] = { {"X-Foo", "bar"}, {"X-Quux", "foop"}, {0, 0} }; |
69 const String referrer = "http://www.referrer.com/"; | 69 const String referrer = "http://www.referrer.com/"; |
70 const WebReferrerPolicy referrerPolicy = WebReferrerPolicyAlways; | 70 const WebReferrerPolicy referrerPolicy = WebReferrerPolicyAlways; |
71 const WebURLRequest::RequestContext context = WebURLRequest::RequestContextA
udio; | 71 const WebURLRequest::RequestContext context = WebURLRequest::RequestContextA
udio; |
| 72 const WebURLRequest::FetchRedirectMode redirect = WebURLRequest::FetchRedire
ctModeFollow; |
72 | 73 |
73 webRequest.setURL(url); | 74 webRequest.setURL(url); |
74 webRequest.setMethod(method); | 75 webRequest.setMethod(method); |
75 webRequest.setRequestContext(context); | 76 webRequest.setRequestContext(context); |
| 77 webRequest.setRedirectMode(redirect); |
76 for (int i = 0; headers[i].key; ++i) | 78 for (int i = 0; headers[i].key; ++i) |
77 webRequest.setHeader(WebString::fromUTF8(headers[i].key), WebString::fro
mUTF8(headers[i].value)); | 79 webRequest.setHeader(WebString::fromUTF8(headers[i].key), WebString::fro
mUTF8(headers[i].value)); |
78 webRequest.setReferrer(referrer, referrerPolicy); | 80 webRequest.setReferrer(referrer, referrerPolicy); |
79 | 81 |
80 Request* request = Request::create(executionContext(), webRequest); | 82 Request* request = Request::create(executionContext(), webRequest); |
81 ASSERT(request); | 83 ASSERT(request); |
82 EXPECT_EQ(url, request->url()); | 84 EXPECT_EQ(url, request->url()); |
83 EXPECT_EQ(method, request->method()); | 85 EXPECT_EQ(method, request->method()); |
84 EXPECT_EQ("audio", request->context()); | 86 EXPECT_EQ("audio", request->context()); |
| 87 EXPECT_EQ("follow", request->redirect()); |
85 EXPECT_EQ(referrer, request->referrer()); | 88 EXPECT_EQ(referrer, request->referrer()); |
86 | 89 |
87 Headers* requestHeaders = request->headers(); | 90 Headers* requestHeaders = request->headers(); |
88 | 91 |
89 WTF::HashMap<String, String> headersMap; | 92 WTF::HashMap<String, String> headersMap; |
90 for (int i = 0; headers[i].key; ++i) | 93 for (int i = 0; headers[i].key; ++i) |
91 headersMap.add(headers[i].key, headers[i].value); | 94 headersMap.add(headers[i].key, headers[i].value); |
92 EXPECT_EQ(headersMap.size(), requestHeaders->headerList()->size()); | 95 EXPECT_EQ(headersMap.size(), requestHeaders->headerList()->size()); |
93 for (WTF::HashMap<String, String>::iterator iter = headersMap.begin(); iter
!= headersMap.end(); ++iter) { | 96 for (WTF::HashMap<String, String>::iterator iter = headersMap.begin(); iter
!= headersMap.end(); ++iter) { |
94 TrackExceptionState exceptionState; | 97 TrackExceptionState exceptionState; |
95 EXPECT_EQ(iter->value, requestHeaders->get(iter->key, exceptionState)); | 98 EXPECT_EQ(iter->value, requestHeaders->get(iter->key, exceptionState)); |
96 EXPECT_FALSE(exceptionState.hadException()); | 99 EXPECT_FALSE(exceptionState.hadException()); |
97 } | 100 } |
98 | 101 |
99 WebServiceWorkerRequest secondWebRequest; | 102 WebServiceWorkerRequest secondWebRequest; |
100 request->populateWebServiceWorkerRequest(secondWebRequest); | 103 request->populateWebServiceWorkerRequest(secondWebRequest); |
101 EXPECT_EQ(url, KURL(secondWebRequest.url())); | 104 EXPECT_EQ(url, KURL(secondWebRequest.url())); |
102 EXPECT_EQ(method, String(secondWebRequest.method())); | 105 EXPECT_EQ(method, String(secondWebRequest.method())); |
103 EXPECT_EQ(context, secondWebRequest.requestContext()); | 106 EXPECT_EQ(context, secondWebRequest.requestContext()); |
| 107 EXPECT_EQ(redirect, secondWebRequest.redirectMode()); |
104 EXPECT_EQ(referrer, KURL(secondWebRequest.referrerUrl())); | 108 EXPECT_EQ(referrer, KURL(secondWebRequest.referrerUrl())); |
105 EXPECT_EQ(referrerPolicy, secondWebRequest.referrerPolicy()); | 109 EXPECT_EQ(referrerPolicy, secondWebRequest.referrerPolicy()); |
106 EXPECT_EQ(webRequest.headers(), secondWebRequest.headers()); | 110 EXPECT_EQ(webRequest.headers(), secondWebRequest.headers()); |
107 } | 111 } |
108 | 112 |
109 TEST_F(ServiceWorkerRequestTest, ToWebRequestStripsURLFragment) | 113 TEST_F(ServiceWorkerRequestTest, ToWebRequestStripsURLFragment) |
110 { | 114 { |
111 TrackExceptionState exceptionState; | 115 TrackExceptionState exceptionState; |
112 String urlWithoutFragment = "http://www.example.com/"; | 116 String urlWithoutFragment = "http://www.example.com/"; |
113 String url = urlWithoutFragment + "#fragment"; | 117 String url = urlWithoutFragment + "#fragment"; |
114 Request* request = Request::create(scriptState(), url, exceptionState); | 118 Request* request = Request::create(scriptState(), url, exceptionState); |
115 ASSERT(request); | 119 ASSERT(request); |
116 | 120 |
117 WebServiceWorkerRequest webRequest; | 121 WebServiceWorkerRequest webRequest; |
118 request->populateWebServiceWorkerRequest(webRequest); | 122 request->populateWebServiceWorkerRequest(webRequest); |
119 EXPECT_EQ(urlWithoutFragment, KURL(webRequest.url())); | 123 EXPECT_EQ(urlWithoutFragment, KURL(webRequest.url())); |
120 } | 124 } |
121 | 125 |
122 } // namespace | 126 } // namespace |
123 } // namespace blink | 127 } // namespace blink |
OLD | NEW |