Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Convert AssertMustIncludeHeadersRequestFactory.

Browse source
This commit is contained in:
Josh Matthews 2016-04-12 18:18:37 -04:00
parent dec66b2215
commit 36de07bfdf
1 changed files with 27 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

92
tests/unit/net/http_loader.rs
View file

@ -213,49 +213,6 @@ impl HttpRequest for AssertAuthHeaderRequest {
}
}
struct AssertRequestMustIncludeHeaders {
expected_headers: Headers,
request_headers: Headers,
t: ResponseType
}
impl AssertRequestMustIncludeHeaders {
fn new(t: ResponseType, expected_headers_op: Option<Headers>) -> Self {
match expected_headers_op {
Some(expected_headers) => {
assert!(expected_headers.len() != 0);
AssertRequestMustIncludeHeaders {
expected_headers: expected_headers,
request_headers: Headers::new(),
t: t
}
}
None => AssertRequestMustIncludeHeaders {
expected_headers: Headers::new(),
request_headers: Headers::new(),
t: t
}
}
}
}
impl HttpRequest for AssertRequestMustIncludeHeaders {
type R = MockResponse;
fn headers_mut(&mut self) -> &mut Headers { &mut self.request_headers }
fn send(self, _: &Option<Vec<u8>>) -> Result<MockResponse, LoadError> {
for header in self.expected_headers.iter() {
assert!(self.request_headers.get_raw(header.name()).is_some());
assert_eq!(
self.request_headers.get_raw(header.name()).unwrap(),
self.expected_headers.get_raw(header.name()).unwrap()
)
}
response_for_request_type(self.t)
}
}
struct AssertMustHaveHeadersRequestFactory {
expected_headers: Headers,
body: Vec<u8>
@ -288,21 +245,26 @@ impl HttpRequestFactory for AssertAuthHeaderRequestFactory {
}
}
fn assert_headers_included(expected: &Headers, request: &Headers) {
assert!(expected.len() != 0);
for header in expected.iter() {
assert!(request.get_raw(header.name()).is_some());
assert_eq!(request.get_raw(header.name()).unwrap(),
expected.get_raw(header.name()).unwrap())
}
}
struct AssertMustIncludeHeadersRequestFactory {
expected_headers: Headers,
body: Vec<u8>
}
impl HttpRequestFactory for AssertMustIncludeHeadersRequestFactory {
type R = AssertRequestMustIncludeHeaders;
type R = MockRequest;
fn create(&self, _: Url, _: Method) -> Result<AssertRequestMustIncludeHeaders, LoadError> {
Ok(
AssertRequestMustIncludeHeaders::new(
ResponseType::Text(self.body.clone()),
Some(self.expected_headers.clone())
)
)
fn create_with_headers(&self, _: Url, _: Method, headers: Headers) -> Result<MockRequest, LoadError> {
assert_headers_included(&self.expected_headers, &headers);
Ok(MockRequest::new(ResponseType::Text(self.body.clone())))
}
}
@ -1352,24 +1314,26 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
struct Factory;
impl HttpRequestFactory for Factory {
type R = AssertRequestMustIncludeHeaders;
type R = MockRequest;
fn create(&self, url: Url, _: Method) -> Result<AssertRequestMustIncludeHeaders, LoadError> {
fn create_with_headers(&self, url: Url, _: Method, headers: Headers) -> Result<MockRequest, LoadError> {
if url.domain().unwrap() == "mozilla.com" {
let mut expected_headers_x = Headers::new();
expected_headers_x.set_raw("Cookie".to_owned(),
vec![<[_]>::to_vec("mozillaIsNot=dotCom".as_bytes())]);
assert_headers_included(&expected_headers_x, &headers);
Ok(AssertRequestMustIncludeHeaders::new(
ResponseType::Redirect("http://mozilla.org".to_owned()), Some(expected_headers_x)))
Ok(MockRequest::new(
ResponseType::Redirect("http://mozilla.org".to_owned())))
} else if url.domain().unwrap() == "mozilla.org" {
let mut expected_headers_y = Headers::new();
expected_headers_y.set_raw(
"Cookie".to_owned(),
vec![<[_]>::to_vec("mozillaIs=theBest".as_bytes())]);
assert_headers_included(&expected_headers_y, &headers);
Ok(AssertRequestMustIncludeHeaders::new(
ResponseType::Text(<[_]>::to_vec("Yay!".as_bytes())), Some(expected_headers_y)))
Ok(MockRequest::new(
ResponseType::Text(<[_]>::to_vec("Yay!".as_bytes()))))
} else {
panic!("unexpected host {:?}", url)
}
@ -1422,22 +1386,20 @@ fn test_redirect_from_x_to_x_provides_x_with_cookie_from_first_response() {
struct Factory;
impl HttpRequestFactory for Factory {
type R = AssertRequestMustIncludeHeaders;
type R = MockRequest;
fn create(&self, url: Url, _: Method) -> Result<AssertRequestMustIncludeHeaders, LoadError> {
fn create_with_headers(&self, url: Url, _: Method, headers: Headers) -> Result<MockRequest, LoadError> {
if url.path().unwrap()[0] == "initial" {
let mut initial_answer_headers = Headers::new();
initial_answer_headers.set_raw("set-cookie", vec![b"mozillaIs=theBest; path=/;".to_vec()]);
Ok(AssertRequestMustIncludeHeaders::new(
Ok(MockRequest::new(
ResponseType::RedirectWithHeaders("http://mozilla.org/subsequent/".to_owned(),
initial_answer_headers),
None))
initial_answer_headers)))
} else if url.path().unwrap()[0] == "subsequent" {
let mut expected_subsequent_headers = Headers::new();
expected_subsequent_headers.set_raw("Cookie", vec![b"mozillaIs=theBest".to_vec()]);
Ok(AssertRequestMustIncludeHeaders::new(
ResponseType::Text(b"Yay!".to_vec()),
Some(expected_subsequent_headers)))
assert_headers_included(&expected_subsequent_headers, &headers);
Ok(MockRequest::new(ResponseType::Text(b"Yay!".to_vec())))
} else {
panic!("unexpected host {:?}", url)
}