Modify the format of test-with-generated-opts.toml

qryxip · qryxip · commit bb7e6403a50f · 2019-12-20T22:50:48.000+09:00
diff --git a/test-with-generated-opts.toml b/test-with-generated-opts.toml
@@ -1,70 +1,87 @@
 # 手元でDropboxのテストケース（ある場合）で確認し、サンプルに含まれていないやつが大きいときはそれらをGitに入れない。
 # その場合CI上でもサンプルだけテストする。（Dropboxから引っ張るのも面倒だし何より誰のアカウントを使うかという問題がある）
 
-[tests.abc054-c]
+[examples.abc054-c]
 name = "ABC054: C - One-stroke Path"
+url = "https://atcoder.jp/contests/abc054/tasks/abc054_c"
 matching = "Words"
 
-[tests.abc057-b]
+[examples.abc057-b]
 name = "ABC057: B - Checkpoints"
+url = "https://atcoder.jp/contests/abc057/tasks/abc057_b"
 matching = "Words"
 
-[tests.abc084-d]
+[examples.abc084-d]
 name = "ABC084: D - 2017-like Number"
+url = "https://atcoder.jp/contests/abc084/tasks/abc084_d"
 matching = "Words"
 
-[tests.abc118-b]
+[examples.abc118-b]
 name = "ABC118: B - Foods Loved by Everyone"
+url = "https://atcoder.jp/contests/abc118/tasks/abc118_b"
 matching = "Words"
 
-[tests.abc120-d]
+[examples.abc120-d]
 name = "ABC120: D - Decayed Bridges"
+url = "https://atcoder.jp/contests/abc120/tasks/abc120_d"
 matching = "Words"
 
-[tests.abc121-b]
+[examples.abc121-b]
 name = "ABC121: B - Can you solve this?"
+url = "https://atcoder.jp/contests/abc121/tasks/abc121_b"
 matching = "Words"
 
-[tests.abc129-f]
+[examples.abc129-f]
 name = "ABC129: F - Takahashi's Basics in Education and Learning"
+url = "https://atcoder.jp/contests/abc129/tasks/abc129_f"
 matching = "Words"
 
-[tests.abc142-d]
+[examples.abc142-d]
 name = "ABC142: D - Disjoint Set of Common Divisors"
+url = "https://atcoder.jp/contests/abc142/tasks/abc142_d"
 matching = "Words"
 
-[tests.abc144-d]
+[examples.abc144-d]
 name = "ABC144: D - Water Bottle"
+url = "https://atcoder.jp/contests/abc144/tasks/abc144_d"
 matching = { FloatOr = { abs = 1e-6, rel = 1e-6 } }
 
-[tests.apg4b-a]
+[examples.apg4b-a]
 name = "APG4b: A - 1.00.はじめに"
+url = "https://atcoder.jp/contests/APG4b/tasks/APG4b_a"
 matching = "Exact"
 
-[tests.apg4b-ex25]
+[examples.apg4b-ex25]
 name = "APG4b: EX25 - 集合の操作 / 3.05"
+url = "https://atcoder.jp/contests/APG4b/tasks/APG4b_bx"
 matching = "Words"
 
-[tests.apg4b-ex26]
+[examples.apg4b-ex26]
 name = "APG4b: EX26 - 電卓を作ろう3 / 3.06"
+url = "https://atcoder.jp/contests/APG4b/tasks/APG4b_bw"
 matching = "Exact"
 
-[tests.arc065-c]
+[examples.arc065-c]
 name = "ABC049 / ARC065: C - 白昼夢 / Daydream"
+url = "https://atcoder.jp/contests/arc065/tasks/arc065_a"
 matching = "Words"
 
-[tests.arc084-c]
+[examples.arc084-c]
 name = "ABC077 / ARC084: C - Snuke Festival"
+url = "https://atcoder.jp/contests/arc084/tasks/arc084_a"
 matching = "Words"
 
-[tests.atc001-b]
+[examples.atc001-b]
 name = "ATC001: B - Union Find"
+url = "https://atcoder.jp/contests/atc001/tasks/unionfind_a"
 matching = "Words"
 
-[tests.atc002-b]
+[examples.atc002-b]
 name = "ATC002: B - n^p mod m"
+url = "https://atcoder.jp/contests/atc002/tasks/atc002_b"
 matching = "Words"
 
-[tests.practice-a]
+[examples.practice-a]
 name = "practice contest: A - Welcome to AtCoder"
