1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-19 06:36:36 +00:00

allow to use application factory for test server

This commit is contained in:
Nikolay Kim 2017-12-26 16:47:55 -08:00
parent f6510161b5
commit d3b7d2d6b3
2 changed files with 39 additions and 2 deletions

View file

@ -8,7 +8,7 @@ use tokio_core::net::TcpListener;
use server::HttpServer;
use handler::Handler;
use channel::IntoHttpHandler;
use channel::{HttpHandler, IntoHttpHandler};
use middlewares::Middleware;
use application::{Application, HttpApplication};
@ -56,6 +56,36 @@ impl TestServer {
TestServer::with_state(||(), config)
}
/// Start new test server with application factory
pub fn with_factory<H, F, U, V>(factory: F) -> Self
where H: HttpHandler,
F: Sync + Send + 'static + Fn() -> U,
U: IntoIterator<Item=V> + 'static,
V: IntoHttpHandler<Handler=H>,
{
let (tx, rx) = mpsc::channel();
// run server in separate thread
let join = thread::spawn(move || {
let sys = System::new("actix-test-server");
let tcp = net::TcpListener::bind("0.0.0.0:0").unwrap();
let local_addr = tcp.local_addr().unwrap();
let tcp = TcpListener::from_listener(tcp, &local_addr, Arbiter::handle()).unwrap();
HttpServer::new(factory).start_incoming(tcp.incoming(), false);
tx.send((Arbiter::system(), local_addr)).unwrap();
let _ = sys.run();
});
let (sys, addr) = rx.recv().unwrap();
TestServer {
addr: addr,
thread: Some(join),
sys: sys,
}
}
/// Start new test server with custom application state
///
/// This methos accepts state factory and configuration method.

View file

@ -9,11 +9,18 @@ use std::sync::atomic::{AtomicUsize, Ordering};
use actix_web::*;
#[test]
fn test_serve() {
fn test_simple() {
let srv = test::TestServer::new(|app| app.handler(httpcodes::HTTPOk));
assert!(reqwest::get(&srv.url("/")).unwrap().status().is_success());
}
#[test]
fn test_application() {
let srv = test::TestServer::with_factory(
|| Application::new().resource("/", |r| r.h(httpcodes::HTTPOk)));
assert!(reqwest::get(&srv.url("/")).unwrap().status().is_success());
}
struct MiddlewareTest {
start: Arc<AtomicUsize>,
response: Arc<AtomicUsize>,