From aa58082cd713b57b0cf425d2ea525d5d1cdb8194 Mon Sep 17 00:00:00 2001 From: Alex Groleau Date: Tue, 30 Sep 2025 20:19:41 -0400 Subject: [PATCH] boon test suite itself passing --- validator/src/lib.rs | 2 +- validator/tests/debug.rs | 2 +- validator/tests/examples.rs | 14 +++++++------- validator/tests/output.rs | 6 +++--- validator/tests/suite.rs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/validator/src/lib.rs b/validator/src/lib.rs index 1fc59e9..f3f6370 100644 --- a/validator/src/lib.rs +++ b/validator/src/lib.rs @@ -10,7 +10,7 @@ let mut schemas = Schemas::new(); // container for compiled schemas let mut compiler = Compiler::new(); let sch_index = compiler.compile("schema.json", &mut schemas)?; let instance: Value = serde_json::from_reader(File::open("instance.json")?)?; -let valid = schemas.validate(&instance, sch_index).is_ok(); +let valid = schemas.validate(&instance, sch_index, None).is_ok(); # Ok(()) # } ``` diff --git a/validator/tests/debug.rs b/validator/tests/debug.rs index c9cd8f7..be861d4 100644 --- a/validator/tests/debug.rs +++ b/validator/tests/debug.rs @@ -15,7 +15,7 @@ fn test_debug() -> Result<(), Box> { let url = "http://debug.com/schema.json"; compiler.add_resource(url, test["schema"].clone())?; let sch = compiler.compile(url, &mut schemas)?; - let result = schemas.validate(&test["data"], sch); + let result = schemas.validate(&test["data"], sch, None); if let Err(e) = &result { for line in format!("{e}").lines() { println!(" {line}"); diff --git a/validator/tests/examples.rs b/validator/tests/examples.rs index 6e4a943..d4fc302 100644 --- a/validator/tests/examples.rs +++ b/validator/tests/examples.rs @@ -13,7 +13,7 @@ fn example_from_files() -> Result<(), Box> { let mut schemas = Schemas::new(); let mut compiler = Compiler::new(); let sch_index = compiler.compile(schema_file, &mut schemas)?; - let result = schemas.validate(&instance, sch_index); + let result = schemas.validate(&instance, sch_index, None); assert!(result.is_ok()); Ok(()) @@ -51,7 +51,7 @@ fn example_from_strings() -> Result<(), Box> { compiler.add_resource("tests/examples/pet.json", pet_schema)?; compiler.add_resource("tests/examples/cat.json", cat_schema)?; let sch_index = compiler.compile("tests/examples/pet.json", &mut schemas)?; - let result = schemas.validate(&instance, sch_index); + let result = schemas.validate(&instance, sch_index, None); assert!(result.is_ok()); Ok(()) @@ -79,7 +79,7 @@ fn example_from_https() -> Result<(), Box> { loader.register("https", Box::new(HttpUrlLoader)); compiler.use_loader(Box::new(loader)); let sch_index = compiler.compile(schema_url, &mut schemas)?; - let result = schemas.validate(&instance, sch_index); + let result = schemas.validate(&instance, sch_index, None); assert!(result.is_ok()); Ok(()) @@ -114,7 +114,7 @@ fn example_from_yaml_files() -> Result<(), Box> { loader.register("file", Box::new(FileUrlLoader)); compiler.use_loader(Box::new(loader)); let sch_index = compiler.compile(schema_file, &mut schemas)?; - let result = schemas.validate(&instance, sch_index); + let result = schemas.validate(&instance, sch_index, None); assert!(result.is_ok()); Ok(()) @@ -148,7 +148,7 @@ fn example_custom_format() -> Result<(), Box> { }); compiler.add_resource(schema_url, schema)?; let sch_index = compiler.compile(schema_url, &mut schemas)?; - let result = schemas.validate(&instance, sch_index); + let result = schemas.validate(&instance, sch_index, None); assert!(result.is_ok()); Ok(()) @@ -193,7 +193,7 @@ fn example_custom_content_encoding() -> Result<(), Box> { }); compiler.add_resource(schema_url, schema)?; let sch_index = compiler.compile(schema_url, &mut schemas)?; - let result = schemas.validate(&instance, sch_index); + let result = schemas.validate(&instance, sch_index, None); assert!(result.is_err()); Ok(()) @@ -223,7 +223,7 @@ fn example_custom_content_media_type() -> Result<(), Box> { }); compiler.add_resource(schema_url, schema)?; let sch_index = compiler.compile(schema_url, &mut schemas)?; - let result = schemas.validate(&instance, sch_index); + let result = schemas.validate(&instance, sch_index, None); assert!(result.is_ok()); Ok(()) diff --git a/validator/tests/output.rs b/validator/tests/output.rs index 6158bfc..ce7ba41 100644 --- a/validator/tests/output.rs +++ b/validator/tests/output.rs @@ -52,7 +52,7 @@ fn test_folder(suite: &str, folder: &str, draft: Draft) -> Result<(), Box println!(" validation success"), Err(e) => { if let Some(sch) = test.output.basic { @@ -64,7 +64,7 @@ fn test_folder(suite: &str, folder: &str, draft: Draft) -> Result<(), Box Result<(), Box Result<(), Box let sch_index = compiler.compile(url, &mut schemas)?; for test in group.tests { println!(" {}", test.description); - let result = schemas.validate(&test.data, sch_index); + let result = schemas.validate(&test.data, sch_index, None); if let Err(e) = &result { for line in format!("{e}").lines() { println!(" {line}");