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

Auto merge of #9104 - vwvww:issue_9098, r=nox

Browse source 
Refactor AssertRequestsMustNotHaveHeaders

Improve correctness of AssertRequestMustNotHaveHeaders tests
 - Changed AssertRequestsMustNotHaveHeaders to AssertRequestMustNotIncudeHeaders
 - Added an assertion that headers_not_expected is not empty

tested by command
./mach test unit
and all passed.

resolves #9098

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9104)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-01 02:20:05 +05:30
commit 61314f5253
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -242,21 +242,22 @@ fn assert_cookie_for_domain(cookie_jar: Arc<RwLock<CookieStorage>>, domain: &str
} }
} }
struct AssertRequestMustNotHaveHeaders { struct AssertRequestMustNotIncludeHeaders {
headers_not_expected: Vec<String>, headers_not_expected: Vec<String>,
request_headers: Headers, request_headers: Headers,
t: ResponseType t: ResponseType
} }
impl AssertRequestMustNotHaveHeaders { impl AssertRequestMustNotIncludeHeaders {
fn new(t: ResponseType, headers_not_expected: Vec<String>) -> Self { fn new(t: ResponseType, headers_not_expected: Vec<String>) -> Self {
AssertRequestMustNotHaveHeaders { assert!(headers_not_expected.len() != 0);
AssertRequestMustNotIncludeHeaders {
headers_not_expected: headers_not_expected, headers_not_expected: headers_not_expected,
request_headers: Headers::new(), t: t } request_headers: Headers::new(), t: t }
} }
} }
impl HttpRequest for AssertRequestMustNotHaveHeaders { impl HttpRequest for AssertRequestMustNotIncludeHeaders {
type R = MockResponse; type R = MockResponse;
fn headers_mut(&mut self) -> &mut Headers { &mut self.request_headers } fn headers_mut(&mut self) -> &mut Headers { &mut self.request_headers }
@ -270,17 +271,17 @@ impl HttpRequest for AssertRequestMustNotHaveHeaders {
} }
} }
struct AssertMustNotHaveHeadersRequestFactory { struct AssertMustNotIncludeHeadersRequestFactory {
headers_not_expected: Vec<String>, headers_not_expected: Vec<String>,
body: Vec<u8> body: Vec<u8>
} }
impl HttpRequestFactory for AssertMustNotHaveHeadersRequestFactory { impl HttpRequestFactory for AssertMustNotIncludeHeadersRequestFactory {
type R = AssertRequestMustNotHaveHeaders; type R = AssertRequestMustNotIncludeHeaders;
fn create(&self, _: Url, _: Method) -> Result<AssertRequestMustNotHaveHeaders, LoadError> { fn create(&self, _: Url, _: Method) -> Result<AssertRequestMustNotIncludeHeaders, LoadError> {
Ok( Ok(
AssertRequestMustNotHaveHeaders::new( AssertRequestMustNotIncludeHeaders::new(
ResponseType::Text(self.body.clone()), ResponseType::Text(self.body.clone()),
self.headers_not_expected.clone() self.headers_not_expected.clone()
) )
@ -906,9 +907,9 @@ fn test_when_cookie_set_marked_httpsonly_secure_isnt_sent_on_http_request() {
assert_cookie_for_domain(cookie_jar.clone(), "https://mozilla.com", "mozillaIs=theBest"); assert_cookie_for_domain(cookie_jar.clone(), "https://mozilla.com", "mozillaIs=theBest");
let _ = load::<AssertRequestMustNotHaveHeaders>( let _ = load::<AssertRequestMustNotIncludeHeaders>(
load_data.clone(), hsts_list, cookie_jar, None, load_data.clone(), hsts_list, cookie_jar, None,
&AssertMustNotHaveHeadersRequestFactory { &AssertMustNotIncludeHeadersRequestFactory {
headers_not_expected: vec!["Cookie".to_owned()], headers_not_expected: vec!["Cookie".to_owned()],
body: <[_]>::to_vec(&*load_data.data.unwrap()) body: <[_]>::to_vec(&*load_data.data.unwrap())
}, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None)); }, DEFAULT_USER_AGENT.to_owned(), &CancellationListener::new(None));