Test all schemas

Author: theory

schema/v2/semver.schema.json

@@ -10,6 +10,6 @@
     "1.3.6",
     "10.20.30",
     "1.0.0-alpha",
-    "1.0.0-alpha-a.b-c-something-long+build.1-aef.1-its-okay"
+    "1.0.0-alpha-a.b-c-something-long"
   ]
 }

tests/common/mod.rs

@@ -1,5 +1,5 @@
-use std::error::Error;
 use std::fs::{self, File};
+use std::{collections::HashMap, error::Error};
 
 use boon::{Compiler, Schemas};
 use serde_json::{json, Value};
@@ -186,3 +186,56 @@ pub fn test_tags_schema(mut compiler: Compiler, id: &str) -> Result<(), Box<dyn
 
     Ok(())
 }
+
+pub fn test_schema_version(version: i8) -> Result<(), Box<dyn Error>> {
+    let mut compiler = Compiler::new();
+    compiler.enable_format_assertions();
+    let mut loaded: HashMap<String, Vec<Value>> = HashMap::new();
+
+    let paths = fs::read_dir(format!("./schema/v{version}"))?;
+    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"] {
+                // Make sure that the ID is correct.
+                assert_eq!(format!("https://pgxn.org/meta/v{version}/{bn}"), *s);
+
+                // Add the schema to the compiler.
+                compiler.add_resource(s, schema.to_owned())?;
+
+                // Grab the examples, if any, to test later.
+                if let Value::Array(a) = &schema["examples"] {
+                    loaded.insert(s.clone(), a.to_owned());
+                } else {
+                    loaded.insert(s.clone(), Vec::new());
+                }
+            } else {
+                panic!("Unable to find ID in {}", path.display());
+            }
+        } else {
+            println!("Skipping {}", path.display());
+        }
+    }
+
+    // Make sure we found schemas.
+    assert!(!loaded.is_empty(), "No schemas loaded!");
+
+    // Make sure each schema we loaded is valid.
+    let mut schemas = Schemas::new();
+    for (id, examples) in loaded {
+        let index = compiler.compile(id.as_str(), &mut schemas)?;
+        println!("{} ok", id);
+
+        // Test the schema's examples.
+        for (i, example) in examples.iter().enumerate() {
+            if let Err(e) = schemas.validate(example, index) {
+                panic!("Example {i} failed: {e}");
+            }
+            // println!("  Example {i} ok");
+        }
+    }
+
+    Ok(())
+}

tests/v1_schema_test.rs

@@ -1,8 +1,8 @@
-use std::fs::{self, File};
+use std::error::Error;
+use std::fs::File;
 use std::io::{prelude::*, BufReader};
-use std::{collections::HashMap, error::Error};
 
-use boon::{Compiler, Schemas};
+use boon::Schemas;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Map, Value};
 
@@ -15,56 +15,7 @@ const SCHEMA_ID: &str = "https://pgxn.org/meta/v1/distribution.schema.json";
 
 #[test]
 fn test_schema_v1() -> Result<(), Box<dyn Error>> {
-    let mut compiler = Compiler::new();
-    compiler.enable_format_assertions();
-    let mut loaded: HashMap<String, Vec<Value>> = HashMap::new();
-
-    let paths = fs::read_dir("./schema/v1")?;
-    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"] {
-                // Make sure that the ID is correct.
-                assert_eq!(format!("https://pgxn.org/meta/v1/{bn}"), *s);
-
-                // Add the schema to the compiler.
-                compiler.add_resource(s, schema.to_owned())?;
-
-                // Grab the examples, if any, to test later.
-                if let Value::Array(a) = &schema["examples"] {
-                    loaded.insert(s.clone(), a.to_owned());
-                } else {
-                    loaded.insert(s.clone(), Vec::new());
-                }
-            } else {
-                panic!("Unable to find ID in {}", path.display());
-            }
-        } else {
-            println!("Skipping {}", path.display());
-        }
-    }
-
-    // Make sure we found schemas.
-    assert!(!loaded.is_empty(), "No schemas loaded!");
-
-    // Make sure each schema we loaded is valid.
-    let mut schemas = Schemas::new();
-    for (id, examples) in loaded {
-        let index = compiler.compile(id.as_str(), &mut schemas)?;
-        println!("{} ok", id);
-
-        // Test the schema's examples.
-        for (i, example) in examples.iter().enumerate() {
-            if let Err(e) = schemas.validate(example, index) {
-                panic!("Example {i} failed: {e}");
-            }
-            // println!("  Example {i} ok");
-        }
-    }
-
-    Ok(())
+    test_schema_version(1)
 }
 
 #[derive(Deserialize, Serialize)]

tests/v2_schema_test.rs

@@ -9,6 +9,27 @@ use common::*;
 
 const SCHEMA_BASE: &str = "https://pgxn.org/meta/v2";
 
+#[test]
+fn test_schema_v1() -> Result<(), Box<dyn Error>> {
+    test_schema_version(2)
+}
+
+#[test]
+fn test_v2_term() -> Result<(), Box<dyn Error>> {
+    // Load the schemas and compile the term schema.
+    let compiler = new_compiler("schema/v2")?;
+    let id = format!("{SCHEMA_BASE}/term.schema.json");
+    test_term_schema(compiler, &id)
+}
+
+#[test]
+fn test_v2_tags() -> Result<(), Box<dyn Error>> {
+    // Load the schemas and compile the tags schema.
+    let compiler = new_compiler("schema/v2")?;
+    let id = format!("{SCHEMA_BASE}/tags.schema.json");
+    test_tags_schema(compiler, &id)
+}
+
 #[test]
 fn test_v2_semver() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the semver schema.
@@ -38,19 +59,3 @@ fn test_v2_semver() -> Result<(), Box<dyn Error>> {
 
     Ok(())
 }
-
-#[test]
-fn test_v2_term() -> Result<(), Box<dyn Error>> {
-    // Load the schemas and compile the term schema.
-    let compiler = new_compiler("schema/v2")?;
-    let id = format!("{SCHEMA_BASE}/term.schema.json");
-    test_term_schema(compiler, &id)
-}
-
-#[test]
-fn test_v2_tags() -> Result<(), Box<dyn Error>> {
-    // Load the schemas and compile the tags schema.
-    let compiler = new_compiler("schema/v2")?;
-    let id = format!("{SCHEMA_BASE}/tags.schema.json");
-    test_tags_schema(compiler, &id)
-}