actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 06:39:22 +02:00
Code Issues Releases Wiki Activity

update tests

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-29 18:51:07 -07:00
parent 3a954298d7
commit 193f8fb2d9
7 changed files with 74 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actix-http/Cargo.toml
View File

@ -96,8 +96,9 @@ openssl = { version="0.10", optional = true }
[dev-dependencies]
actix-rt = "0.2.2"
actix-server = { version = "0.4.0", features=["ssl"] }
actix-server = { version = "0.4.1", features=["ssl"] }
actix-connect = { version = "0.1.0", features=["ssl"] }
#actix-http-test = { version = "0.1.0-alpha.1", features=["ssl"] }
actix-http-test = { path = "../test-server", features=["ssl"] }
env_logger = "0.6"

8
actix-http/tests/test_client.rs
View File

@ -52,18 +52,18 @@ fn test_h1_v2() {
assert!(response.status().is_success());
let request = srv.get().header("x-test", "111").send();
let mut response = srv.block_on(request).unwrap();
let response = srv.block_on(request).unwrap();
assert!(response.status().is_success());
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
let mut response = srv.block_on(srv.post().send()).unwrap();
let response = srv.block_on(srv.post().send()).unwrap();
assert!(response.status().is_success());
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
}

75
actix-http/tests/test_server.rs
View File

