テストでinclude_str!()を使うようにした

# 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:      Wed Apr 27 23:43:57 2022 +0900
#
# interactive rebase in progress; onto 58aed3e
# Last commands done (3 commands done):
#    edit 376fb599 Clippyの怒りを鎮めた
#    edit d3742fea テストでinclude_str!()を使うようにした
# Next commands to do (3 remaining commands):
#    edit c51aa932 src/server/progress_reset.rsを削除
#    edit dbd193b5 src/server/problem_list.rsを削除
# You are currently editing a commit while rebasing branch 'tweak' on '58aed3e8'.
#
# Changes to be committed:
#	modified:   atcoder-client/src/atcoder/contest.rs
#	modified:   atcoder-client/src/atcoder/problem.rs
#	modified:   atcoder-client/src/atcoder/submission.rs
#
# Untracked files:
#	cargo-timing.html
#

Author: hotate29

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

@@ -126,26 +126,20 @@ pub(super) fn scrape_permanent(html: &str) -> Result<Vec<AtCoderContest>> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::fs::File;
-    use std::io::Read;
 
     #[test]
     fn test_scrape_normal() {
-        let mut file = File::open("test_resources/contests_normal").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
+        let contents = include_str!("../../test_resources/contests_normal");
 
-        let contests = scrape_normal(&contents).unwrap();
+        let contests = scrape_normal(contents).unwrap();
         assert_eq!(contests.len(), 50);
     }
 
     #[test]
     fn test_scrape_permanent() {
-        let mut file = File::open("test_resources/contests_permanent").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
+        let contents = include_str!("../../test_resources/contests_permanent");
 
-        let contests = scrape_permanent(&contents).unwrap();
+        let contests = scrape_permanent(contents).unwrap();
         assert_eq!(contests.len(), 4);
     }
 }

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

@@ -50,15 +50,11 @@ pub(super) fn scrape(html: &str, contest_id: &str) -> Result<Vec<AtCoderProblem>
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::fs::File;
-    use std::io::prelude::*;
 
     #[test]
     fn test_scrape() {
-        let mut file = File::open("test_resources/abc107_tasks").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
-        let problems = scrape(&contents, "abc107").unwrap();
+        let contents = include_str!("../../test_resources/abc107_tasks");
+        let problems = scrape(contents, "abc107").unwrap();
         assert_eq!(
             problems,
             vec![
@@ -92,10 +88,8 @@ mod tests {
 
     #[test]
     fn test_scrape_atc002() {
-        let mut file = File::open("test_resources/atc002_tasks").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
-        let problems = scrape(&contents, "atc002").unwrap();
+        let contents = include_str!("../../test_resources/atc002_tasks");
+        let problems = scrape(contents, "atc002").unwrap();
         assert_eq!(
             problems,
             vec![

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

@@ -143,19 +143,15 @@ pub(super) fn scrape(html_text: &str, contest_id: &str) -> Result<Vec<AtCoderSub
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::fs::File;
-    use std::io::prelude::*;
 
     #[test]
     fn test_scrape() {
-        let mut file = File::open("test_resources/abc107_submissions").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
-        let submissions = scrape(&contents, "abc107").unwrap();
+        let contents = include_str!("../../test_resources/abc107_submissions");
+        let submissions = scrape(contents, "abc107").unwrap();
         assert_eq!(submissions.len(), 20);
         assert!(submissions.iter().all(|s| s.user_id.is_ascii()));
 
-        let max_page = scrape_submission_page_count(&contents).unwrap();
+        let max_page = scrape_submission_page_count(contents).unwrap();
         assert_eq!(max_page, 2208);
     }
 }