actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-08-19 12:25:37 +02:00
Code Issues Releases Wiki Activity

simplify data factory future polling (#1473)

Browse Source 
Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>
This commit is contained in:
Rob Ede
2020-04-29 07:38:53 +01:00
committed by GitHub
parent b047413b39
commit bb17280f51
3 changed files with 113 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
src/test.rs
View File

@@ -78,6 +78,26 @@ pub fn default_service(
pub async fn init_service<R, S, B, E>(
app: R,
) -> impl Service<Request = Request, Response = ServiceResponse<B>, Error = E>
where
R: IntoServiceFactory<S>,
S: ServiceFactory<
Config = AppConfig,
Request = Request,
Response = ServiceResponse<B>,
Error = E,
>,
S::InitError: std::fmt::Debug,
{
try_init_service(app).await.expect("service initilization failed")
}
/// Fallible version of init_service that allows testing data factory errors.
pub(crate) async fn try_init_service<R, S, B, E>(
app: R,
) -> Result<
impl Service<Request = Request, Response = ServiceResponse<B>, Error = E>,
S::InitError,
>
where
R: IntoServiceFactory<S>,
S: ServiceFactory<
@@ -89,7 +109,7 @@ where
S::InitError: std::fmt::Debug,
{
let srv = app.into_factory();
srv.new_service(AppConfig::default()).await.unwrap()
srv.new_service(AppConfig::default()).await
}
/// Calls service and waits for response future completion.
@@ -580,7 +600,7 @@ impl TestRequest {
pub async fn send_request<S, B, E>(self, app: &mut S) -> S::Response
where
S: Service<Request = Request, Response = ServiceResponse<B>, Error = E>,
E: std::fmt::Debug
E: std::fmt::Debug,
{
let req = self.to_request();
call_service(app, req).await
@@ -1125,8 +1145,8 @@ mod tests {
#[actix_rt::test]
async fn test_response_json() {
let mut app = init_service(App::new().service(web::resource("/people").route(
web::post().to(|person: web::Json<Person>| {
async { HttpResponse::Ok().json(person.into_inner()) }
web::post().to(|person: web::Json<Person>| async {
HttpResponse::Ok().json(person.into_inner())
}),
)))
.await;
@@ -1146,8 +1166,8 @@ mod tests {
#[actix_rt::test]
async fn test_body_json() {
let mut app = init_service(App::new().service(web::resource("/people").route(
web::post().to(|person: web::Json<Person>| {
async { HttpResponse::Ok().json(person.into_inner()) }
web::post().to(|person: web::Json<Person>| async {
HttpResponse::Ok().json(person.into_inner())
}),
)))
.await;
@@ -1168,8 +1188,8 @@ mod tests {
#[actix_rt::test]
async fn test_request_response_form() {
let mut app = init_service(App::new().service(web::resource("/people").route(
web::post().to(|person: web::Form<Person>| {
async { HttpResponse::Ok().json(person.into_inner()) }
web::post().to(|person: web::Form<Person>| async {
HttpResponse::Ok().json(person.into_inner())
}),
)))
.await;
@@ -1194,8 +1214,8 @@ mod tests {
#[actix_rt::test]
async fn test_request_response_json() {
let mut app = init_service(App::new().service(web::resource("/people").route(
web::post().to(|person: web::Json<Person>| {
async { HttpResponse::Ok().json(person.into_inner()) }
web::post().to(|person: web::Json<Person>| async {
HttpResponse::Ok().json(person.into_inner())
}),
)))
.await;
@@ -1259,53 +1279,53 @@ mod tests {
assert!(res.status().is_success());
}
/*
/*
Comment out until actix decoupled of actix-http:
https://github.com/actix/actix/issues/321
Comment out until actix decoupled of actix-http:
https://github.com/actix/actix/issues/321
use futures::FutureExt;
use futures::FutureExt;
#[actix_rt::test]
async fn test_actor() {
use actix::Actor;
#[actix_rt::test]
async fn test_actor() {
use actix::Actor;
struct MyActor;
struct MyActor;
struct Num(usize);
impl actix::Message for Num {
type Result = usize;
}
impl actix::Actor for MyActor {
type Context = actix::Context<Self>;
}
impl actix::Handler<Num> for MyActor {
type Result = usize;
fn handle(&mut self, msg: Num, _: &mut Self::Context) -> Self::Result {
msg.0
struct Num(usize);
impl actix::Message for Num {
type Result = usize;
}
impl actix::Actor for MyActor {
type Context = actix::Context<Self>;
}
impl actix::Handler<Num> for MyActor {
type Result = usize;
fn handle(&mut self, msg: Num, _: &mut Self::Context) -> Self::Result {
msg.0
}
}
}
let mut app = init_service(App::new().service(web::resource("/index.html").to(
move || {
addr.send(Num(1)).map(|res| match res {
Ok(res) => {
if res == 1 {
Ok(HttpResponse::Ok())
} else {
Ok(HttpResponse::BadRequest())
let mut app = init_service(App::new().service(web::resource("/index.html").to(
move || {
addr.send(Num(1)).map(|res| match res {
Ok(res) => {
if res == 1 {
Ok(HttpResponse::Ok())
} else {
Ok(HttpResponse::BadRequest())
}
}
}
Err(err) => Err(err),
})
},
)))
.await;
Err(err) => Err(err),
})
},
)))
.await;
let req = TestRequest::post().uri("/index.html").to_request();
let res = app.call(req).await.unwrap();
assert!(res.status().is_success());
}
*/
let req = TestRequest::post().uri("/index.html").to_request();
let res = app.call(req).await.unwrap();
assert!(res.status().is_success());
}
*/
}