Handle unsupported vocabularies in test and validate (#14)

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

DEPENDENCIES

@@ -1,4 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa 5ff4024902642afc9cc2f9a9e02ae9dff9d15d4f
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 466493636bdc27725ad5b171141410ec072919bc
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 503146c9412c040bcbcdb9a09a6da42c300d3435
 hydra https://github.com/sourcemeta/hydra d5e0c314dae88b0bf2ac4eeff2c7395910e2c7e9

src/command_test.cc

@@ -7,6 +7,8 @@
 #include "command.h"
 #include "utils.h"
 
+// TODO: Add a flag to first validate schema against its metaschema
+// TODO: Add a flag to prevent the use of HTTP resolution
 auto intelligence::jsonschema::cli::test(
     const std::span<const std::string> &arguments) -> int {
   const auto options{parse_options(arguments, {})};

src/command_validate.cc

@@ -3,11 +3,15 @@
 
 #include <cstdlib>  // EXIT_SUCCESS, EXIT_FAILURE
 #include <iostream> // std::cerr
+#include <set>      // std::set
+#include <string>   // std::string
 
 #include "command.h"
 #include "utils.h"
 
 // TODO: Add a flag to first validate schema against its metaschema
+// TODO: Add a flag to emit output using the standard JSON Schema output format
+// TODO: Add a flag to prevent the use of HTTP resolution
 auto intelligence::jsonschema::cli::validate(
     const std::span<const std::string> &arguments) -> int {
   const auto options{parse_options(arguments, {})};

test/CMakeLists.txt

@@ -14,7 +14,9 @@ add_jsonschema_test_unix(format_cwd)
 add_jsonschema_test_unix(frame)
 add_jsonschema_test_unix(validate_pass)
 add_jsonschema_test_unix(validate_fail)
+add_jsonschema_test_unix(validate_non_supported)
 add_jsonschema_test_unix(bundle_non_remote)
 add_jsonschema_test_unix(bundle_remote_single_schema)
 add_jsonschema_test_unix(test_single_pass)
 add_jsonschema_test_unix(test_single_fail)
+add_jsonschema_test_unix(test_single_unsupported)

test/test_single_unsupported.sh

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+# shellcheck disable=SC2317
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/test.json"
+{
+  "description": "My sample suite",
+  "schema": "https://json-schema.org/draft/2020-12/schema",
+  "tests": [
+    {
+      "description": "First test",
+      "valid": true,
+      "data": {}
+    },
+    {
+      "description": "Invalid type, expected to fail",
+      "valid": true,
+      "data": { "type": 1 }
+    }
+  ]
+}
+EOF
+
+"$1" test "$TMP/test.json" && CODE="$?" || CODE="$?"
+
+if [ "$CODE" = "0" ]
+then
+  echo "FAIL" 1>&2
+  exit 1
+else
+  echo "PASS" 1>&2
+  exit 0
+fi

test/validate_non_supported.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+# shellcheck disable=SC2317
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/schema.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "foo": {
+      "type": "string"
+    }
+  }
+}
+EOF
+
+cat << 'EOF' > "$TMP/instance.json"
+{ "foo": 1 }
+EOF
+
+"$1" validate "$TMP/schema.json" "$TMP/instance.json" && CODE="$?" || CODE="$?"
+
+if [ "$CODE" = "0" ]
+then
+  echo "FAIL" 1>&2
+  exit 1
+else
+  echo "PASS" 1>&2
+  exit 0
+fi