aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/tests/cookie.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-01-25 18:06:33 -0600
committerGitHub <noreply@github.com>2018-01-25 18:06:33 -0600
commitc9ba16f9fbdf7f43cb19feedfaaa68c85bbcbe3b (patch)
treeb6b5d9e1539d294fdbba5fec5a545d8aa6552443 /components/net/tests/cookie.rs
parentfc3b1789318afc8f10e160d40b592234fbdb5cf4 (diff)
parent31631cdc47618a1591b6520eab8c82b28ac13bee (diff)
downloadservo-c9ba16f9fbdf7f43cb19feedfaaa68c85bbcbe3b.tar.gz
servo-c9ba16f9fbdf7f43cb19feedfaaa68c85bbcbe3b.zip
Auto merge of #19868 - CYBAI:specific-assertion, r=emilio
Use specific assertions Similar to #19865 r? jdm Note: Should I squash all the commits into one commit? --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because it should not break anything <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19868) <!-- Reviewable:end -->
Diffstat (limited to 'components/net/tests/cookie.rs')
-rw-r--r--components/net/tests/cookie.rs34
1 files changed, 17 insertions, 17 deletions
diff --git a/components/net/tests/cookie.rs b/components/net/tests/cookie.rs
index 0508f5ae4ec..68149736680 100644
--- a/components/net/tests/cookie.rs
+++ b/components/net/tests/cookie.rs
@@ -44,13 +44,13 @@ fn test_path_match() {
#[test]
fn test_default_path() {
- assert!(&*Cookie::default_path("/foo/bar/baz/") == "/foo/bar/baz");
- assert!(&*Cookie::default_path("/foo/bar/baz") == "/foo/bar");
- assert!(&*Cookie::default_path("/foo/") == "/foo");
- assert!(&*Cookie::default_path("/foo") == "/");
- assert!(&*Cookie::default_path("/") == "/");
- assert!(&*Cookie::default_path("") == "/");
- assert!(&*Cookie::default_path("foo") == "/");
+ assert_eq!(&*Cookie::default_path("/foo/bar/baz/"), "/foo/bar/baz");
+ assert_eq!(&*Cookie::default_path("/foo/bar/baz"), "/foo/bar");
+ assert_eq!(&*Cookie::default_path("/foo/"), "/foo");
+ assert_eq!(&*Cookie::default_path("/foo"), "/");
+ assert_eq!(&*Cookie::default_path("/"), "/");
+ assert_eq!(&*Cookie::default_path(""), "/");
+ assert_eq!(&*Cookie::default_path("foo"), "/");
}
#[test]
@@ -69,7 +69,7 @@ fn fn_cookie_constructor() {
let cookie = cookie_rs::Cookie::parse(" baz = bar; Domain = ").unwrap();
assert!(Cookie::new_wrapped(cookie.clone(), url, CookieSource::HTTP).is_some());
let cookie = Cookie::new_wrapped(cookie, url, CookieSource::HTTP).unwrap();
- assert!(&**cookie.cookie.domain().as_ref().unwrap() == "example.com");
+ assert_eq!(&**cookie.cookie.domain().as_ref().unwrap(), "example.com");
// cookie public domains test
let cookie = cookie_rs::Cookie::parse(" baz = bar; Domain = gov.ac").unwrap();
@@ -88,11 +88,11 @@ fn fn_cookie_constructor() {
let cookie = cookie_rs::Cookie::parse(" baz = bar ; Secure; Path = /foo/bar/").unwrap();
let cookie = Cookie::new_wrapped(cookie, url, CookieSource::HTTP).unwrap();
- assert!(cookie.cookie.value() == "bar");
- assert!(cookie.cookie.name() == "baz");
+ assert_eq!(cookie.cookie.value(), "bar");
+ assert_eq!(cookie.cookie.name(), "baz");
assert!(cookie.cookie.secure());
- assert!(&cookie.cookie.path().as_ref().unwrap()[..] == "/foo/bar/");
- assert!(&cookie.cookie.domain().as_ref().unwrap()[..] == "example.com");
+ assert_eq!(&cookie.cookie.path().as_ref().unwrap()[..], "/foo/bar/");
+ assert_eq!(&cookie.cookie.domain().as_ref().unwrap()[..], "example.com");
assert!(cookie.host_only);
let u = &ServoUrl::parse("http://example.com/foobar").unwrap();
@@ -192,11 +192,11 @@ fn test_sort_order() {
let b = Cookie::new_wrapped(b, url, CookieSource::HTTP).unwrap();
assert!(b.cookie.path().as_ref().unwrap().len() > a.cookie.path().as_ref().unwrap().len());
- assert!(CookieStorage::cookie_comparator(&a, &b) == Ordering::Greater);
- assert!(CookieStorage::cookie_comparator(&b, &a) == Ordering::Less);
- assert!(CookieStorage::cookie_comparator(&a, &a_prime) == Ordering::Less);
- assert!(CookieStorage::cookie_comparator(&a_prime, &a) == Ordering::Greater);
- assert!(CookieStorage::cookie_comparator(&a, &a) == Ordering::Equal);
+ assert_eq!(CookieStorage::cookie_comparator(&a, &b), Ordering::Greater);
+ assert_eq!(CookieStorage::cookie_comparator(&b, &a), Ordering::Less);
+ assert_eq!(CookieStorage::cookie_comparator(&a, &a_prime), Ordering::Less);
+ assert_eq!(CookieStorage::cookie_comparator(&a_prime, &a), Ordering::Greater);
+ assert_eq!(CookieStorage::cookie_comparator(&a, &a), Ordering::Equal);
}
fn add_cookie_to_storage(storage: &mut CookieStorage, url: &ServoUrl, cookie_str: &str)