Test corpuses in unit tests

Author: theory

src/valid/mod.rs

@@ -124,46 +124,41 @@ fn is_license(v: &Value) -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-// #[cfg(test)]
-// mod tests {
-//     use super::*;
-//     use serde::{Deserialize, Serialize};
-//     use serde_json::Value;
-//     use std::error::Error;
-//     use std::io::{prelude::*, BufReader};
-//     use std::path::PathBuf;
-
-//     #[derive(Deserialize, Serialize)]
-//     struct CorpusCase {
-//         test: String,
-//         error: Option<String>,
-//         meta: Value,
-//     }
-
-//     #[test]
-//     fn test_validator() -> Result<(), Box<dyn Error>> {
-//         let schemas_dir: PathBuf = [env!("CARGO_MANIFEST_DIR"), "schema"].iter().collect();
-
-//         let mut validator = Validator::new(schemas_dir)?;
-//         let valid_file: PathBuf = [
-//             env!("CARGO_MANIFEST_DIR"),
-//             "tests",
-//             "corpus",
-//             "v1",
-//             "valid.txt",
-//         ]
-//         .iter()
-//         .collect();
-//         let file = File::open(&valid_file)?;
-//         let reader = BufReader::new(file);
-//         for line in reader.lines() {
-//             let tc: CorpusCase = serde_json::from_str(&line?)?;
-//             if let Err(e) = validator.validate(&tc.meta) {
-//                 panic!("{} failed: {e}", &tc.test);
-//             }
-//             println!("Example {} ok", &tc.test);
-//         }
-
-//         Ok(())
-//     }
-// }
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde::{Deserialize, Serialize};
+    use serde_json::Value;
+    use std::error::Error;
+    use std::path::PathBuf;
+
+    #[derive(Deserialize, Serialize)]
+    struct CorpusCase {
+        test: String,
+        error: Option<String>,
+        meta: Value,
+    }
+
+    #[test]
+    fn test_corpus() -> Result<(), Box<dyn Error>> {
+        let schemas_dir: PathBuf = [env!("CARGO_MANIFEST_DIR"), "schema"].iter().collect();
+        let mut validator = Validator::new(schemas_dir)?;
+
+        for v_dir in ["v1", "v2"] {
+            let dir: PathBuf = [env!("CARGO_MANIFEST_DIR"), "tests", "corpus", v_dir]
+                .iter()
+                .collect();
+            let glob = Glob::new("*.json")?;
+
+            for path in glob.walk(dir) {
+                let path = path?.into_path();
+                let meta: Value = serde_json::from_reader(File::open(&path)?)?;
+                if let Err(e) = validator.validate(&meta) {
+                    panic!("{v_dir}/{:?} failed: {e}", path.file_name().unwrap());
+                }
+                println!("Example {v_dir}/{:?} ok", path.file_name().unwrap());
+            }
+        }
+        Ok(())
+    }
+}

tests/common/mod.rs

@@ -1,11 +1,8 @@
 use std::fs::{self, File};
-use std::path::PathBuf;
 use std::{collections::HashMap, error::Error};
 
 use boon::{Compiler, Schemas};
-use pgxn_meta::*;
 use serde_json::{json, Value};
-use wax::Glob;
 
 const SCHEMA_BASE: &str = "https://pgxn.org/meta/v";
 
@@ -240,25 +237,3 @@ pub fn test_schema_version(version: u8) -> Result<(), Box<dyn Error>> {
 
     Ok(())
 }
-
-pub fn test_corpus(version: u8) -> Result<(), Box<dyn Error>> {
-    let schemas_dir: PathBuf = [env!("CARGO_MANIFEST_DIR"), "schema"].iter().collect();
-    let mut validator = Validator::new(schemas_dir)?;
-    let v_dir = format!("v{version}");
-
-    let dir: PathBuf = [env!("CARGO_MANIFEST_DIR"), "tests", "corpus", &v_dir]
-        .iter()
-        .collect();
-    let glob = Glob::new("*.json")?;
-
-    for path in glob.walk(dir) {
-        let path = path?.into_path();
-        let meta: Value = serde_json::from_reader(File::open(&path)?)?;
-        if let Err(e) = validator.validate(&meta) {
-            panic!("{v_dir}/{:?} failed: {e}", path.file_name().unwrap());
-        }
-        println!("Example {v_dir}/{:?} ok", path.file_name().unwrap());
-    }
-
-    Ok(())
-}

tests/v1_schema_test.rs

@@ -1,7 +1,6 @@
 use std::error::Error;
 
 use boon::Schemas;
-use serde::{Deserialize, Serialize};
 use serde_json::{json, Map, Value};
 
 // importing common module.
@@ -17,18 +16,6 @@ fn test_schema_v1() -> Result<(), Box<dyn Error>> {
     test_schema_version(SCHEMA_VERSION)
 }
 
-#[derive(Deserialize, Serialize)]
-struct CorpusCase {
-    test: String,
-    error: Option<String>,
-    meta: Value,
-}
-
-#[test]
-fn test_corpus_v1_valid() -> Result<(), Box<dyn Error>> {
-    test_corpus(1)
-}
-
 #[test]
 fn test_v1_term() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the term schema.

tests/v2_schema_test.rs

@@ -1,7 +1,6 @@
 use std::error::Error;
 
 use boon::Schemas;
-use serde::{Deserialize, Serialize};
 use serde_json::{json, Map, Value};
 
 // importing common module.
@@ -3334,15 +3333,3 @@ fn test_v2_distribution() -> Result<(), Box<dyn Error>> {
 
     Ok(())
 }
-
-#[derive(Deserialize, Serialize)]
-struct CorpusCase {
-    test: String,
-    error: Option<String>,
-    meta: Value,
-}
-
-#[test]
-fn test_corpus_v2_valid() -> Result<(), Box<dyn Error>> {
-    test_corpus(2)
-}