rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add more ranked routing tests.

This commit is contained in:
Sergio Benitez 2016-08-26 21:48:16 -07:00
parent a34374d913
commit c058694bd0
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/content_type.rs
View File

@ -99,7 +99,7 @@ impl FromStr for ContentType {
}; };
let top_str = &raw[..slash]; let top_str = &raw[..slash];
let (sub_str, rest) = match raw.find(';') { let (sub_str, _rest) = match raw.find(';') {
Some(j) => (&raw[(slash + 1)..j], Some(&raw[(j + 1)..])), Some(j) => (&raw[(slash + 1)..j], Some(&raw[(j + 1)..])),
None => (&raw[(slash + 1)..], None) None => (&raw[(slash + 1)..], None)
}; };

35
lib/src/router/mod.rs
View File

@ -140,6 +140,11 @@ mod test {
} }
} }
fn matches<'a>(router: &'a Router, method: Method, uri: &str) -> Vec<&'a Route> {
let request = Request::mock(method, uri);
router.route(&request)
}
#[test] #[test]
fn test_ok_routing() { fn test_ok_routing() {
let router = router_with_routes(&["/hello"]); let router = router_with_routes(&["/hello"]);
@ -227,11 +232,15 @@ mod test {
} }
macro_rules! assert_ranked_routing { macro_rules! assert_ranked_routing {
(to: $to:expr, with: $routes:expr, expect: $want:expr) => ({ (to: $to:expr, with: $routes:expr, expect: $($want:expr),+) => ({
let router = router_with_ranked_routes(&$routes); let router = router_with_ranked_routes(&$routes);
let routed_to = route(&router, Get, $to).unwrap(); let routed_to = matches(&router, Get, $to);
assert_eq!(routed_to.path.as_str() as &str, $want.1); let expected = &[$($want),+];
assert_eq!(routed_to.rank, $want.0); assert!(routed_to.len() == expected.len());
for (got, expected) in routed_to.iter().zip(expected.iter()) {
assert_eq!(got.path.as_str() as &str, expected.1);
assert_eq!(got.rank, expected.0);
}
}) })
} }
@ -240,19 +249,31 @@ mod test {
assert_ranked_routing!( assert_ranked_routing!(
to: "a/b", to: "a/b",
with: [(1, "a/<b>"), (2, "a/<b>")], with: [(1, "a/<b>"), (2, "a/<b>")],
expect: (1, "a/<b>") expect: (1, "a/<b>"), (2, "a/<b>")
); );
assert_ranked_routing!( assert_ranked_routing!(
to: "b/b", to: "b/b",
with: [(1, "a/<b>"), (2, "b/<b>"), (3, "b/b")], with: [(1, "a/<b>"), (2, "b/<b>"), (3, "b/b")],
expect: (2, "b/<b>") expect: (2, "b/<b>"), (3, "b/b")
); );
assert_ranked_routing!( assert_ranked_routing!(
to: "b/b", to: "b/b",
with: [(1, "a/<b>"), (2, "b/<b>"), (0, "b/b")], with: [(1, "a/<b>"), (2, "b/<b>"), (0, "b/b")],
expect: (0, "b/b") expect: (0, "b/b"), (2, "b/<b>")
);
assert_ranked_routing!(
to: "/profile/sergio/edit",
with: [(1, "/<a>/<b>/edit"), (2, "/profile/<d>"), (0, "/<a>/<b>/<c>")],
expect: (0, "/<a>/<b>/<c>"), (1, "/<a>/<b>/edit")
);
assert_ranked_routing!(
to: "/profile/sergio/edit",
with: [(0, "/<a>/<b>/edit"), (2, "/profile/<d>"), (5, "/<a>/<b>/<c>")],
expect: (0, "/<a>/<b>/edit"), (5, "/<a>/<b>/<c>")
); );
} }