change: replaced async_std::test with tokio::test

Author: nebocco

atcoder-problems-backend/tests/test_server_e2e_ac_ranking.rs

@@ -1,13 +1,10 @@
-// use async_std::future::ready;
-// use async_std::prelude::*;
-// use async_std::task;
-use tokio::task;
 use async_trait::async_trait;
 use atcoder_problems_backend::server::{run_server, Authentication, GitHubUserResponse};
 use rand::Rng;
 use serde_json::{json, Value};
 use sql_client::PgPool;
 use tide::Result;
+use tokio::task;
 
 pub mod utils;
 
@@ -157,11 +154,11 @@ async fn test_ac_ranking() {
     .unwrap();
     assert_eq!(response.status(), 404);
 
-    // server.race(ready(())).await;
-    // server.await.unwrap();
-    let ready = tokio::time::sleep(std::time::Duration::from_millis(1000));
-    tokio::select!{
-        _s = server => (),
-        _r = ready => (),
-    }
+    // let ready = tokio::time::sleep(std::time::Duration::from_millis(1000));
+    // tokio::select!{
+    //     _s = server => (),
+    //     _r = ready => (),
+    // }
+    server.abort();
+    server.await.unwrap_err();
 }

atcoder-problems-backend/tests/test_server_e2e_language_count.rs

@@ -1,12 +1,10 @@
-use async_std::future::ready;
-use async_std::prelude::*;
-use async_std::task;
 use async_trait::async_trait;
 use atcoder_problems_backend::server::{run_server, Authentication, GitHubUserResponse};
 use rand::Rng;
 use serde_json::{json, Value};
 use sql_client::PgPool;
 use tide::Result;
+use tokio::task;
 
 pub mod utils;
 
