cargo fmt

This commit is contained in:
Martin Algesten
2018-06-22 10:16:37 +02:00
parent 5f975270bf
commit 0a828bb4a5
12 changed files with 37 additions and 38 deletions

View File

@@ -4,9 +4,7 @@ use super::super::*;
#[test]
fn agent_reuse_headers() {
let agent = agent()
.set("Authorization", "Foo 12345")
.build();
let agent = agent().set("Authorization", "Foo 12345").build();
test::set_handler("/agent_reuse_headers", |req, _url| {
assert!(req.has("Authorization"));
@@ -27,14 +25,17 @@ fn agent_reuse_headers() {
assert_eq!(resp.header("X-Call").unwrap(), "2");
}
#[test]
fn agent_cookies() {
let agent = agent()
.build();
let agent = agent().build();
test::set_handler("/agent_cookies", |_req, _url| {
test::make_response(200, "OK", vec!["Set-Cookie: foo=bar%20baz; Path=/; HttpOnly"], vec![])
test::make_response(
200,
"OK",
vec!["Set-Cookie: foo=bar%20baz; Path=/; HttpOnly"],
vec![],
)
});
agent.get("test://host/agent_cookies").call();
@@ -52,5 +53,4 @@ fn agent_cookies() {
let s = String::from_utf8_lossy(&vec);
assert!(s.contains("Cookie: foo=bar%20baz\r\n"));
}

View File

@@ -5,7 +5,10 @@ use super::super::*;
#[test]
fn basic_auth() {
test::set_handler("/basic_auth", |req, _url| {
assert_eq!(req.header("Authorization").unwrap(), "Basic bWFydGluOnJ1YmJlcm1hc2hndW0=");
assert_eq!(
req.header("Authorization").unwrap(),
"Basic bWFydGluOnJ1YmJlcm1hc2hndW0="
);
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/basic_auth")

View File

@@ -42,14 +42,16 @@ fn content_length_limited() {
}
#[test]
// content-length should be ignored when chunked
fn ignore_content_length_when_chunked() {
// content-length should be ignored when chunked
fn ignore_content_length_when_chunked() {
test::set_handler("/ignore_content_length_when_chunked", |_req, _url| {
test::make_response(
200,
"OK",
vec!["Content-Length: 4", "transfer-encoding: chunked"],
"3\r\nhel\r\nb\r\nlo world!!!\r\n0\r\n\r\n".to_string().into_bytes(),
"3\r\nhel\r\nb\r\nlo world!!!\r\n0\r\n\r\n"
.to_string()
.into_bytes(),
)
});
let resp = get("test://host/ignore_content_length_when_chunked").call();
@@ -57,4 +59,4 @@ fn content_length_limited() {
let mut text = String::new();
reader.read_to_string(&mut text).unwrap();
assert_eq!(text, "hello world!!!");
}
}

View File

@@ -7,8 +7,7 @@ fn content_length_on_str() {
test::set_handler("/content_length_on_str", |_req, _url| {
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/content_length_on_str")
.send_string("Hello World!!!");
let resp = post("test://host/content_length_on_str").send_string("Hello World!!!");
let vec = resp.to_write_vec();
let s = String::from_utf8_lossy(&vec);
assert!(s.contains("\r\nContent-Length: 14\r\n"));
@@ -19,7 +18,7 @@ fn user_set_content_length_on_str() {
test::set_handler("/user_set_content_length_on_str", |_req, _url| {
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/user_set_content_length_on_str")
let resp = post("test://host/user_set_content_length_on_str")
.set("Content-Length", "12345")
.send_string("Hello World!!!");
let vec = resp.to_write_vec();
@@ -33,9 +32,11 @@ fn content_length_on_json() {
test::make_response(200, "OK", vec![], vec![])
});
let mut json = SerdeMap::new();
json.insert("Hello".to_string(), SerdeValue::String("World!!!".to_string()));
let resp = get("test://host/content_length_on_json")
.send_json(SerdeValue::Object(json));
json.insert(
"Hello".to_string(),
SerdeValue::String("World!!!".to_string()),
);
let resp = post("test://host/content_length_on_json").send_json(SerdeValue::Object(json));
let vec = resp.to_write_vec();
let s = String::from_utf8_lossy(&vec);
assert!(s.contains("\r\nContent-Length: 20\r\n"));
@@ -53,4 +54,4 @@ fn content_length_and_chunked() {
let s = String::from_utf8_lossy(&vec);
assert!(s.contains("Transfer-Encoding: chunked\r\n"));
assert!(!s.contains("\r\nContent-Length:\r\n"));
}
}

View File

@@ -3,10 +3,10 @@ use agent::Stream;
use error::Error;
use header::Header;
use std::collections::HashMap;
use std::io::Cursor;
use std::io::Write;
use std::sync::{Arc, Mutex};
use url::Url;
use std::io::Cursor;
mod agent_test;
mod auth;

View File

@@ -7,8 +7,7 @@ fn no_query_string() {
test::set_handler("/no_query_string", |_req, _url| {
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/no_query_string")
.call();
let resp = get("test://host/no_query_string").call();
let vec = resp.to_write_vec();
let s = String::from_utf8_lossy(&vec);
assert!(s.contains("GET /no_query_string HTTP/1.1"))

View File

@@ -35,10 +35,10 @@ fn repeat_x_header() {
test::set_handler("/repeat_x_header", |req, _url| {
assert!(req.has("X-Forwarded-For"));
assert_eq!(req.header("X-Forwarded-For").unwrap(), "130.240.19.2");
assert_eq!(req.all("X-Forwarded-For"), vec![
"130.240.19.2",
"130.240.19.3",
]);
assert_eq!(
req.all("X-Forwarded-For"),
vec!["130.240.19.2", "130.240.19.3"]
);
test::make_response(200, "OK", vec![], vec![])
});
let resp = get("test://host/repeat_x_header")