Add common module for tests

Author: theory

tests/common/mod.rs

@@ -0,0 +1,28 @@
+use std::error::Error;
+use std::fs::{self, File};
+
+use boon::Compiler;
+use serde_json::Value;
+
+pub fn new_compiler(dir: &str) -> Result<Compiler, Box<dyn Error>> {
+    let mut compiler = Compiler::new();
+    compiler.enable_format_assertions();
+    let paths = fs::read_dir(dir)?;
+    for path in paths {
+        let path = path?.path();
+        let bn = path.file_name().unwrap().to_str().unwrap();
+        if bn.ends_with(".schema.json") {
+            let schema: Value = serde_json::from_reader(File::open(path.clone())?)?;
+            if let Value::String(s) = &schema["$id"] {
+                // Add the schema to the compiler.
+                compiler.add_resource(s, schema.to_owned())?;
+            } else {
+                panic!("Unable to find ID in {}", path.display());
+            }
+        } else {
+            println!("Skipping {}", path.display());
+        }
+    }
+
+    Ok(compiler)
+}

tests/v1_schema_test.rs

@@ -6,6 +6,10 @@ use boon::{Compiler, Schemas};
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Map, Value};
 
+// importing common module.
+mod common;
+use common::*;
+
 const SCHEMA_BASE: &str = "https://pgxn.org/meta/v1";
 const SCHEMA_ID: &str = "https://pgxn.org/meta/v1/distribution.schema.json";
 
@@ -63,29 +67,6 @@ fn test_schema_v1() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-fn new_compiler(dir: &str) -> Result<Compiler, Box<dyn Error>> {
-    let mut compiler = Compiler::new();
-    compiler.enable_format_assertions();
-    let paths = fs::read_dir(dir)?;
-    for path in paths {
-        let path = path?.path();
-        let bn = path.file_name().unwrap().to_str().unwrap();
-        if bn.ends_with(".schema.json") {
-            let schema: Value = serde_json::from_reader(File::open(path.clone())?)?;
-            if let Value::String(s) = &schema["$id"] {
-                // Add the schema to the compiler.
-                compiler.add_resource(s, schema.to_owned())?;
-            } else {
-                panic!("Unable to find ID in {}", path.display());
-            }
-        } else {
-            println!("Skipping {}", path.display());
-        }
-    }
-
-    Ok(compiler)
-}
-
 #[derive(Deserialize, Serialize)]
 struct CorpusCase {
     test: String,

tests/v2_schema_test.rs

@@ -1,35 +1,15 @@
 use std::error::Error;
-use std::fs::{self, File};
 
-use boon::{Compiler, Schemas};
+use boon::Schemas;
 use serde_json::{json, Value};
 
+// importing common module.
+mod common;
+use common::*;
+
 const SCHEMA_BASE: &str = "https://pgxn.org/meta/v2";
 // const SCHEMA_ID: &str = "https://pgxn.org/meta/v2/distribution.schema.json";
 
-fn new_compiler(dir: &str) -> Result<Compiler, Box<dyn Error>> {
-    let mut compiler = Compiler::new();
-    compiler.enable_format_assertions();
-    let paths = fs::read_dir(dir)?;
-    for path in paths {
-        let path = path?.path();
-        let bn = path.file_name().unwrap().to_str().unwrap();
-        if bn.ends_with(".schema.json") {
-            let schema: Value = serde_json::from_reader(File::open(path.clone())?)?;
-            if let Value::String(s) = &schema["$id"] {
-                // Add the schema to the compiler.
-                compiler.add_resource(s, schema.to_owned())?;
-            } else {
-                panic!("Unable to find ID in {}", path.display());
-            }
-        } else {
-            println!("Skipping {}", path.display());
-        }
-    }
-
-    Ok(compiler)
-}
-
 // https://regex101.com/r/Ly7O1x/3/
 const VALID_VERSIONS: &[&str] = &[
     "0.0.4",