make_stream -> make_response

This commit is contained in:
Martin Algesten
2018-06-12 22:03:19 +02:00
parent 729f907fe0
commit 0d398bc76b
5 changed files with 17 additions and 18 deletions

View File

@@ -11,7 +11,7 @@ fn agent_reuse_headers() {
test::set_handler("/agent_reuse_headers", |req, _url| {
assert!(req.has("Authorization"));
assert_eq!(req.header("Authorization").unwrap(), "Foo 12345");
test::make_stream(200, "OK", vec!["X-Call: 1"], vec![])
test::make_response(200, "OK", vec!["X-Call: 1"], vec![])
});
let resp = agent.get("test://host/agent_reuse_headers").call();
@@ -20,7 +20,7 @@ fn agent_reuse_headers() {
test::set_handler("/agent_reuse_headers", |req, _url| {
assert!(req.has("Authorization"));
assert_eq!(req.header("Authorization").unwrap(), "Foo 12345");
test::make_stream(200, "OK", vec!["X-Call: 2"], vec![])
test::make_response(200, "OK", vec!["X-Call: 2"], vec![])
});
let resp = agent.get("test://host/agent_reuse_headers").call();
@@ -34,17 +34,16 @@ fn agent_cookies() {
.build();
test::set_handler("/agent_cookies", |_req, _url| {
test::make_stream(200, "OK", vec!["Set-Cookie: foo=bar; Path=/; HttpOnly"], vec![])
test::make_response(200, "OK", vec!["Set-Cookie: foo=bar%20baz; Path=/; HttpOnly"], vec![])
});
agent.get("test://host/agent_cookies").call();
assert!(agent.cookie("foo").is_some());
assert_eq!(agent.cookie("foo").unwrap().value(), "bar");
assert_eq!(agent.cookie("foo").unwrap().value(), "bar baz");
test::set_handler("/agent_cookies", |req, _url| {
assert_eq!(req.header("Cookie").unwrap(), "");
test::make_stream(200, "OK", vec![], vec![])
test::make_response(200, "OK", vec![], vec![])
});
agent.get("test://host/agent_cookies").call();

View File

@@ -6,7 +6,7 @@ use super::super::*;
fn basic_auth() {
test::set_handler("/basic_auth", |req, _url| {
assert_eq!(req.header("Authorization").unwrap(), "Basic bWFydGluOnJ1YmJlcm1hc2hndW0=");
test::make_stream(200, "OK", vec![], vec![])
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/basic_auth")
.auth("martin", "rubbermashgum")
@@ -18,7 +18,7 @@ fn basic_auth() {
fn kind_auth() {
test::set_handler("/kind_auth", |req, _url| {
assert_eq!(req.header("Authorization").unwrap(), "Digest abcdefgh123");
test::make_stream(200, "OK", vec![], vec![])
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/kind_auth")
.auth_kind("Digest", "abcdefgh123")

View File

@@ -6,7 +6,7 @@ use super::super::*;
#[test]
fn transfer_encoding_bogus() {
test::set_handler("/transfer_encoding_bogus", |_req, _url| {
test::make_stream(
test::make_response(
200,
"OK",
vec![
@@ -27,7 +27,7 @@ fn transfer_encoding_bogus() {
#[test]
fn content_length_limited() {
test::set_handler("/content_length_limited", |_req, _url| {
test::make_stream(
test::make_response(
200,
"OK",
vec!["Content-Length: 4"],
@@ -45,7 +45,7 @@ fn content_length_limited() {
// content-length should be ignnored when chunked
fn ignore_content_length_when_chunked() {
test::set_handler("/ignore_content_length_when_chunked", |_req, _url| {
test::make_stream(
test::make_response(
200,
"OK",
vec!["Content-Length: 4", "transfer-encoding: chunked"],

View File

@@ -28,7 +28,7 @@ where
handlers.insert(path.to_string(), Box::new(handler));
}
pub fn make_stream(
pub fn make_response(
status: u16,
status_text: &str,
headers: Vec<&str>,

View File

@@ -8,7 +8,7 @@ fn header_passing() {
test::set_handler("/header_passing", |req, _url| {
assert!(req.has("X-Foo"));
assert_eq!(req.header("X-Foo").unwrap(), "bar");
test::make_stream(200, "OK", vec!["X-Bar: foo"], vec![])
test::make_response(200, "OK", vec!["X-Bar: foo"], vec![])
});
let resp = get("test://host/header_passing").set("X-Foo", "bar").call();
assert_eq!(*resp.status(), 200);
@@ -21,7 +21,7 @@ fn repeat_non_x_header() {
test::set_handler("/repeat_non_x_header", |req, _url| {
assert!(req.has("Accept"));
assert_eq!(req.header("Accept").unwrap(), "baz");
test::make_stream(200, "OK", vec![], vec![])
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/repeat_non_x_header")
.set("Accept", "bar")
@@ -39,7 +39,7 @@ fn repeat_x_header() {
"130.240.19.2",
"130.240.19.3",
]);
test::make_stream(200, "OK", vec![], vec![])
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/repeat_x_header")
.set("X-Forwarded-For", "130.240.19.2")
@@ -51,7 +51,7 @@ fn repeat_x_header() {
#[test]
fn body_as_text() {
test::set_handler("/body_as_text", |_req, _url| {
test::make_stream(200, "OK", vec![], "Hello World!".to_string().into_bytes())
test::make_response(200, "OK", vec![], "Hello World!".to_string().into_bytes())
});
let resp = get("test://host/body_as_text").call();
let text = resp.into_string().unwrap();
@@ -61,7 +61,7 @@ fn body_as_text() {
#[test]
fn body_as_json() {
test::set_handler("/body_as_json", |_req, _url| {
test::make_stream(
test::make_response(
200,
"OK",
vec![],
@@ -76,7 +76,7 @@ fn body_as_json() {
#[test]
fn body_as_reader() {
test::set_handler("/body_as_reader", |_req, _url| {
test::make_stream(200, "OK", vec![], "abcdefgh".to_string().into_bytes())
test::make_response(200, "OK", vec![], "abcdefgh".to_string().into_bytes())
});
let resp = get("test://host/body_as_reader").call();
let mut reader = resp.into_reader();