+url = "https://atcoder.jp/contests/practice/tasks/practice_1"
 matching = "Words"
diff --git a/tools/test-with-generated-opts/src/main.rs b/tools/test-with-generated-opts/src/main.rs
@@ -54,25 +54,34 @@ fn main() -> anyhow::Result<()> {
         .filter_module("test_with_generated_opts", LevelFilter::Info)
         .init();
 
-    let Tests { tests } = fs::read_to_string(&config)
+    let Config { examples } = fs::read_to_string(&config)
         .map_err(anyhow::Error::from)
         .and_then(|s| toml::from_str(&s).map_err(Into::into))
         .with_context(|| format!("Failed to read {}", config.display()))?;
 
     let tempdir = TempDir::new("atcoder-rust-base-test-with-generated-opts")?;
 
-    let tests = tests
+    let tests = examples
         .into_iter()
-        .map(|(slug, Test { name, matching })| {
-            let src = Path::new("./examples").join(&slug).with_extension("rs");
-            let testsets = Path::new("./examples/testsets").join(&slug);
-            let binary = compile(&src, tempdir.path(), &slug)?;
-            Ok((name, matching, testsets, binary))
-        })
+        .map(
+            |(
+                slug,
+                Example {
+                    name,
+                    url,
+                    matching,
+                },
+            )| {
+                let src = Path::new("./examples").join(&slug).with_extension("rs");
+                let testsets = Path::new("./examples/testsets").join(&slug);
+                let binary = compile(&src, tempdir.path(), &slug)?;
+                Ok((name, url, matching, testsets, binary))
+            },
+        )
         .collect::<anyhow::Result<Vec<_>>>()?;
 
-    for (name, matching, testsets, binary) in tests {
-        test(&name, matching, &testsets, &binary)?;
+    for (name, url, matching, testsets, binary) in tests {
+        test(&name, &url, matching, &testsets, &binary)?;
     }
     Ok(())
 }
@@ -142,20 +151,31 @@ fn compile(src: &Path, tempdir: &Path, dir_name: &str) -> anyhow::Result<PathBuf
     Ok(out)
 }
 
-fn test(task_name: &str, matching: Matching, testsets: &Path, binary: &Path) -> anyhow::Result<()> {
+fn test(
+    task_name: &str,
+    url: &str,
+    matching: Matching,
+    testsets: &Path,
+    binary: &Path,
+) -> anyhow::Result<()> {
     let testsets = {
-        let find_files = |dir: &str| -> _ {
-            fs::read_dir(testsets.join(dir))?
-                .map(|entry| {
-                    let path = entry?.path();
-                    let name = path
-                        .file_stem()
-                        .unwrap_or_default()
-                        .to_string_lossy()
-                        .into_owned();
-                    Ok((name, path))
+        let find_files = |dir_file_name: &str| -> _ {
+            let dir = testsets.join(dir_file_name);
+            fs::read_dir(&dir)
+                .and_then(|read_dir| {
+                    read_dir
+                        .map(|entry| {
+                            let path = entry?.path();
+                            let name = path
+                                .file_stem()
+                                .unwrap_or_default()
+                                .to_string_lossy()
+                                .into_owned();
+                            Ok((name, path))
+                        })
+                        .collect::<io::Result<HashMap<_, _>>>()
                 })
-                .collect::<io::Result<HashMap<_, _>>>()
+                .with_context(|| format!("Failed to read {}", dir.display()))
         };
 
         let (ins, outs) = (find_files("in")?, find_files("out")?);
@@ -168,7 +188,9 @@ fn test(task_name: &str, matching: Matching, testsets: &Path, binary: &Path) ->
             .collect::<BTreeMap<_, _>>()
     };
 
-    info!("Testing {} for {:?}", binary.display(), task_name);
+    info!("Testing {}", binary.display());
+    info!("  Name: {:?}", task_name);
+    info!("  URL: {}", url);
 
     for (test_name, (path_in, path_out)) in testsets {
         fn read_to_string(path: &Path) -> anyhow::Result<String> {
@@ -218,13 +240,14 @@ fn test(task_name: &str, matching: Matching, testsets: &Path, binary: &Path) ->
 }
 
 #[derive(Debug, Deserialize)]
-struct Tests {
-    tests: IndexMap<String, Test>,
+struct Config {
+    examples: IndexMap<String, Example>,
 }
 
 #[derive(Debug, Deserialize)]
-struct Test {
+struct Example {
     name: String,
+    url: String,
     matching: Matching,
 }
 
