Merge pull request #1014 from hyperium/next-uri

feat(uri): redesign RequestUri type into Uri
This commit is contained in:
Sean McArthur
2017-01-17 17:44:18 -08:00
committed by GitHub
10 changed files with 297 additions and 136 deletions

View File

@@ -47,6 +47,7 @@ macro_rules! test {
fn $name() {
#![allow(unused)]
use hyper::header::*;
let _ = pretty_env_logger::init();
let server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap();
let mut core = Core::new().unwrap();
@@ -74,7 +75,7 @@ macro_rules! test {
while n < buf.len() && n < expected.len() {
n += inc.read(&mut buf[n..]).unwrap();
}
assert_eq!(s(&buf[..n]), expected);
assert_eq!(s(&buf[..n]), expected, "expected is invalid");
inc.write_all($server_reply.as_ref()).unwrap();
tx.complete(());
@@ -85,9 +86,9 @@ macro_rules! test {
let work = res.join(rx).map(|r| r.0);
let res = core.run(work).unwrap();
assert_eq!(res.status(), &StatusCode::$client_status);
assert_eq!(res.status(), &StatusCode::$client_status, "status is invalid");
$(
assert_eq!(res.headers().get(), Some(&$response_headers));
assert_eq!(res.headers().get(), Some(&$response_headers), "headers are invalid");
)*
}
);