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 actix api

Browse Source
This commit is contained in:
Nikolay Kim
2018-06-13 23:37:19 -07:00
parent c8528e8920
commit 8261cf437d
10 changed files with 100 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/test_handlers.rs
View File

@ -105,9 +105,8 @@ struct FormData {
fn test_form_extractor() {
let mut srv = test::TestServer::new(|app| {
app.resource("/{username}/index.html", |r| {
r.route().with(|form: Form<FormData>| {
format!("{}", form.username)
})
r.route()
.with(|form: Form<FormData>| format!("{}", form.username))
});
});
@ -115,7 +114,9 @@ fn test_form_extractor() {
let request = srv
.post()
.uri(srv.url("/test1/index.html"))
.form(FormData{username: "test".to_string()})
.form(FormData {
username: "test".to_string(),
})
.unwrap();
let response = srv.execute(request.send()).unwrap();
assert!(response.status().is_success());
@ -129,12 +130,14 @@ fn test_form_extractor() {
fn test_form_extractor2() {
let mut srv = test::TestServer::new(|app| {
app.resource("/{username}/index.html", |r| {
r.route().with(|form: Form<FormData>| {
format!("{}", form.username)
}).error_handler(|err, res| {
error::InternalError::from_response(
err, HttpResponse::Conflict().finish()).into()
});
r.route()
.with(|form: Form<FormData>| format!("{}", form.username))
.error_handler(|err, _| {
error::InternalError::from_response(
err,
HttpResponse::Conflict().finish(),
).into()
});
});
});

12
tests/test_middleware.rs
View File

@ -839,7 +839,7 @@ fn test_middleware_chain_with_error() {
});
let request = srv.get().uri(srv.url("/test")).finish().unwrap();
let response = srv.execute(request.send()).unwrap();
srv.execute(request.send()).unwrap();
assert_eq!(num1.load(Ordering::Relaxed), 1);
assert_eq!(num2.load(Ordering::Relaxed), 1);
@ -869,7 +869,7 @@ fn test_middleware_async_chain_with_error() {
});
let request = srv.get().uri(srv.url("/test")).finish().unwrap();
let response = srv.execute(request.send()).unwrap();
srv.execute(request.send()).unwrap();
assert_eq!(num1.load(Ordering::Relaxed), 1);
assert_eq!(num2.load(Ordering::Relaxed), 1);
@ -901,7 +901,7 @@ fn test_scope_middleware_chain_with_error() {
});
let request = srv.get().uri(srv.url("/scope/test")).finish().unwrap();
let response = srv.execute(request.send()).unwrap();
srv.execute(request.send()).unwrap();
assert_eq!(num1.load(Ordering::Relaxed), 1);
assert_eq!(num2.load(Ordering::Relaxed), 1);
@ -933,7 +933,7 @@ fn test_scope_middleware_async_chain_with_error() {
});
let request = srv.get().uri(srv.url("/scope/test")).finish().unwrap();
let response = srv.execute(request.send()).unwrap();
srv.execute(request.send()).unwrap();
assert_eq!(num1.load(Ordering::Relaxed), 1);
assert_eq!(num2.load(Ordering::Relaxed), 1);
@ -964,7 +964,7 @@ fn test_resource_middleware_chain_with_error() {
});
let request = srv.get().uri(srv.url("/test")).finish().unwrap();
let response = srv.execute(request.send()).unwrap();
srv.execute(request.send()).unwrap();
assert_eq!(num1.load(Ordering::Relaxed), 1);
assert_eq!(num2.load(Ordering::Relaxed), 1);
@ -995,7 +995,7 @@ fn test_resource_middleware_async_chain_with_error() {
});
let request = srv.get().uri(srv.url("/test")).finish().unwrap();
let response = srv.execute(request.send()).unwrap();
srv.execute(request.send()).unwrap();
assert_eq!(num1.load(Ordering::Relaxed), 1);
assert_eq!(num2.load(Ordering::Relaxed), 1);

12
tests/test_server.rs
View File

@ -32,7 +32,7 @@ use tokio::executor::current_thread;
use tokio::runtime::current_thread::Runtime;
use tokio_tcp::TcpStream;
use actix::{msgs, Arbiter, System};
use actix::System;
use actix_web::*;
const STR: &str = "Hello World Hello World Hello World Hello World Hello World \
@ -74,10 +74,11 @@ fn test_start() {
let srv = srv.bind("127.0.0.1:0").unwrap();
let addr = srv.addrs()[0];
let srv_addr = srv.start();
let _ = tx.send((addr, srv_addr, Arbiter::system()));
let _ = tx.send((addr, srv_addr, System::current()));
});
});
let (addr, srv_addr, sys) = rx.recv().unwrap();
System::set_current(sys.clone());
let mut rt = Runtime::new().unwrap();
{
@ -110,7 +111,7 @@ fn test_start() {
assert!(response.status().is_success());
}
let _ = sys.send(msgs::SystemExit(0)).wait();
let _ = sys.stop();
}
#[test]
@ -130,10 +131,11 @@ fn test_shutdown() {
let srv = srv.bind("127.0.0.1:0").unwrap();
let addr = srv.addrs()[0];
let srv_addr = srv.shutdown_timeout(1).start();
let _ = tx.send((addr, srv_addr, Arbiter::system()));
let _ = tx.send((addr, srv_addr, System::current()));
});
});
let (addr, srv_addr, sys) = rx.recv().unwrap();
System::set_current(sys.clone());
let mut rt = Runtime::new().unwrap();
{
@ -148,7 +150,7 @@ fn test_shutdown() {
thread::sleep(time::Duration::from_millis(1000));
assert!(net::TcpStream::connect(addr).is_err());
let _ = sys.send(msgs::SystemExit(0)).wait();
let _ = sys.stop();
}
#[test]