Simplify how the test command accesses subschemas of targets (#286)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

DEPENDENCIES

@@ -1,5 +1,5 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
-core https://github.com/sourcemeta/core a0587d1bbbb0be07eaa01027f63c15e34b0e2a07
+core https://github.com/sourcemeta/core bf0868140c6adc6e58bc3be074ea9ed9ed1efd05
 hydra https://github.com/sourcemeta/hydra a67b879df800e834ed8a2d056f98398f7211d870
-jsonbinpack https://github.com/sourcemeta/jsonbinpack c7bb7f4d903c3b6925b62ce2bb5b8d360e01ce84
+jsonbinpack https://github.com/sourcemeta/jsonbinpack 7bf12d9041951e1c8784ef9cd70036937041cf1a
 blaze https://github.com/sourcemeta/blaze 7aab1200ff5d224aa2167807279ae168529adf89

src/command_test.cc

@@ -12,29 +12,6 @@
 #include "command.h"
 #include "utils.h"
 
-static auto get_schema_object(const sourcemeta::core::URI &identifier,
-                              const sourcemeta::core::SchemaResolver &resolver)
-    -> std::optional<sourcemeta::core::JSON> {
-  const auto schema{resolver(identifier.recompose())};
-  if (schema.has_value()) {
-    return schema;
-  }
-
-  // Resolving a schema identifier that contains a fragment (i.e. a JSON Pointer
-  // one) can be tricky, as we might end up re-inventing JSON Schema referencing
-  // all over again. To make it work without much hassle, we do exactly that:
-  // create an artificial schema wrapper that uses `$ref`.
-  if (identifier.fragment().has_value()) {
-    auto result{sourcemeta::core::JSON::make_object()};
-    result.assign("$schema", sourcemeta::core::JSON{
-                                 "http://json-schema.org/draft-07/schema#"});
-    result.assign("$ref", sourcemeta::core::JSON{identifier.recompose()});
-    return result;
-  }
-
-  return std::nullopt;
-}
-
 static auto get_data(const sourcemeta::core::JSON &test_case,
                      const std::filesystem::path &base, const bool verbose)
     -> sourcemeta::core::JSON {
@@ -124,12 +101,7 @@ auto sourcemeta::jsonschema::cli::test(
 
     sourcemeta::core::URI schema_uri{test.at("target").to_string()};
     schema_uri.canonicalize();
-    const auto schema{get_schema_object(schema_uri, test_resolver)};
-    if (!schema.has_value()) {
-      std::cout << "\n";
-      throw sourcemeta::core::SchemaResolutionError(
-          test.at("target").to_string(), "Could not resolve schema under test");
-    }
+    const auto schema{sourcemeta::core::wrap(schema_uri.recompose())};
 
     unsigned int pass_count{0};
     unsigned int index{0};
@@ -144,8 +116,8 @@ auto sourcemeta::jsonschema::cli::test(
 
     try {
       schema_template = sourcemeta::blaze::compile(
-          schema.value(), sourcemeta::core::schema_official_walker,
-          test_resolver, sourcemeta::blaze::default_schema_compiler);
+          schema, sourcemeta::core::schema_official_walker, test_resolver,
+          sourcemeta::blaze::default_schema_compiler);
     } catch (const sourcemeta::core::SchemaReferenceError &error) {
       if (error.location() == sourcemeta::core::Pointer{"$ref"} &&
           error.id() == schema_uri.recompose()) {

test/test/fail_unresolvable.sh

@@ -29,7 +29,7 @@ test "$CODE" = "1" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 $(realpath "$TMP")/test.json:
-error: Could not resolve schema under test
+error: Could not resolve the requested schema
   at https://example.com/unknown
 EOF