sql-clientで#[sqlx::test]を使うようにした

hotate29 · hotate29 · commit aadf9ca8acc5 · 2022-11-08T22:25:54.000+09:00
diff --git a/atcoder-problems-backend/sql-client/tests/test_accepted_count.rs b/atcoder-problems-backend/sql-client/tests/test_accepted_count.rs
@@ -1,11 +1,13 @@
 use sql_client::accepted_count::AcceptedCountClient;
 use sql_client::models::{Submission, UserProblemCount};
+use sql_client::PgPool;
 
 mod utils;
 
-#[tokio::test]
-async fn test_accepted_count() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_accepted_count(pool: PgPool) {
+    utils::initialize(&pool).await;
+
     let submissions = [
         Submission {
             id: 1,
diff --git a/atcoder-problems-backend/sql-client/tests/test_contest_problem.rs b/atcoder-problems-backend/sql-client/tests/test_contest_problem.rs
@@ -1,5 +1,6 @@
 use sql_client::contest_problem::ContestProblemClient;
 use sql_client::models::ContestProblem;
+use sql_client::PgPool;
 
 mod utils;
 
@@ -11,9 +12,10 @@ fn create_problem(id: i32) -> ContestProblem {
     }
 }
 
-#[tokio::test]
-async fn test_contest_problem() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_contest_problem(pool: PgPool) {
+    utils::initialize(&pool).await;
+
     assert!(pool.load_contest_problem().await.unwrap().is_empty());
 
     pool.insert_contest_problem(&[create_problem(1), create_problem(2)])
diff --git a/atcoder-problems-backend/sql-client/tests/test_language_count.rs b/atcoder-problems-backend/sql-client/tests/test_language_count.rs
@@ -1,11 +1,13 @@
 use sql_client::language_count::LanguageCountClient;
 use sql_client::models::{Submission, UserLanguageCount, UserLanguageCountRank, UserProblemCount};
+use sql_client::PgPool;
 
 mod utils;
 
-#[tokio::test]
-async fn test_language_count() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_language_count(pool: PgPool) {
+    utils::initialize(&pool).await;
+
     let mut submissions = vec![
         Submission {
             id: 1,
diff --git a/atcoder-problems-backend/sql-client/tests/test_problem_info.rs b/atcoder-problems-backend/sql-client/tests/test_problem_info.rs
@@ -32,9 +32,9 @@ async fn get_points(pool: &PgPool) -> Vec<(String, Option<f64>)> {
         .unwrap()
 }
 
-#[tokio::test]
-async fn test_update_problem_solver_count() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_update_problem_solver_count(pool: PgPool) {
+    utils::initialize(&pool).await;
 
     assert!(get_solver(&pool).await.is_empty());
 
@@ -79,12 +79,13 @@ async fn test_update_problem_solver_count() {
     assert_eq!(get_solver(&pool).await, vec![("problem".to_string(), 3)]);
 }
 
-#[tokio::test]
-async fn test_update_problem_points() {
+#[sqlx::test]
+async fn test_update_problem_points(pool: PgPool) {
     let contest_id = "contest";
     let problem_id = "problem";
 
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+    utils::initialize(&pool).await;
+
     pool.insert_contests(&[Contest {
         id: contest_id.to_string(),
         start_epoch_second: 1468670400,
diff --git a/atcoder-problems-backend/sql-client/tests/test_problem_list_manager.rs b/atcoder-problems-backend/sql-client/tests/test_problem_list_manager.rs
@@ -1,14 +1,18 @@
-use sql_client::internal::problem_list_manager::{ListItem, ProblemList, ProblemListManager};
+use sql_client::{
+    internal::problem_list_manager::{ListItem, ProblemList, ProblemListManager},
+    PgPool,
+};
 
 mod utils;
 
-#[tokio::test]
-async fn test_problem_list_manager() {
+#[sqlx::test]
+async fn test_problem_list_manager(pool: PgPool) {
     let internal_user_id = "user_id";
     let atcoder_user_id = "atcoder_id";
     let list_name = "list_name";
     let problem_id = "problem_id";
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+
+    utils::initialize(&pool).await;
     utils::setup_internal_user(&pool, internal_user_id, atcoder_user_id).await;
 
     assert!(
diff --git a/atcoder-problems-backend/sql-client/tests/test_problems_submissions.rs b/atcoder-problems-backend/sql-client/tests/test_problems_submissions.rs
@@ -36,23 +36,22 @@ async fn get_from(pool: &PgPool, table: Table) -> Vec<(String, String, i64)> {
         .unwrap()
 }
 
-async fn setup_contests() -> PgPool {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+async fn setup_contests(pool: &PgPool) {
+    utils::initialize(pool).await;
+
     sqlx::query(
         r"
         INSERT INTO contests (id, start_epoch_second, duration_second, title, rate_change) VALUES
         ('contest1', 1, 0, '', ''), ('contest2', 1, 0, '', '');
         ",
     )
-    .execute(&pool)
+    .execute(pool)
     .await
     .unwrap();
-
-    pool
 }
 
-#[tokio::test]
-async fn test_problem_info_aggrefator() {
+#[sqlx::test]
+async fn test_problem_info_aggrefator(pool: PgPool) {
     let ignored_submission = vec![Submission {
         id: 0,
         problem_id: "problem1".to_owned(),
@@ -85,7 +84,7 @@ async fn test_problem_info_aggrefator() {
     }];
 
     {
-        let pool = setup_contests().await;
+        setup_contests(&pool).await;
 
         pool.update_submissions(&ignored_submission).await.unwrap();
         pool.update_submissions_of_problems().await.unwrap();
@@ -110,7 +109,7 @@ async fn test_problem_info_aggrefator() {
     }
 
     {
-        let pool = setup_contests().await;
+        setup_contests(&pool).await;
 
         pool.update_submissions(&submissions2).await.unwrap();
         pool.update_submissions_of_problems().await.unwrap();
@@ -130,7 +129,7 @@ async fn test_problem_info_aggrefator() {
     }
 
     {
-        let pool = setup_contests().await;
+        setup_contests(&pool).await;
 
         pool.update_submissions(&submissions1).await.unwrap();
         pool.update_submissions_of_problems().await.unwrap();
@@ -150,7 +149,7 @@ async fn test_problem_info_aggrefator() {
     }
 
     {
-        let pool = setup_contests().await;
+        setup_contests(&pool).await;
 
         pool.update_submissions(&submissions2).await.unwrap();
         pool.update_submissions_of_problems().await.unwrap();
diff --git a/atcoder-problems-backend/sql-client/tests/test_progress_reset_manager.rs b/atcoder-problems-backend/sql-client/tests/test_progress_reset_manager.rs
@@ -1,16 +1,20 @@
-use sql_client::internal::progress_reset_manager::{
-    ProgressResetItem, ProgressResetList, ProgressResetManager,
+use sql_client::{
+    internal::progress_reset_manager::{
+        ProgressResetItem, ProgressResetList, ProgressResetManager,
+    },
+    PgPool,
 };
 
 mod utils;
 
-#[tokio::test]
-async fn test_progress_reset_manager() {
+#[sqlx::test]
+async fn test_progress_reset_manager(pool: PgPool) {
     let internal_user_id = "user_id";
     let atcoder_user_id = "atcoder_id";
     let problem_id = "problem_id";
     let reset_epoch_second = 42;
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+
+    utils::initialize(&pool).await;
     utils::setup_internal_user(&pool, internal_user_id, atcoder_user_id).await;
 
     let list = pool
diff --git a/atcoder-problems-backend/sql-client/tests/test_rated_point_sum.rs b/atcoder-problems-backend/sql-client/tests/test_rated_point_sum.rs
@@ -147,9 +147,9 @@ async fn setup_contest_problems(pool: &PgPool) {
     }
 }
 
-#[tokio::test]
-async fn test_update_rated_point_sum() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_update_rated_point_sum(pool: PgPool) {
+    utils::initialize(&pool).await;
 
     setup_contests(&pool).await;
     setup_contest_problems(&pool).await;
@@ -247,9 +247,9 @@ async fn test_update_rated_point_sum() {
     assert!(resp.is_err());
 }
 
-#[tokio::test]
-async fn test_load_rated_point_sum_in_range() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_load_rated_point_sum_in_range(pool: PgPool) {
+    utils::initialize(&pool).await;
 
     setup_contests(&pool).await;
     setup_contest_problems(&pool).await;
diff --git a/atcoder-problems-backend/sql-client/tests/test_simple_client.rs b/atcoder-problems-backend/sql-client/tests/test_simple_client.rs
@@ -1,11 +1,13 @@
 use sql_client::models::{Contest, Problem};
 use sql_client::simple_client::SimpleClient;
+use sql_client::PgPool;
 
 mod utils;
 
-#[tokio::test]
-async fn test_insert_contests() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_insert_contests(pool: PgPool) {
+    utils::initialize(&pool).await;
+
     assert!(pool.load_contests().await.unwrap().is_empty());
     pool.insert_contests(&[Contest {
         id: "contest1".to_string(),
@@ -31,9 +33,10 @@ async fn test_insert_contests() {
     .unwrap();
 }
 
-#[tokio::test]
-async fn test_insert_problems() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_insert_problems(pool: PgPool) {
+    utils::initialize(&pool).await;
+
     assert!(pool.load_problems().await.unwrap().is_empty());
     pool.insert_problems(&[Problem {
         id: "problem1".to_string(),
diff --git a/atcoder-problems-backend/sql-client/tests/test_streak.rs b/atcoder-problems-backend/sql-client/tests/test_streak.rs
@@ -1,12 +1,14 @@
 use sql_client::models::UserStreak;
 use sql_client::streak::StreakClient;
 use sql_client::submission_client::{SubmissionClient, SubmissionRequest};
+use sql_client::PgPool;
 
 mod utils;
 
-#[tokio::test]
-async fn test_streak_ranking() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_streak_ranking(pool: PgPool) {
+    utils::initialize(&pool).await;
+
     sqlx::query(
         r"
         INSERT INTO submissions (id, epoch_second, problem_id, contest_id, user_id, language, point, length, result) VALUES
diff --git a/atcoder-problems-backend/sql-client/tests/test_submission_client.rs b/atcoder-problems-backend/sql-client/tests/test_submission_client.rs
@@ -1,11 +1,13 @@
 use sql_client::models::Submission;
 use sql_client::submission_client::{SubmissionClient, SubmissionRequest};
+use sql_client::PgPool;
 
 mod utils;
 
-#[tokio::test]
-async fn test_submission_client() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_submission_client(pool: PgPool) {
+    utils::initialize(&pool).await;
+
     sqlx::query(
         r"
         INSERT INTO submissions
@@ -128,9 +130,10 @@ async fn test_submission_client() {
     assert_eq!(submissions.len(), 1);
 }
 
-#[tokio::test]
-async fn test_update_submissions() {
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+#[sqlx::test]
+async fn test_update_submissions(pool: PgPool) {
+    utils::initialize(&pool).await;
+
     pool.update_submissions(&[Submission {
         id: 0,
         user_id: "old_user_name".to_owned(),
diff --git a/atcoder-problems-backend/sql-client/tests/test_user_manager.rs b/atcoder-problems-backend/sql-client/tests/test_user_manager.rs
@@ -1,12 +1,15 @@
-use sql_client::internal::user_manager::{InternalUserInfo, UserManager};
+use sql_client::{
+    internal::user_manager::{InternalUserInfo, UserManager},
+    PgPool,
+};
 
 mod utils;
 
-#[tokio::test]
-async fn test_user_manager() {
+#[sqlx::test]
+async fn test_user_manager(pool: PgPool) {
     let internal_user_id = "user_id";
     let atcoder_user_id = "atcoder_id";
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+    utils::initialize(&pool).await;
 
     let get_result = pool.get_internal_user_info(internal_user_id).await;
     assert!(
diff --git a/atcoder-problems-backend/sql-client/tests/test_virtual_contest_manager.rs b/atcoder-problems-backend/sql-client/tests/test_virtual_contest_manager.rs
@@ -1,15 +1,19 @@
-use sql_client::internal::virtual_contest_manager::{
-    VirtualContestInfo, VirtualContestItem, VirtualContestManager, MAX_PROBLEM_NUM_PER_CONTEST,
+use sql_client::{
+    internal::virtual_contest_manager::{
+        VirtualContestInfo, VirtualContestItem, VirtualContestManager, MAX_PROBLEM_NUM_PER_CONTEST,
+    },
+    PgPool,
 };
 
 mod utils;
 
 const TIME_DELTA: i64 = 1000;
 
-#[tokio::test]
-async fn test_virtual_contest_manager() {
+#[sqlx::test]
+async fn test_virtual_contest_manager(pool: PgPool) {
     let now_second = 1597988723;
-    let pool = utils::initialize_and_connect_to_test_sql().await;
+    utils::initialize(&pool).await;
+
     let user_id = "user_id";
     let atcoder_id = "atcoder_id";
     utils::setup_internal_user(&pool, user_id, atcoder_id).await;

Original file line number	Diff line number	Diff line change
`@@ -36,23 +36,22 @@ async fn get_from(pool: &PgPool, table: Table) -> Vec<(String, String, i64)> {`
`36`	`36`	`.unwrap()`
`37`	`37`	`}`
`38`	`38`
`39`		`-async fn setup_contests() -> PgPool {`
`40`		`- let pool = utils::initialize_and_connect_to_test_sql().await;`
	`39`	`+async fn setup_contests(pool: &PgPool) {`
	`40`	`+ utils::initialize(pool).await;`
	`41`	`+`
`41`	`42`	`sqlx::query(`
`42`	`43`	`r"`
`43`	`44`	`INSERT INTO contests (id, start_epoch_second, duration_second, title, rate_change) VALUES`
`44`	`45`	`('contest1', 1, 0, '', ''), ('contest2', 1, 0, '', '');`
`45`	`46`	`",`
`46`	`47`	`)`
`47`		`- .execute(&pool)`
	`48`	`+ .execute(pool)`
`48`	`49`	`.await`
`49`	`50`	`.unwrap();`
`50`		`-`
`51`		`- pool`
`52`	`51`	`}`
`53`	`52`
`54`		`-#[tokio::test]`
`55`		`-async fn test_problem_info_aggrefator() {`
	`53`	`+#[sqlx::test]`
	`54`	`+async fn test_problem_info_aggrefator(pool: PgPool) {`
`56`	`55`	`let ignored_submission = vec![Submission {`
`57`	`56`	`id: 0,`
`58`	`57`	`problem_id: "problem1".to_owned(),`
`@@ -85,7 +84,7 @@ async fn test_problem_info_aggrefator() {`
`85`	`84`	`}];`
`86`	`85`
`87`	`86`	`{`
`88`		`- let pool = setup_contests().await;`
	`87`	`+ setup_contests(&pool).await;`
`89`	`88`
`90`	`89`	`pool.update_submissions(&ignored_submission).await.unwrap();`
`91`	`90`	`pool.update_submissions_of_problems().await.unwrap();`
`@@ -110,7 +109,7 @@ async fn test_problem_info_aggrefator() {`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`{`
`113`		`- let pool = setup_contests().await;`
	`112`	`+ setup_contests(&pool).await;`
`114`	`113`
`115`	`114`	`pool.update_submissions(&submissions2).await.unwrap();`
`116`	`115`	`pool.update_submissions_of_problems().await.unwrap();`
`@@ -130,7 +129,7 @@ async fn test_problem_info_aggrefator() {`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`{`
`133`		`- let pool = setup_contests().await;`
	`132`	`+ setup_contests(&pool).await;`
`134`	`133`
`135`	`134`	`pool.update_submissions(&submissions1).await.unwrap();`
`136`	`135`	`pool.update_submissions_of_problems().await.unwrap();`
`@@ -150,7 +149,7 @@ async fn test_problem_info_aggrefator() {`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`{`
`153`		`- let pool = setup_contests().await;`
	`152`	`+ setup_contests(&pool).await;`
`154`	`153`
`155`	`154`	`pool.update_submissions(&submissions2).await.unwrap();`
`156`	`155`	`pool.update_submissions_of_problems().await.unwrap();`