@ -13,8 +13,7 @@ use futures::stream::{once, Stream};
use actix_http::body::Body;
use actix_http::error::PayloadError;
use actix_http::{
body, error, http, http::header, Error, HttpMessage, HttpService, KeepAlive,
Request, Response,
body, error, http, http::header, Error, HttpService, KeepAlive, Request, Response,
};
fn load_body<S>(stream: S) -> impl Future<Item = BytesMut, Error = PayloadError>
@ -145,10 +144,10 @@ fn test_h2_body() -> std::io::Result<()> {
)
});
let mut response = srv.block_on(srv.sget().send_body(data.clone())).unwrap();
let response = srv.block_on(srv.sget().send_body(data.clone())).unwrap();
assert!(response.status().is_success());
let body = srv.block_on(load_body(response.take_payload())).unwrap();
let body = srv.load_body(response).unwrap();
assert_eq!(&body, data.as_bytes());
Ok(())
}
@ -436,11 +435,11 @@ fn test_h1_headers() {
})
});
let mut response = srv.block_on(srv.get().send()).unwrap();
let response = srv.block_on(srv.get().send()).unwrap();
assert!(response.status().is_success());
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from(data2));
}
@ -480,11 +479,11 @@ fn test_h2_headers() {
}).map_err(|_| ()))
});
let mut response = srv.block_on(srv.sget().send()).unwrap();
let response = srv.block_on(srv.sget().send()).unwrap();
assert!(response.status().is_success());
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from(data2));
}
@ -516,11 +515,11 @@ fn test_h1_body() {
HttpService::build().h1(|_| future::ok::<_, ()>(Response::Ok().body(STR)))
});
let mut response = srv.block_on(srv.get().send()).unwrap();
let response = srv.block_on(srv.get().send()).unwrap();
assert!(response.status().is_success());
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
}
@ -538,11 +537,11 @@ fn test_h2_body2() {
)
});
let mut response = srv.block_on(srv.sget().send()).unwrap();
let response = srv.block_on(srv.sget().send()).unwrap();
assert!(response.status().is_success());
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
}
@ -552,7 +551,7 @@ fn test_h1_head_empty() {
HttpService::build().h1(|_| ok::<_, ()>(Response::Ok().body(STR)))
});
let mut response = srv.block_on(srv.head().send()).unwrap();
let response = srv.block_on(srv.head().send()).unwrap();
assert!(response.status().is_success());
{
@ -564,7 +563,7 @@ fn test_h1_head_empty() {
}
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
}
@ -582,7 +581,7 @@ fn test_h2_head_empty() {
)
});
let mut response = srv.block_on(srv.shead().send()).unwrap();
let response = srv.block_on(srv.shead().send()).unwrap();
assert!(response.status().is_success());
assert_eq!(response.version(), http::Version::HTTP_2);
@ -595,7 +594,7 @@ fn test_h2_head_empty() {
}
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
}
@ -607,7 +606,7 @@ fn test_h1_head_binary() {
})
});
let mut response = srv.block_on(srv.head().send()).unwrap();
let response = srv.block_on(srv.head().send()).unwrap();
assert!(response.status().is_success());
{
@ -619,7 +618,7 @@ fn test_h1_head_binary() {
}
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
}
@ -641,7 +640,7 @@ fn test_h2_head_binary() {
)
});
let mut response = srv.block_on(srv.shead().send()).unwrap();
let response = srv.block_on(srv.shead().send()).unwrap();
assert!(response.status().is_success());
{
@ -653,7 +652,7 @@ fn test_h2_head_binary() {
}
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
}
@ -713,11 +712,11 @@ fn test_h1_body_length() {
})
});
let mut response = srv.block_on(srv.get().send()).unwrap();
let response = srv.block_on(srv.get().send()).unwrap();
assert!(response.status().is_success());
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
}
@ -740,11 +739,11 @@ fn test_h2_body_length() {
)
});
let mut response = srv.block_on(srv.sget().send()).unwrap();
let response = srv.block_on(srv.sget().send()).unwrap();
assert!(response.status().is_success());
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
}
@ -761,7 +760,7 @@ fn test_h1_body_chunked_explicit() {
})
});
let mut response = srv.block_on(srv.get().send()).unwrap();
let response = srv.block_on(srv.get().send()).unwrap();
assert!(response.status().is_success());
assert_eq!(
response
@ -774,7 +773,7 @@ fn test_h1_body_chunked_explicit() {
);
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
// decode
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
@ -802,12 +801,12 @@ fn test_h2_body_chunked_explicit() {
)
});
let mut response = srv.block_on(srv.sget().send()).unwrap();
let response = srv.block_on(srv.sget().send()).unwrap();
assert!(response.status().is_success());
assert!(!response.headers().contains_key(header::TRANSFER_ENCODING));
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
// decode
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
@ -822,7 +821,7 @@ fn test_h1_body_chunked_implicit() {
})
});
let mut response = srv.block_on(srv.get().send()).unwrap();
let response = srv.block_on(srv.get().send()).unwrap();
assert!(response.status().is_success());
assert_eq!(
response
@ -835,7 +834,7 @@ fn test_h1_body_chunked_implicit() {
);
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert_eq!(bytes, Bytes::from_static(STR.as_ref()));
}
@ -854,11 +853,11 @@ fn test_h1_response_http_error_handling() {
}))
});
let mut response = srv.block_on(srv.get().send()).unwrap();
let response = srv.block_on(srv.get().send()).unwrap();
assert_eq!(response.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
}
@ -886,11 +885,11 @@ fn test_h2_response_http_error_handling() {
)
});
let mut response = srv.block_on(srv.sget().send()).unwrap();
let response = srv.block_on(srv.sget().send()).unwrap();
assert_eq!(response.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
}
@ -901,11 +900,11 @@ fn test_h1_service_error() {
.h1(|_| Err::<Response, Error>(error::ErrorBadRequest("error")))
});
let mut response = srv.block_on(srv.get().send()).unwrap();
let response = srv.block_on(srv.get().send()).unwrap();
assert_eq!(response.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
}
@ -924,10 +923,10 @@ fn test_h2_service_error() {
)
});
let mut response = srv.block_on(srv.sget().send()).unwrap();
let response = srv.block_on(srv.sget().send()).unwrap();
assert_eq!(response.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
// read response
let bytes = srv.block_on(load_body(response.take_payload())).unwrap();
let bytes = srv.load_body(response).unwrap();
assert!(bytes.is_empty());
}