@@ -59,7 +57,7 @@ async fn setup() -> (u16, PgPool) {
     (rng.gen::<u16>() % 30000 + 30000, conn)
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_language_count() {
     let (port, conn) = setup().await;
     let server = task::spawn(async move {
@@ -68,7 +66,7 @@ async fn test_language_count() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
 
     insert_data_set1(&conn).await;
     let response = reqwest::get(url("/atcoder-api/v3/language_list", port))
@@ -88,5 +86,6 @@ async fn test_language_count() {
         .unwrap();
     assert_eq!(response, json!(["lang1", "lang2", "lang3", "lang4"]));
 
-    server.race(ready(())).await;
+    server.abort();
+    server.await.unwrap_err();
 }

atcoder-problems-backend/tests/test_server_e2e_language_ranking.rs

@@ -1,12 +1,10 @@
-use async_std::future::ready;
-use async_std::prelude::*;
-use async_std::task;
 use async_trait::async_trait;
 use atcoder_problems_backend::server::{run_server, Authentication, GitHubUserResponse};
 use rand::Rng;
 use serde_json::{json, Value};
 use sql_client::PgPool;
 use tide::Result;
+use tokio::task;
 
 pub mod utils;
 
@@ -50,7 +48,7 @@ async fn setup() -> u16 {
     rng.gen::<u16>() % 30000 + 30000
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_language_ranking() {
     let port = setup().await;
     let server = task::spawn(async move {
@@ -59,7 +57,7 @@ async fn test_language_ranking() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
 
     let response = reqwest::get(url(
         "/atcoder-api/v3/language_ranking?from=1&to=3&language=lang2",
@@ -230,5 +228,6 @@ async fn test_language_ranking() {
         .unwrap();
     assert_eq!(response.status(), 400);
 
-    server.race(ready(())).await;
+    server.abort();
+    server.await.unwrap_err();
 }

atcoder-problems-backend/tests/test_server_e2e_problem_list.rs

@@ -1,13 +1,10 @@
-use atcoder_problems_backend::server::{run_server, Authentication};
-
-use async_std::future::ready;
-use async_std::prelude::*;
-use async_std::task;
 use async_trait::async_trait;
-use atcoder_problems_backend::server::GitHubUserResponse;
+use atcoder_problems_backend::server::{run_server, Authentication, GitHubUserResponse};
 use rand::Rng;
+use reqwest::header::SET_COOKIE;
 use serde_json::{json, Value};
 use tide::Result;
+use tokio::task;
 
 pub mod utils;
 
@@ -43,7 +40,7 @@ async fn setup() -> u16 {
     rng.gen::<u16>() % 30000 + 30000
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_list() {
     let port = setup().await;
     let server = task::spawn(async move {
@@ -52,7 +49,7 @@ async fn test_list() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
 
     let response = reqwest::get(url(
         &format!("/internal-api/authorize?code={}", VALID_CODE),
@@ -62,7 +59,7 @@ async fn test_list() {
     .unwrap();
     // https://docs.rs/reqwest/latest/reqwest/struct.Response.html#method.cookies
     // これを使ったほうがいいかもしれない
-    let cookie = response.headers().get("set-cookie").unwrap();
+    let cookie = response.headers().get(SET_COOKIE).unwrap();
     let token = cookie
         .to_str()
         .unwrap()
@@ -189,9 +186,11 @@ async fn test_list() {
         .await
         .unwrap();
     assert_eq!(&response, "[]");
-    server.race(ready(())).await;
+
+    server.abort();
+    server.await.unwrap_err();
 }
-#[async_std::test]
+#[tokio::test]
 async fn test_invalid_token() {
     let port = setup().await;
     let server = task::spawn(async move {
@@ -200,7 +199,7 @@ async fn test_invalid_token() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
 
     let response = reqwest::Client::new()
         .get(url("/internal-api/list/my", port))
@@ -218,10 +217,11 @@ async fn test_invalid_token() {
         .unwrap();
     assert!(!response.status().is_success());
 
-    server.race(ready(())).await;
+    server.abort();
+    server.await.unwrap_err();
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_list_item() {
     let port = setup().await;
     let server = task::spawn(async move {
@@ -230,7 +230,7 @@ async fn test_list_item() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
 
     reqwest::get(url(
         &format!("/internal-api/authorize?code={}", VALID_CODE),
@@ -350,10 +350,11 @@ async fn test_list_item() {
         ])
     );
 
-    server.race(ready(())).await;
+    server.abort();
+    server.await.unwrap_err();
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_list_delete() {
     let port = setup().await;
     let server = task::spawn(async move {
@@ -362,7 +363,7 @@ async fn test_list_delete() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
 
     reqwest::get(url(
         &format!("/internal-api/authorize?code={}", VALID_CODE),
@@ -423,10 +424,11 @@ async fn test_list_delete() {
         .unwrap();
     assert!(list.as_array().unwrap().is_empty());
 
-    server.race(ready(())).await;
+    server.abort();
+    server.await.unwrap_err();
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_register_twice() {
     let port = setup().await;
     let server = task::spawn(async move {
@@ -435,7 +437,7 @@ async fn test_register_twice() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
 
     let response = reqwest::get(url(
         &format!("/internal-api/authorize?code={}", VALID_CODE),
@@ -451,6 +453,9 @@ async fn test_register_twice() {
     ))
     .await
     .unwrap();
+    println!("{:?}", &response);
     assert_eq!(response.status(), 302);
-    server.race(ready(())).await;
+
+    server.abort();
+    server.await.unwrap_err();
 }

atcoder-problems-backend/tests/test_server_e2e_progress_reset.rs

@@ -1,11 +1,10 @@
-use async_std::prelude::*;
-use async_std::task;
 use async_trait::async_trait;
 use atcoder_problems_backend::server::{run_server, Authentication, GitHubUserResponse};
 use rand::Rng;
 use serde_json::{json, Value};
 use std::time::Duration;
 use tide::Result;
+use tokio::task;
 
 pub mod utils;
 
@@ -32,16 +31,16 @@ fn url(path: &str, port: u16) -> String {
     format!("http://localhost:{}{}", port, path)
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_progress_reset() {
     let port = setup().await;
-    let server = async_std::task::spawn(async move {
+    let server = task::spawn(async move {
         let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
             .await
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(Duration::from_millis(1000)).await;
+    tokio::time::sleep(Duration::from_millis(1000)).await;
 
     let response = reqwest::get(url("/internal-api/authorize?code=a", port))
         .await
@@ -153,5 +152,6 @@ async fn test_progress_reset() {
         })
     );
 
-    server.race(async_std::future::ready(())).await;
+    server.abort();
+    server.await.unwrap_err();
 }

atcoder-problems-backend/tests/test_server_e2e_rated_point_sum_ranking.rs

@@ -1,13 +1,12 @@
-use async_std::future::ready;
-use async_std::prelude::*;
-use async_std::task;
 use async_trait::async_trait;
 use atcoder_problems_backend::server::{run_server, Authentication, GitHubUserResponse};
 use rand::Rng;
 use serde_json::{json, Value};
 use sql_client::PgPool;
 use tide::Result;
+use tokio::task;
 mod utils;
+
 #[derive(Clone)]
 struct MockAuth;
 #[async_trait]
@@ -40,7 +39,7 @@ async fn setup() -> u16 {
     rng.gen::<u16>() % 3000 + 3000
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_rated_point_sum_ranking() {
     let port = setup().await;
     let server = task::spawn(async move {
@@ -49,7 +48,7 @@ async fn test_rated_point_sum_ranking() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
     let response = reqwest::get(url(
         "/atcoder-api/v3/rated_point_sum_ranking?from=0&to=3",
         port,
@@ -138,10 +137,11 @@ async fn test_rated_point_sum_ranking() {
     .unwrap();
     assert_eq!(response.status(), 400);
 
-    server.race(ready(())).await;
+    server.abort();
+    server.await.unwrap_err();
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn test_users_rated_point_sum_ranking() {
     let port = setup().await;
     let server = task::spawn(async move {
@@ -150,7 +150,7 @@ async fn test_users_rated_point_sum_ranking() {
             .unwrap();
         run_server(pg_pool, MockAuth, port).await.unwrap();
     });
-    task::sleep(std::time::Duration::from_millis(1000)).await;
+    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
 
     let response = reqwest::get(url(
         "/atcoder-api/v3/user/rated_point_sum_rank?user=u2",
@@ -269,5 +269,6 @@ async fn test_users_rated_point_sum_ranking() {
 
     assert_eq!(response.status(), 404);
 
-    server.race(ready(())).await;
+    server.abort();
+    server.await.unwrap_err();
 }