#[tokio::test]を使うようにした

# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
#
# Author:    hotate29 <[email protected]>
# Date:      Tue Apr 26 03:51:02 2022 +0900
#
# interactive rebase in progress; onto 58aed3e
# Last command done (1 command done):
#    edit 9c059a1 #[tokio::test]を使うようにした
# Next commands to do (5 remaining commands):
#    edit 332dd64 Clippyの怒りを鎮めた
#    pick c1bbf67 テストでinclude_str!()を使うようにした
# You are currently editing a commit while rebasing branch 'tweak' on '58aed3e8'.
#
# Changes to be committed:
#	modified:   atcoder-client/Cargo.toml
#	modified:   atcoder-client/src/atcoder/client.rs
#	modified:   src/crawler/fix_crawler.rs
#	modified:   src/crawler/recent_crawler.rs
#	modified:   src/crawler/whole_contest_crawler.rs
#
# Untracked files:
#	cargo-timing.html
#

# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
#
# Date:      Tue Apr 26 03:51:02 2022 +0900
#
# interactive rebase in progress; onto 58aed3e
# Last command done (1 command done):
#    edit 19cbf0fa #[tokio::test]を使うようにした
# Next commands to do (5 remaining commands):
#    edit 376fb599 Clippyの怒りを鎮めた
#    edit d3742fea テストでinclude_str!()を使うようにした
# You are currently editing a commit while rebasing branch 'tweak' on '58aed3e8'.
#
# Changes to be committed:
#	modified:   atcoder-client/Cargo.toml
#	modified:   atcoder-client/src/atcoder/client.rs
#	modified:   src/crawler/fix_crawler.rs
#	modified:   src/crawler/recent_crawler.rs
#	modified:   src/crawler/whole_contest_crawler.rs
#
# Untracked files:
#	cargo-timing.html
#

Author: hotate29

atcoder-problems-backend/atcoder-client/Cargo.toml

@@ -12,6 +12,8 @@ chrono = "0.4"
 regex = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.16", features = ["macros", "rt"] }
 anyhow = "1.0"
 log = "0.4"
+
+[dev-dependencies]
+tokio = { version = "1.16", default-features = false, features = ["macros"] }

atcoder-problems-backend/atcoder-client/src/atcoder/client.rs

@@ -89,51 +89,51 @@ impl AtCoderClient {
 mod tests {
     use super::*;
 
-    #[test]
-    fn test_fetch_contest_list() {
+    #[tokio::test]
+    async fn test_fetch_contest_list() {
         let client = AtCoderClient::default();
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let contests = rt
-            .block_on(client.fetch_atcoder_contests(ContestTypeSpecifier::Normal { page: 1 }))
+        let contests = client
+            .fetch_atcoder_contests(ContestTypeSpecifier::Normal { page: 1 })
+            .await
             .unwrap();
         assert_eq!(contests.len(), 50);
     }
 
-    #[test]
-    fn test_fetch_hidden_contest() {
+    #[tokio::test]
+    async fn test_fetch_hidden_contest() {
         let client = AtCoderClient::default();
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let contests = rt
-            .block_on(client.fetch_atcoder_contests(ContestTypeSpecifier::Hidden))
+        let contests = client
+            .fetch_atcoder_contests(ContestTypeSpecifier::Hidden)
+            .await
             .unwrap();
         assert!(!contests.is_empty());
     }
 
-    #[test]
-    fn test_fetch_problem_list() {
+    #[tokio::test]
+    async fn test_fetch_problem_list() {
         let client = AtCoderClient::default();
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let problems = rt.block_on(client.fetch_problem_list("abc107")).unwrap();
+        let problems = client.fetch_problem_list("abc107").await.unwrap();
         assert_eq!(problems.len(), 4);
     }
 
-    #[test]
-    fn test_fetch_submission_list() {
+    #[tokio::test]
+    async fn test_fetch_submission_list() {
         let client = AtCoderClient::default();
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let response = rt
-            .block_on(client.fetch_atcoder_submission_list("xmascon17", None))
+        let response = client
+            .fetch_atcoder_submission_list("xmascon17", None)
+            .await
             .unwrap();
         assert_eq!(response.submissions.len(), 20);
 
-        let response = rt
-            .block_on(client.fetch_atcoder_submission_list("xmascon17", Some(response.max_page)))
+        let response = client
+            .fetch_atcoder_submission_list("xmascon17", Some(response.max_page))
+            .await
             .unwrap();
         assert!(!response.submissions.is_empty());
 
-        let response = rt.block_on(
-            client.fetch_atcoder_submission_list("xmascon17", Some(response.max_page + 1)),
-        );
+        let response = client
+            .fetch_atcoder_submission_list("xmascon17", Some(response.max_page + 1))
+            .await;
         assert!(response.is_err());
     }
 }

atcoder-problems-backend/src/crawler/fix_crawler.rs

@@ -114,21 +114,20 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_fix_crawler_found() {
+    #[actix_web::test]
+    async fn test_fix_crawler_found() {
         let fetcher = MockFetcher(|_, _| {
             vec![Submission {
                 id: 50,
                 ..Default::default()
             }]
         });
         let crawler = FixCrawler::new(MockDB, fetcher, CURRENT_TIME);
-        let rt = actix_web::rt::Runtime::new().unwrap();
-        assert!(rt.block_on(crawler.crawl()).is_ok());
+        assert!(crawler.crawl().await.is_ok());
     }
 
-    #[test]
-    fn test_fix_crawler_all_old() {
+    #[actix_web::test]
+    async fn test_fix_crawler_all_old() {
         let fetcher = MockFetcher(|_, _| {
             vec![Submission {
                 id: 30,
@@ -137,7 +136,6 @@ mod tests {
         });
 
         let crawler = FixCrawler::new(MockDB, fetcher, CURRENT_TIME);
-        let rt = actix_web::rt::Runtime::new().unwrap();
-        assert!(rt.block_on(crawler.crawl()).is_ok());
+        assert!(crawler.crawl().await.is_ok());
     }
 }

atcoder-problems-backend/src/crawler/recent_crawler.rs

@@ -66,8 +66,8 @@ mod tests {
     use sql_client::submission_client::SubmissionRequest;
     use std::ops::Range;
 
-    #[test]
-    fn test_recent_crawler() {
+    #[actix_web::test]
+    async fn test_recent_crawler() {
         let fetcher = MockFetcher(|contest_id: &str, page: u32| {
             assert_eq!(contest_id, "contest");
             assert_eq!(page, 1);
@@ -129,7 +129,6 @@ mod tests {
         }
 
         let crawler = RecentCrawler::new(MockDB, fetcher);
-        let rt = actix_web::rt::Runtime::new().unwrap();
-        assert!(rt.block_on(crawler.crawl()).is_ok());
+        assert!(crawler.crawl().await.is_ok());
     }
 }

atcoder-problems-backend/src/crawler/whole_contest_crawler.rs

@@ -75,8 +75,8 @@ mod tests {
             unimplemented!()
         }
     }
-    #[test]
-    fn whole_contest_crawler() {
+    #[actix_web::test]
+    async fn whole_contest_crawler() {
         let fetcher = MockFetcher(|_, page| {
             if page == 1 {
                 vec![Submission {
@@ -87,7 +87,6 @@ mod tests {
             }
         });
         let crawler = WholeContestCrawler::new(MockDB, fetcher, "contest-id");
-        let rt = actix_web::rt::Runtime::new().unwrap();
-        assert!(rt.block_on(crawler.crawl()).is_ok());
+        assert!(crawler.crawl().await.is_ok());
     }
 }