Skip to content

Commit 1b179b5

Browse files
nebocconebocco
committed
fix: rewrite tests with actix-web
1 parent d3e363b commit 1b179b5

11 files changed

+66
-70
lines changed

‎atcoder-problems-backend/Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎atcoder-problems-backend/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ atcoder-client = { path = "./atcoder-client" }
2727
tide = "0.16"
2828
cookie = "0.14"
2929
actix-web = "4.0.0-beta.18"
30-
actix-rt = "2.5.1"
3130
reqwest = { version = "0.11", features = ["json"] }
3231

3332
async-trait = "0.1"

‎atcoder-problems-backend/tests/test_server_e2e_ac_ranking.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use atcoder_problems_backend::server::{run_server, Authentication, GitHubUserRes
44
use rand::Rng;
55
use serde_json::{json, Value};
66
use sql_client::PgPool;
7-
use tokio::task;
87

98
pub mod utils;
109

@@ -40,16 +39,16 @@ async fn setup() -> u16 {
4039
rng.gen::<u16>() % 30000 + 30000
4140
}
4241

43-
#[tokio::test]
42+
#[actix_web::test]
4443
async fn test_ac_ranking() {
4544
let port = setup().await;
46-
let server = actix_rt::spawn(async move {
45+
let server = actix_web::rt::spawn(async move {
4746
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
4847
.await
4948
.unwrap();
5049
run_server(pg_pool, MockAuth, port).await.unwrap();
5150
});
52-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
51+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
5352

5453
let response = reqwest::get(url("/atcoder-api/v3/ac_ranking?from=0&to=10", port))
5554
.await

‎atcoder-problems-backend/tests/test_server_e2e_language_count.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use atcoder_problems_backend::server::{run_server, Authentication, GitHubUserRes
44
use rand::Rng;
55
use serde_json::{json, Value};
66
use sql_client::PgPool;
7-
use tokio::task;
87

98
pub mod utils;
109

@@ -57,16 +56,16 @@ async fn setup() -> (u16, PgPool) {
5756
(rng.gen::<u16>() % 30000 + 30000, conn)
5857
}
5958

60-
#[tokio::test]
59+
#[actix_web::test]
6160
async fn test_language_count() {
6261
let (port, conn) = setup().await;
63-
let server = actix_rt::spawn(async move {
62+
let server = actix_web::rt::spawn(async move {
6463
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
6564
.await
6665
.unwrap();
6766
run_server(pg_pool, MockAuth, port).await.unwrap();
6867
});
69-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
68+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
7069

7170
insert_data_set1(&conn).await;
7271
let response = reqwest::get(url("/atcoder-api/v3/language_list", port))

‎atcoder-problems-backend/tests/test_server_e2e_language_ranking.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ async fn setup() -> u16 {
4747
rng.gen::<u16>() % 30000 + 30000
4848
}
4949

50-
#[tokio::test]
50+
#[actix_web::test]
5151
async fn test_language_ranking() {
5252
let port = setup().await;
53-
let server = actix_rt::spawn(async move {
53+
let server = actix_web::rt::spawn(async move {
5454
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
5555
.await
5656
.unwrap();
5757
run_server(pg_pool, MockAuth, port).await.unwrap();
5858
});
59-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
59+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
6060

6161
let response = reqwest::get(url(
6262
"/atcoder-api/v3/language_ranking?from=1&to=3&language=lang2",

‎atcoder-problems-backend/tests/test_server_e2e_problem_list.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ async fn setup() -> u16 {
3939
rng.gen::<u16>() % 30000 + 30000
4040
}
4141

42-
#[tokio::test]
42+
#[actix_web::test]
4343
async fn test_list() {
4444
let port = setup().await;
45-
let server = actix_rt::spawn(async move {
45+
let server = actix_web::rt::spawn(async move {
4646
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
4747
.await
4848
.unwrap();
4949
run_server(pg_pool, MockAuth, port).await.unwrap();
5050
});
51-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
51+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
5252

5353
let client = reqwest::Client::builder()
5454
.redirect(reqwest::redirect::Policy::none())
@@ -195,16 +195,16 @@ async fn test_list() {
195195
server.abort();
196196
server.await.unwrap_err();
197197
}
198-
#[tokio::test]
198+
#[actix_web::test]
199199
async fn test_invalid_token() {
200200
let port = setup().await;
201-
let server = actix_rt::spawn(async move {
201+
let server = actix_web::rt::spawn(async move {
202202
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
203203
.await
204204
.unwrap();
205205
run_server(pg_pool, MockAuth, port).await.unwrap();
206206
});
207-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
207+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
208208

209209
let response = reqwest::Client::new()
210210
.get(url("/internal-api/list/my", port))
@@ -226,16 +226,16 @@ async fn test_invalid_token() {
226226
server.await.unwrap_err();
227227
}
228228

229-
#[tokio::test]
229+
#[actix_web::test]
230230
async fn test_list_item() {
231231
let port = setup().await;
232-
let server = actix_rt::spawn(async move {
232+
let server = actix_web::rt::spawn(async move {
233233
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
234234
.await
235235
.unwrap();
236236
run_server(pg_pool, MockAuth, port).await.unwrap();
237237
});
238-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
238+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
239239

240240
reqwest::get(url(
241241
&format!("/internal-api/authorize?code={}", VALID_CODE),
@@ -359,16 +359,16 @@ async fn test_list_item() {
359359
server.await.unwrap_err();
360360
}
361361

362-
#[tokio::test]
362+
#[actix_web::test]
363363
async fn test_list_delete() {
364364
let port = setup().await;
365-
let server = actix_rt::spawn(async move {
365+
let server = actix_web::rt::spawn(async move {
366366
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
367367
.await
368368
.unwrap();
369369
run_server(pg_pool, MockAuth, port).await.unwrap();
370370
});
371-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
371+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
372372

373373
reqwest::get(url(
374374
&format!("/internal-api/authorize?code={}", VALID_CODE),
@@ -433,16 +433,16 @@ async fn test_list_delete() {
433433
server.await.unwrap_err();
434434
}
435435

436-
#[tokio::test]
436+
#[actix_web::test]
437437
async fn test_register_twice() {
438438
let port = setup().await;
439-
let server = actix_rt::spawn(async move {
439+
let server = actix_web::rt::spawn(async move {
440440
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
441441
.await
442442
.unwrap();
443443
run_server(pg_pool, MockAuth, port).await.unwrap();
444444
});
445-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
445+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
446446

447447
let client = reqwest::Client::builder()
448448
.redirect(reqwest::redirect::Policy::none())

‎atcoder-problems-backend/tests/test_server_e2e_progress_reset.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ fn url(path: &str, port: u16) -> String {
3131
format!("http://localhost:{}{}", port, path)
3232
}
3333

34-
#[tokio::test]
34+
#[actix_web::test]
3535
async fn test_progress_reset() {
3636
let port = setup().await;
37-
let server = actix_rt::spawn(async move {
37+
let server = actix_web::rt::spawn(async move {
3838
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
3939
.await
4040
.unwrap();
4141
run_server(pg_pool, MockAuth, port).await.unwrap();
4242
});
43-
tokio::time::sleep(Duration::from_millis(1000)).await;
43+
actix_web::rt::time::sleep(Duration::from_millis(1000)).await;
4444

4545
let client = reqwest::Client::builder()
4646
.redirect(reqwest::redirect::Policy::none())

‎atcoder-problems-backend/tests/test_server_e2e_rated_point_sum_ranking.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ async fn setup() -> u16 {
3939
rng.gen::<u16>() % 3000 + 3000
4040
}
4141

42-
#[tokio::test]
42+
#[actix_web::test]
4343
async fn test_rated_point_sum_ranking() {
4444
let port = setup().await;
45-
let server = actix_rt::spawn(async move {
45+
let server = actix_web::rt::spawn(async move {
4646
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
4747
.await
4848
.unwrap();
4949
run_server(pg_pool, MockAuth, port).await.unwrap();
5050
});
51-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
51+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
5252
let response = reqwest::get(url(
5353
"/atcoder-api/v3/rated_point_sum_ranking?from=0&to=3",
5454
port,
@@ -141,16 +141,16 @@ async fn test_rated_point_sum_ranking() {
141141
server.await.unwrap_err();
142142
}
143143

144-
#[tokio::test]
144+
#[actix_web::test]
145145
async fn test_users_rated_point_sum_ranking() {
146146
let port = setup().await;
147-
let server = actix_rt::spawn(async move {
147+
let server = actix_web::rt::spawn(async move {
148148
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
149149
.await
150150
.unwrap();
151151
run_server(pg_pool, MockAuth, port).await.unwrap();
152152
});
153-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
153+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
154154

155155
let response = reqwest::get(url(
156156
"/atcoder-api/v3/user/rated_point_sum_rank?user=u2",

‎atcoder-problems-backend/tests/test_server_e2e_streak_ranking.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ async fn setup() -> u16 {
3939
rng.gen::<u16>() % 30000 + 30000
4040
}
4141

42-
#[tokio::test]
42+
#[actix_web::test]
4343
async fn test_streak_ranking() {
4444
let port = setup().await;
45-
let server = actix_rt::spawn(async move {
45+
let server = actix_web::rt::spawn(async move {
4646
let pg_pool = sql_client::initialize_pool(utils::get_sql_url_from_env())
4747
.await
4848
.unwrap();
4949
run_server(pg_pool, MockAuth, port).await.unwrap();
5050
});
51-
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
51+
actix_web::rt::time::sleep(std::time::Duration::from_millis(1000)).await;
5252

5353
// get_streak_ranking(from..to)
5454

0 commit comments

Comments
 (0)