Skip to content

Commit 2e0d632

Browse files
kenkooookenkoooo
committed
fix: test
1 parent 7ef7168 commit 2e0d632

File tree

2 files changed

+28
-29
lines changed

2 files changed

+28
-29
lines changed

‎atcoder-problems-backend/sql-client/src/language_count.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use crate::models::{Submission, UserLanguageCount, UserLanguageCountRank, UserPr
22
use crate::{PgPool, MAX_INSERT_ROWS};
33
use anyhow::Result;
44
use async_trait::async_trait;
5-
use regex::Regex;
65
use sqlx::postgres::PgRow;
76
use sqlx::Row;
87
use std::collections::{BTreeMap, BTreeSet};
@@ -211,14 +210,14 @@ fn simplify_language(lang: &str) -> String {
211210
}
212211
}
213212

214-
let simplified = Regex::new(r"\s*[\d(\-].*")
215-
.unwrap()
216-
.replace(lang, "")
217-
.to_string();
213+
let simplified = lang
214+
.chars()
215+
.take_while(|&c| !c.is_numeric() && c != '(' && c != '-')
216+
.collect::<String>();
218217

219218
match simplified.len() {
220-
0 => String::from("Unknown"),
221-
_ => simplified,
219+
0 => lang.to_string(),
220+
_ => simplified.trim().to_string(),
222221
}
223222
}
224223

@@ -253,6 +252,6 @@ mod tests {
253252
assert_eq!(simplify_language("Cython (0.29.16)"), "Cython");
254253
assert_eq!(simplify_language("Seed7 (Seed7 3.2.1)"), "Seed7");
255254

256-
assert_eq!(simplify_language("1234"), "Unknown");
255+
assert_eq!(simplify_language("1234"), "1234");
257256
}
258257
}

