Skip to content

Commit d9216a0

Browse files
author
sin471
authored
Merge branch 'kenkoooo:master' into ahc_classification
2 parents d251421 + 5048ab1 commit d9216a0

13 files changed

+2120
-2481
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ async fn test_ac_ranking() {
2121
.await
2222
.unwrap();
2323

24-
let mut app = test::init_service(
24+
let app = test::init_service(
2525
App::new()
26-
.app_data(web::Data::new(pg_pool.clone()))
26+
.app_data(web::Data::new(pg_pool))
2727
.configure(config_services),
2828
)
2929
.await;
3030

3131
let request = test::TestRequest::get()
3232
.uri("/atcoder-api/v3/ac_ranking?from=0&to=10")
3333
.to_request();
34-
let response = test::call_service(&mut app, request).await;
34+
let response = test::call_service(&app, request).await;
3535
assert_eq!(response.status(), StatusCode::OK);
3636
let response: Value = test::read_body_json(response).await;
3737
assert_eq!(
@@ -46,7 +46,7 @@ async fn test_ac_ranking() {
4646
let request = test::TestRequest::get()
4747
.uri("/atcoder-api/v3/ac_ranking?from=1&to=3")
4848
.to_request();
49-
let response = test::call_service(&mut app, request).await;
49+
let response = test::call_service(&app, request).await;
5050
assert_eq!(response.status(), StatusCode::OK);
5151
let response: Value = test::read_body_json(response).await;
5252
assert_eq!(
@@ -60,74 +60,74 @@ async fn test_ac_ranking() {
6060
let request = test::TestRequest::get()
6161
.uri("/atcoder-api/v3/ac_ranking?from=10&to=0")
6262
.to_request();
63-
let response = test::call_service(&mut app, request).await;
63+
let response = test::call_service(&app, request).await;
6464
assert_eq!(response.status(), StatusCode::OK);
6565
let response: Value = test::read_body_json(response).await;
6666
assert_eq!(response.as_array().unwrap().len(), 0);
6767

6868
let request = test::TestRequest::get()
6969
.uri("/atcoder-api/v3/ac_ranking?from=0&to=2000")
7070
.to_request();
71-
let response = test::call_service(&mut app, request).await;
71+
let response = test::call_service(&app, request).await;
7272
assert_eq!(response.status(), StatusCode::BAD_REQUEST);
7373

7474
let request = test::TestRequest::get()
7575
.uri("/atcoder-api/v3/ac_ranking?from=-1&to=10")
7676
.to_request();
77-
let response = test::call_service(&mut app, request).await;
77+
let response = test::call_service(&app, request).await;
7878
assert_eq!(response.status(), StatusCode::BAD_REQUEST);
7979

8080
let request = test::TestRequest::get()
8181
.uri("/atcoder-api/v3/user/ac_rank?user=u1")
8282
.to_request();
83-
let response = test::call_service(&mut app, request).await;
83+
let response = test::call_service(&app, request).await;
8484
assert_eq!(response.status(), StatusCode::OK);
8585
let response: Value = test::read_body_json(response).await;
8686
assert_eq!(response, json!({"count": 1, "rank": 1}));
8787

8888
let request = test::TestRequest::get()
8989
.uri("/atcoder-api/v3/user/ac_rank?user=u2")
9090
.to_request();
91-
let response = test::call_service(&mut app, request).await;
91+
let response = test::call_service(&app, request).await;
9292
assert_eq!(response.status(), StatusCode::OK);
9393
let response: Value = test::read_body_json(response).await;
9494
assert_eq!(response, json!({"count": 2, "rank": 0}));
9595

9696
let request = test::TestRequest::get()
9797
.uri("/atcoder-api/v3/user/ac_rank?user=u3")
9898
.to_request();
99-
let response = test::call_service(&mut app, request).await;
99+
let response = test::call_service(&app, request).await;
100100
assert_eq!(response.status(), StatusCode::OK);
101101
let response: Value = test::read_body_json(response).await;
102102
assert_eq!(response, json!({"count": 1, "rank": 1}));
103103

104104
let request = test::TestRequest::get()
105105
.uri("/atcoder-api/v3/user/ac_rank?user=U1")
106106
.to_request();
107-
let response = test::call_service(&mut app, request).await;
107+
let response = test::call_service(&app, request).await;
108108
assert_eq!(response.status(), StatusCode::OK);
109109
let response: Value = test::read_body_json(response).await;
110110
assert_eq!(response, json!({"count": 1, "rank": 1}));
111111

112112
let request = test::TestRequest::get()
113113
.uri("/atcoder-api/v3/user/ac_rank?user=U2")
114114
.to_request();
115-
let response = test::call_service(&mut app, request).await;
115+
let response = test::call_service(&app, request).await;
116116
assert_eq!(response.status(), StatusCode::OK);
117117
let response: Value = test::read_body_json(response).await;
118118
assert_eq!(response, json!({"count": 2, "rank": 0}));
119119

120120
let request = test::TestRequest::get()
121121
.uri("/atcoder-api/v3/user/ac_rank?user=U3")
122122
.to_request();
123-
let response = test::call_service(&mut app, request).await;
123+
let response = test::call_service(&app, request).await;
124124
assert_eq!(response.status(), StatusCode::OK);
125125
let response: Value = test::read_body_json(response).await;
126126
assert_eq!(response, json!({"count": 1, "rank": 1}));
127127

128128
let request = test::TestRequest::get()
129129
.uri("/atcoder-api/v3/user/ac_rank?user=does_not_exist")
130130
.to_request();
131-
let response = test::call_service(&mut app, request).await;
131+
let response = test::call_service(&app, request).await;
132132
assert_eq!(response.status(), StatusCode::NOT_FOUND);
133133
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ async fn insert_data_set2(conn: &PgPool) {
3434
#[actix_web::test]
3535
async fn test_language_count() {
3636
let conn = utils::initialize_and_connect_to_test_sql().await;
37-
let mut app = test::init_service(
37+
let app = test::init_service(
3838
App::new()
3939
.app_data(web::Data::new(conn.clone()))
4040
.configure(config_services),
@@ -45,7 +45,7 @@ async fn test_language_count() {
4545
let request = test::TestRequest::get()
4646
.uri("/atcoder-api/v3/language_list")
4747
.to_request();
48-
let response = test::call_service(&mut app, request).await;
48+
let response = test::call_service(&app, request).await;
4949
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
5050
let response: Value = test::read_body_json(response).await;
5151
assert_eq!(response, json!(["lang1", "lang2", "lang3"]));
@@ -54,7 +54,7 @@ async fn test_language_count() {
5454
let request = test::TestRequest::get()
5555
.uri("/atcoder-api/v3/language_list")
5656
.to_request();
57-
let response = test::call_service(&mut app, request).await;
57+
let response = test::call_service(&app, request).await;
5858
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
5959
let response: Value = test::read_body_json(response).await;
6060
assert_eq!(response, json!(["lang1", "lang2", "lang3", "lang4"]));

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ async fn prepare_data_set(conn: &PgPool) {
2626
async fn test_language_ranking() {
2727
let conn = utils::initialize_and_connect_to_test_sql().await;
2828
prepare_data_set(&conn).await;
29-
let mut app = test::init_service(
29+
let app = test::init_service(
3030
App::new()
31-
.app_data(web::Data::new(conn.clone()))
31+
.app_data(web::Data::new(conn))
3232
.configure(config_services),
3333
)
3434
.await;
3535

3636
let request = test::TestRequest::get()
3737
.uri("/atcoder-api/v3/language_ranking?from=1&to=3&language=lang2")
3838
.to_request();
39-
let response = test::call_service(&mut app, request).await;
39+
let response = test::call_service(&app, request).await;
4040
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
4141
let response: Value = test::read_body_json(response).await;
4242
assert_eq!(
@@ -50,7 +50,7 @@ async fn test_language_ranking() {
5050
let request = test::TestRequest::get()
5151
.uri("/atcoder-api/v3/language_ranking?from=0&to=1&language=lang2")
5252
.to_request();
53-
let response = test::call_service(&mut app, request).await;
53+
let response = test::call_service(&app, request).await;
5454
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
5555
let response: Value = test::read_body_json(response).await;
5656
assert_eq!(
@@ -63,43 +63,43 @@ async fn test_language_ranking() {
6363
let request = test::TestRequest::get()
6464
.uri("/atcoder-api/v3/language_ranking?from=10&to=20&language=lang2")
6565
.to_request();
66-
let response = test::call_service(&mut app, request).await;
66+
let response = test::call_service(&app, request).await;
6767
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
6868
let response: Value = test::read_body_json(response).await;
6969
assert!(response.as_array().unwrap().is_empty());
7070

7171
let request = test::TestRequest::get()
7272
.uri("/atcoder-api/v3/language_ranking?from=0&to=1&language=does_not_exist")
7373
.to_request();
74-
let response = test::call_service(&mut app, request).await;
74+
let response = test::call_service(&app, request).await;
7575
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
7676
let response: Value = test::read_body_json(response).await;
7777
assert!(response.as_array().unwrap().is_empty());
7878

7979
let request = test::TestRequest::get()
8080
.uri("/atcoder-api/v3/language_ranking?from=0&to=2000&language=lang2")
8181
.to_request();
82-
let response = test::call_service(&mut app, request).await;
82+
let response = test::call_service(&app, request).await;
8383
assert_eq!(response.status(), 400);
8484

8585
let request = test::TestRequest::get()
8686
.uri("/atcoder-api/v3/language_ranking?from=1&to=0&language=lang2")
8787
.to_request();
88-
let response = test::call_service(&mut app, request).await;
88+
let response = test::call_service(&app, request).await;
8989
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
9090
let response: Value = test::read_body_json(response).await;
9191
assert!(response.as_array().unwrap().is_empty());
9292

9393
let request = test::TestRequest::get()
9494
.uri("/atcoder-api/v3/language_ranking?from=-1&to=0&language=lang2")
9595
.to_request();
96-
let response = test::call_service(&mut app, request).await;
96+
let response = test::call_service(&app, request).await;
9797
assert_eq!(response.status(), 400);
9898

9999
let request = test::TestRequest::get()
100100
.uri("/atcoder-api/v3/user/language_rank?user=user1")
101101
.to_request();
102-
let response = test::call_service(&mut app, request).await;
102+
let response = test::call_service(&app, request).await;
103103
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
104104
let response: Value = test::read_body_json(response).await;
105105
assert_eq!(
@@ -126,7 +126,7 @@ async fn test_language_ranking() {
126126
let request = test::TestRequest::get()
127127
.uri("/atcoder-api/v3/user/language_rank?user=user2")
128128
.to_request();
129-
let response = test::call_service(&mut app, request).await;
129+
let response = test::call_service(&app, request).await;
130130
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
131131
let response: Value = test::read_body_json(response).await;
132132
assert_eq!(
@@ -148,7 +148,7 @@ async fn test_language_ranking() {
148148
let request = test::TestRequest::get()
149149
.uri("/atcoder-api/v3/user/language_rank?user=user3")
150150
.to_request();
151-
let response = test::call_service(&mut app, request).await;
151+
let response = test::call_service(&app, request).await;
152152
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
153153
let response: Value = test::read_body_json(response).await;
154154
assert_eq!(
@@ -170,14 +170,14 @@ async fn test_language_ranking() {
170170
let request = test::TestRequest::get()
171171
.uri("/atcoder-api/v3/user/language_rank?user=does_not_exist")
172172
.to_request();
173-
let response = test::call_service(&mut app, request).await;
173+
let response = test::call_service(&app, request).await;
174174
assert_eq!(response.status(), actix_web::http::StatusCode::OK);
175175
let response: Value = test::read_body_json(response).await;
176176
assert_eq!(response, json!([]));
177177

178178
let request = test::TestRequest::get()
179179
.uri("/atcoder-api/v3/user/language_rank?bad=request")
180180
.to_request();
181-
let response = test::call_service(&mut app, request).await;
181+
let response = test::call_service(&app, request).await;
182182
assert_eq!(response.status(), 400);
183183
}

0 commit comments

Comments
 (0)