berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Update the tests

This commit is contained in:
Omid Rad 2020-05-13 20:51:49 +02:00
parent ccfbe3983e
commit 884e324789
3 changed files with 48 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -111,7 +111,6 @@ serde_derive = "1.0"
brotli2 = "0.3.2" brotli2 = "0.3.2"
flate2 = "1.0.13" flate2 = "1.0.13"
criterion = "0.3" criterion = "0.3"
actix-files = "0.2.1"
[profile.release] [profile.release]
lto = true lto = true

95
actix-files/src/lib.rs
View File

@ -952,69 +952,68 @@ mod tests {
#[actix_rt::test] #[actix_rt::test]
async fn test_named_file_content_range_headers() { async fn test_named_file_content_range_headers() {
let mut srv = test::init_service( let srv = test::start(|| {
App::new().service(Files::new("/test", ".").index_file("tests/test.binary")), App::new().service(Files::new("/", ".").index_file("tests/test.binary"))
) });
.await;
// Valid range header // Valid range header
let request = TestRequest::get() let response = srv
.uri("/t%65st/tests/test.binary") .get("/")
.header(header::RANGE, "bytes=10-20") .header(header::RANGE, "bytes=10-20")
.to_request(); .send()
.await
let response = test::call_service(&mut srv, request).await;
let contentrange = response
.headers()
.get(header::CONTENT_RANGE)
.unwrap()
.to_str()
.unwrap(); .unwrap();
let content_range = response.headers().get(header::CONTENT_RANGE).unwrap();
assert_eq!(contentrange, "bytes 10-20/100"); assert_eq!(content_range.to_str().unwrap(), "bytes 10-20/100");
// Invalid range header // Invalid range header
let request = TestRequest::get() let response = srv
.uri("/t%65st/tests/test.binary") .get("/")
.header(header::RANGE, "bytes=10-5") .header(header::RANGE, "bytes=10-5")
.to_request(); .send()
let response = test::call_service(&mut srv, request).await; .await
let contentrange = response
.headers()
.get(header::CONTENT_RANGE)
.unwrap()
.to_str()
.unwrap(); .unwrap();
let content_range = response.headers().get(header::CONTENT_RANGE).unwrap();
assert_eq!(contentrange, "bytes */100"); assert_eq!(content_range.to_str().unwrap(), "bytes */100");
} }
#[actix_rt::test] #[actix_rt::test]
async fn test_named_file_content_length_headers() { async fn test_named_file_content_length_headers() {
let mut srv = test::init_service( let srv = test::start(|| {
App::new().service(Files::new("test", ".").index_file("tests/test.binary")), App::new().service(Files::new("/", ".").index_file("tests/test.binary"))
) });
.await;
// chunked // Valid range header
let request = TestRequest::get() let response = srv
.uri("/t%65st/tests/test.binary") .head("/")
.to_request(); .header(header::RANGE, "bytes=10-20")
let response = test::call_service(&mut srv, request).await; .send()
.await
.unwrap();
let content_length = response.headers().get(header::CONTENT_LENGTH).unwrap();
assert_eq!(content_length.to_str().unwrap(), "11");
// with enabled compression // Valid range header, starting from 0
// { let response = srv
// let te = response .head("/")
// .headers() .header(header::RANGE, "bytes=0-20")
// .get(header::TRANSFER_ENCODING) .send()
// .unwrap() .await
// .to_str() .unwrap();
// .unwrap(); let content_length = response.headers().get(header::CONTENT_LENGTH).unwrap();
// assert_eq!(te, "chunked"); assert_eq!(content_length.to_str().unwrap(), "21");
// }
let bytes = test::read_body(response).await; // Without range header
let mut response = srv.get("/").send().await.unwrap();
let content_length = response.headers().get(header::CONTENT_LENGTH).unwrap();
assert_eq!(content_length.to_str().unwrap(), "100");
// Should be no transfer-encoding
let transfer_encoding = response.headers().get(header::TRANSFER_ENCODING);
assert!(transfer_encoding.is_none());
// Check file contents
let bytes = response.body().await.unwrap();
let data = Bytes::from(fs::read("tests/test.binary").unwrap()); let data = Bytes::from(fs::read("tests/test.binary").unwrap());
assert_eq!(bytes, data); assert_eq!(bytes, data);
} }

63
tests/test_server.rs
View File

@ -3,7 +3,7 @@ use std::pin::Pin;
use std::task::{Context, Poll}; use std::task::{Context, Poll};
use actix_http::http::header::{ use actix_http::http::header::{
self, ContentEncoding, ACCEPT_ENCODING, CONTENT_ENCODING, CONTENT_LENGTH, ContentEncoding, ACCEPT_ENCODING, CONTENT_ENCODING, CONTENT_LENGTH,
TRANSFER_ENCODING, TRANSFER_ENCODING,
}; };
use brotli2::write::{BrotliDecoder, BrotliEncoder}; use brotli2::write::{BrotliDecoder, BrotliEncoder};
@ -17,7 +17,6 @@ use rand::{distributions::Alphanumeric, Rng};
use actix_web::dev::BodyEncoding; use actix_web::dev::BodyEncoding;
use actix_web::middleware::Compress; use actix_web::middleware::Compress;
use actix_web::{dev, test, web, App, Error, HttpResponse}; use actix_web::{dev, test, web, App, Error, HttpResponse};
use actix_files::Files;
const STR: &str = "Hello World Hello World Hello World Hello World Hello World \ const STR: &str = "Hello World Hello World Hello World Hello World Hello World \
Hello World Hello World Hello World Hello World Hello World \ Hello World Hello World Hello World Hello World Hello World \
@ -890,63 +889,3 @@ async fn test_slow_request() {
// let _ = stream.read_to_string(&mut data); // let _ = stream.read_to_string(&mut data);
// assert!(data.is_empty()); // assert!(data.is_empty());
// } // }
#[actix_rt::test]
async fn test_files_content_length_headers() {
let srv = test::start_with(test::config().h1(), || {
App::new().service(
Files::new("/", ".").index_file("actix-files/tests/test.binary")
)
});
let response = srv
.head("/")
.send().await.unwrap();
let contentlength = response
.headers()
.get(CONTENT_LENGTH)
.unwrap()
.to_str()
.unwrap();
assert_eq!(contentlength, "100");
let response = srv
.head("/")
.header(header::RANGE, "bytes=10-20")
.send().await.unwrap();
let contentlength = response
.headers()
.get(CONTENT_LENGTH)
.unwrap()
.to_str()
.unwrap();
assert_eq!(contentlength, "11");
let response = srv
.head("/")
.header(header::RANGE, "bytes=0-20")
.send().await.unwrap();
let contentlength = response
.headers()
.get(CONTENT_LENGTH)
.unwrap()
.to_str()
.unwrap();
assert_eq!(contentlength, "21");
let response = srv
.head("/")
.header(header::RANGE, "bytes=20-0")
.send().await.unwrap();
let contentlength = response
.headers()
.get(CONTENT_LENGTH)
.unwrap()
.to_str()
.unwrap();
assert_eq!(contentlength, "0");
}