‎atcoder-problems-backend/sql-client/tests/test_language_count.rs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@ async fn test_language_count() {
1111
id: 1,
1212
problem_id: "problem1".to_owned(),
1313
user_id: "user1".to_owned(),
14-
language: "language1".to_owned(),
14+
language: "language x".to_owned(),
1515
..Default::default()
1616
},
1717
Submission {
1818
id: 2,
1919
problem_id: "problem2".to_owned(),
2020
user_id: "user1".to_owned(),
21-
language: "language1".to_owned(),
21+
language: "language x".to_owned(),
2222
..Default::default()
2323
},
2424
Submission {
2525
id: 3,
2626
problem_id: "problem1".to_owned(),
2727
user_id: "user1".to_owned(),
28-
language: "language1".to_owned(),
28+
language: "language x".to_owned(),
2929
..Default::default()
3030
},
3131
Submission {
3232
id: 4,
3333
problem_id: "problem1".to_owned(),
3434
user_id: "user1".to_owned(),
35-
language: "language2".to_owned(),
35+
language: "language y".to_owned(),
3636
..Default::default()
3737
},
3838
Submission {
3939
id: 5,
4040
problem_id: "problem1".to_owned(),
4141
user_id: "user2".to_owned(),
42-
language: "language1".to_owned(),
42+
language: "language x".to_owned(),
4343
..Default::default()
4444
},
4545
Submission {
@@ -65,17 +65,17 @@ async fn test_language_count() {
6565
vec![
6666
UserLanguageCount {
6767
user_id: "user1".to_owned(),
68-
simplified_language: "language1".to_owned(),
68+
simplified_language: "language x".to_owned(),
6969
problem_count: 2
7070
},
7171
UserLanguageCount {
7272
user_id: "user1".to_owned(),
73-
simplified_language: "language2".to_owned(),
73+
simplified_language: "language y".to_owned(),
7474
problem_count: 1
7575
},
7676
UserLanguageCount {
7777
user_id: "user2".to_owned(),
78-
simplified_language: "language1".to_owned(),
78+
simplified_language: "language x".to_owned(),
7979
problem_count: 1
8080
},
8181
UserLanguageCount {
@@ -106,17 +106,17 @@ async fn test_language_count() {
106106
vec![
107107
UserLanguageCount {
108108
user_id: "user1".to_owned(),
109-
simplified_language: "language1".to_owned(),
109+
simplified_language: "language x".to_owned(),
110110
problem_count: 2
111111
},
112112
UserLanguageCount {
113113
user_id: "user1".to_owned(),
114-
simplified_language: "language2".to_owned(),
114+
simplified_language: "language y".to_owned(),
115115
problem_count: 1
116116
},
117117
UserLanguageCount {
118118
user_id: "user2".to_owned(),
119-
simplified_language: "language1".to_owned(),
119+
simplified_language: "language x".to_owned(),
120120
problem_count: 1
121121
},
122122
UserLanguageCount {
@@ -133,7 +133,7 @@ async fn test_language_count() {
133133
);
134134

135135
let language_count_1st_to_2nd = pool
136-
.load_language_count_in_range("language1", 0..2)
136+
.load_language_count_in_range("language x", 0..2)
137137
.await
138138
.unwrap();
139139
assert_eq!(
@@ -151,7 +151,7 @@ async fn test_language_count() {
151151
);
152152

153153
let language_count_2nd_to_2nd = pool
154-
.load_language_count_in_range("language1", 1..2)
154+
.load_language_count_in_range("language x", 1..2)
155155
.await
156156
.unwrap();
157157
assert_eq!(
@@ -163,7 +163,7 @@ async fn test_language_count() {
163163
);
164164

165165
assert_eq!(
166-
pool.load_language_count_in_range("language1", 0..10)
166+
pool.load_language_count_in_range("language x", 0..10)
167167
.await
168168
.unwrap()
169169
.len(),
@@ -176,12 +176,12 @@ async fn test_language_count() {
176176
vec![
177177
UserLanguageCount {
178178
user_id: "user1".to_owned(),
179-
simplified_language: "language1".to_owned(),
179+
simplified_language: "language x".to_owned(),
180180
problem_count: 2,
181181
},
182182
UserLanguageCount {
183183
user_id: "user1".to_owned(),
184-
simplified_language: "language2".to_owned(),
184+
simplified_language: "language y".to_owned(),
185185
problem_count: 1,
186186
},
187187
]
@@ -192,12 +192,12 @@ async fn test_language_count() {
192192
vec![
193193
UserLanguageCountRank {
194194
user_id: "user1".to_owned(),
195-
simplified_language: "language1".to_owned(),
195+
simplified_language: "language x".to_owned(),
196196
rank: 1,
197197
},
198198
UserLanguageCountRank {
199199
user_id: "user1".to_owned(),
200-
simplified_language: "language2".to_owned(),
200+
simplified_language: "language y".to_owned(),
201201
rank: 1,
202202
},
203203
]
@@ -208,7 +208,7 @@ async fn test_language_count() {
208208
language_count,
209209
vec![UserLanguageCount {
210210
user_id: "user2".to_owned(),
211-
simplified_language: "language1".to_owned(),
211+
simplified_language: "language x".to_owned(),
212212
problem_count: 1,
213213
},]
214214
);
@@ -217,7 +217,7 @@ async fn test_language_count() {
217217
language_count_rank,
218218
vec![UserLanguageCountRank {
219219
user_id: "user2".to_owned(),
220-
simplified_language: "language1".to_owned(),
220+
simplified_language: "language x".to_owned(),
221221
rank: 2,
222222
},]
223223
);
@@ -255,5 +255,5 @@ async fn test_language_count() {
255255
]
256256
);
257257
let languages = pool.load_languages().await.unwrap();
258-
assert_eq!(languages, ["language1", "language2", "Perl", "Raku"]);
258+
assert_eq!(languages, ["language x", "language y", "Perl", "Raku"]);
259259
}

0 commit comments

Comments
 (0)