Remove entrypoint and real/integer test from the JSON traces (#687)

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

Author: jviotti

test/evaluator/evaluator_draft4.json

@@ -668,44 +668,6 @@
       ]
     }
   },
-  {
-    "description": "ref_2_entrypoint",
-    "schema": {
-      "$schema": "http://json-schema.org/draft-04/schema#",
-      "allOf": [
-        { "$ref": "#/definitions/string" }
-      ],
-      "definitions": {
-        "string": { "type": "string" }
-      }
-    },
-    "instance": "foo",
-    "valid": true,
-    "entrypoint": "#/allOf/0",
-    "fast": {
-      "pre": [
-        [ "AssertionTypeStrict", "/$ref/type", "#/definitions/string/type", "" ]
-      ],
-      "post": [
-        [ true, "AssertionTypeStrict", "/$ref/type", "#/definitions/string/type", "" ]
-      ],
-      "descriptions": [ "The value was expected to be of type string" ]
-    },
-    "exhaustive": {
-      "pre": [
-        [ "ControlJump", "/$ref", "#/allOf/0/$ref", "" ],
-        [ "AssertionTypeStrict", "/$ref/type", "#/definitions/string/type", "" ]
-      ],
-      "post": [
-        [ true, "AssertionTypeStrict", "/$ref/type", "#/definitions/string/type", "" ],
-        [ true, "ControlJump", "/$ref", "#/allOf/0/$ref", "" ]
-      ],
-      "descriptions": [
-        "The value was expected to be of type string",
-        "The string value was expected to validate against the referenced schema"
-      ]
-    }
-  },
   {
     "description": "ref_3",
     "schema": {
@@ -6076,44 +6038,6 @@
       ]
     }
   },
-  {
-    "description": "enum_17",
-    "schema": {
-      "$schema": "http://json-schema.org/draft-04/schema#",
-      "type": "integer",
-      "enum": [ 3.0 ]
-    },
-    "instance": 3.0,
-    "valid": false,
-    "fast": {
-      "pre": [
-        [ "AssertionEqual", "/enum", "#/enum", "" ],
-        [ "AssertionTypeStrict", "/type", "#/type", "" ]
-      ],
-      "post": [
-        [ true, "AssertionEqual", "/enum", "#/enum", "" ],
-        [ false, "AssertionTypeStrict", "/type", "#/type", "" ]
-      ],
-      "descriptions": [
-        "The number value 3.0 was expected to equal the number constant 3.0",
-        "The value was expected to be of type integer but it was of type number"
-      ]
-    },
-    "exhaustive": {
-      "pre": [
-        [ "AssertionEqual", "/enum", "#/enum", "" ],
-        [ "AssertionTypeStrict", "/type", "#/type", "" ]
-      ],
-      "post": [
-        [ true, "AssertionEqual", "/enum", "#/enum", "" ],
-        [ false, "AssertionTypeStrict", "/type", "#/type", "" ]
-      ],
-      "descriptions": [
-        "The number value 3.0 was expected to equal the number constant 3.0",
-        "The value was expected to be of type integer but it was of type number"
-      ]
-    }
-  },
   {
     "description": "enum_18",
     "schema": {

test/evaluator/evaluator_draft4_test.cc

@@ -1322,3 +1322,48 @@ TEST(Evaluator_draft4, multipleOf_18) {
       "The integer value 299999999999999999999999999999999998 was expected to "
       "be divisible by the integer 99999999999999999999999999999999999");
 }
+
+TEST(Evaluator_draft4, ref_2_entrypoint) {
+  const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "allOf": [ { "$ref": "#/definitions/string" } ],
+    "definitions": {
+      "string": { "type": "string" }
+    }
+  })JSON")};
+
+  const sourcemeta::core::JSON instance{"foo"};
+
+  EVALUATE_WITH_TRACE_FAST_SUCCESS(schema, instance, 1, "#/allOf/0");
+
+  EVALUATE_TRACE_PRE(0, AssertionTypeStrict, "/$ref/type",
+                     "#/definitions/string/type", "");
+  EVALUATE_TRACE_POST_SUCCESS(0, AssertionTypeStrict, "/$ref/type",
+                              "#/definitions/string/type", "");
+  EVALUATE_TRACE_POST_DESCRIBE(instance, 0,
+                               "The value was expected to be of type string");
+}
+
+TEST(Evaluator_draft4, enum_17) {
+  const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "integer",
+    "enum": [ 3.0 ]
+  })JSON")};
+
+  const sourcemeta::core::JSON instance{3.0};
+  EVALUATE_WITH_TRACE_FAST_FAILURE(schema, instance, 2, "");
+
+  EVALUATE_TRACE_PRE(0, AssertionEqual, "/enum", "#/enum", "");
+  EVALUATE_TRACE_PRE(1, AssertionTypeStrict, "/type", "#/type", "");
+
+  EVALUATE_TRACE_POST_SUCCESS(0, AssertionEqual, "/enum", "#/enum", "");
+  EVALUATE_TRACE_POST_FAILURE(1, AssertionTypeStrict, "/type", "#/type", "");
+
+  EVALUATE_TRACE_POST_DESCRIBE(
+      instance, 0,
+      "The number value 3.0 was expected to equal the number constant 3.0");
+  EVALUATE_TRACE_POST_DESCRIBE(
+      instance, 1,
+      "The value was expected to be of type integer but it was of type number");
+}

test/evaluator/tracesuite.cc

@@ -43,11 +43,6 @@ class TraceTest : public testing::Test {
     const auto &instance{this->data.at("instance")};
     const bool expected_valid{this->data.at("valid").to_boolean()};
 
-    std::string entrypoint;
-    if (this->data.defines("entrypoint")) {
-      entrypoint = this->data.at("entrypoint").to_string();
-    }
-
     const auto &mode_data{this->data.at(this->mode_key)};
 
     const auto pre{
@@ -67,11 +62,10 @@ class TraceTest : public testing::Test {
     assert(pre.size() == trace_descriptions.size());
     const auto count{pre.size()};
 
-    const auto compiled_schema{
-        sourcemeta::blaze::compile(schema, sourcemeta::core::schema_walker,
-                                   sourcemeta::core::schema_resolver,
-                                   sourcemeta::blaze::default_schema_compiler,
-                                   this->mode, "", "", entrypoint)};
+    const auto compiled_schema{sourcemeta::blaze::compile(
+        schema, sourcemeta::core::schema_walker,
+        sourcemeta::core::schema_resolver,
+        sourcemeta::blaze::default_schema_compiler, this->mode)};
     __ASSERT_TEMPLATE_JSON_SERIALISATION(compiled_schema);
     EVALUATE_WITH_TRACE(compiled_schema, instance, count);