Rebase

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

Author: jviotti

test/documentation/documentation_2020_12_test.cc

@@ -231,17 +231,56 @@ TEST(Documentation_2020_12, dependent_schemas_as_allof) {
 
   const auto &applicator_branch{all_of.children.at(0)};
   EXPECT_TABLE_SIZE(applicator_branch, 2, 0, 1);
-  EXPECT_EQ(applicator_branch.children.front().label, "All of");
-  EXPECT_EQ(applicator_branch.children.front().children.size(), 1);
-  const auto &dep_expansion{applicator_branch.children.front().children.at(0)};
-  EXPECT_TABLE_SIZE(dep_expansion, 3, 0, 1);
-  EXPECT_EQ(dep_expansion.children.front().label, "Any of");
-  EXPECT_EQ(dep_expansion.children.front().children.size(), 2);
+  EXPECT_EQ(applicator_branch.children.front().label, "Any of");
+  EXPECT_EQ(applicator_branch.children.front().children.size(), 2);
+
+  const auto &not_sub{applicator_branch.children.front().children.at(0)};
+  EXPECT_TABLE_SIZE(not_sub, 3, 1, 0);
+  EXPECT_WILDCARD_ROW_OBJECT_WITH_CONSTRAINTS(4, not_sub, 0, PATH(),
+                                              "must NOT match >= 1 properties");
+
+  const auto &allof_sub{applicator_branch.children.front().children.at(1)};
+  EXPECT_TABLE_SIZE(allof_sub, 5, 0, 1);
+  EXPECT_EQ(allof_sub.children.front().label, "All of");
+  EXPECT_EQ(allof_sub.children.front().children.size(), 2);
+
+  const auto &name_req_table{allof_sub.children.front().children.at(0)};
+  EXPECT_TABLE_SIZE(name_req_table, 6, 1, 0);
+  EXPECT_ROW_ANY(7, name_req_table, 0, PATH(LITERAL("name")), true);
+
+  const auto &type_expansion{allof_sub.children.front().children.at(1)};
+  EXPECT_TABLE_SIZE(type_expansion, 8, 0, 1);
+  EXPECT_EQ(type_expansion.children.front().label, "Any of");
+  EXPECT_EQ(type_expansion.children.front().children.size(), 6);
+
+  EXPECT_TABLE_SIZE(type_expansion.children.front().children.at(0), 9, 1, 0);
+  EXPECT_WILDCARD_ROW_ENUM(10, type_expansion.children.front().children.at(0),
+                           0, PATH(), 1, 0);
+  EXPECT_TABLE_SIZE(type_expansion.children.front().children.at(1), 11, 1, 0);
+  EXPECT_WILDCARD_ROW_ENUM(12, type_expansion.children.front().children.at(1),
+                           0, PATH(), 2, 0);
+  EXPECT_TABLE_SIZE(type_expansion.children.front().children.at(2), 13, 1, 0);
+  EXPECT_ROW_PRIMITIVE(
+      14, type_expansion.children.front().children.at(2), 0,
+      PATH(LITERAL("age")),
+      sourcemeta::blaze::Documentation::Type::Expression::Primitive::Integer,
+      false);
+  EXPECT_TABLE_SIZE(type_expansion.children.front().children.at(3), 15, 1, 0);
+  EXPECT_WILDCARD_ROW_ARRAY(16, type_expansion.children.front().children.at(3),
+                            0, PATH());
+  EXPECT_TABLE_SIZE(type_expansion.children.front().children.at(4), 17, 1, 0);
+  EXPECT_WILDCARD_ROW_PRIMITIVE(
+      18, type_expansion.children.front().children.at(4), 0, PATH(),
+      sourcemeta::blaze::Documentation::Type::Expression::Primitive::String);
+  EXPECT_TABLE_SIZE(type_expansion.children.front().children.at(5), 19, 1, 0);
+  EXPECT_WILDCARD_ROW_PRIMITIVE(
+      20, type_expansion.children.front().children.at(5), 0, PATH(),
+      sourcemeta::blaze::Documentation::Type::Expression::Primitive::Number);
 
   const auto &typed_branch{all_of.children.at(1)};
-  EXPECT_TABLE_SIZE(typed_branch, 22, 1, 0);
+  EXPECT_TABLE_SIZE(typed_branch, 21, 1, 0);
   EXPECT_ROW_PRIMITIVE(
-      23, typed_branch, 0, PATH(LITERAL("name")),
+      22, typed_branch, 0, PATH(LITERAL("name")),
       sourcemeta::blaze::Documentation::Type::Expression::Primitive::String,
       false);
 }
@@ -271,21 +310,27 @@ TEST(Documentation_2020_12, dependent_required_as_allof) {
 
   const auto &applicator_branch{all_of.children.at(0)};
   EXPECT_TABLE_SIZE(applicator_branch, 2, 0, 1);
-  EXPECT_EQ(applicator_branch.children.front().label, "All of");
-  EXPECT_EQ(applicator_branch.children.front().children.size(), 1);
-  const auto &dep_expansion{applicator_branch.children.front().children.at(0)};
-  EXPECT_TABLE_SIZE(dep_expansion, 3, 0, 1);
-  EXPECT_EQ(dep_expansion.children.front().label, "Any of");
-  EXPECT_EQ(dep_expansion.children.front().children.size(), 2);
+  EXPECT_EQ(applicator_branch.children.front().label, "Any of");
+  EXPECT_EQ(applicator_branch.children.front().children.size(), 2);
+
+  const auto &not_sub{applicator_branch.children.front().children.at(0)};
+  EXPECT_TABLE_SIZE(not_sub, 3, 1, 0);
+  EXPECT_WILDCARD_ROW_OBJECT_WITH_CONSTRAINTS(4, not_sub, 0, PATH(),
+                                              "must NOT match >= 1 properties");
+
+  const auto &dep_sub{applicator_branch.children.front().children.at(1)};
+  EXPECT_TABLE_SIZE(dep_sub, 5, 2, 0);
+  EXPECT_ROW_ANY(6, dep_sub, 0, PATH(LITERAL("name")), true);
+  EXPECT_ROW_ANY(7, dep_sub, 1, PATH(LITERAL("age")), true);
 
   const auto &typed_branch{all_of.children.at(1)};
-  EXPECT_TABLE_SIZE(typed_branch, 9, 2, 0);
+  EXPECT_TABLE_SIZE(typed_branch, 8, 2, 0);
   EXPECT_ROW_PRIMITIVE(
-      10, typed_branch, 0, PATH(LITERAL("name")),
+      9, typed_branch, 0, PATH(LITERAL("name")),
       sourcemeta::blaze::Documentation::Type::Expression::Primitive::String,
       false);
   EXPECT_ROW_PRIMITIVE(
-      11, typed_branch, 1, PATH(LITERAL("age")),
+      10, typed_branch, 1, PATH(LITERAL("age")),
       sourcemeta::blaze::Documentation::Type::Expression::Primitive::Integer,
       false);
 }
@@ -1857,8 +1902,8 @@ TEST(Documentation_2020_12, dynamic_ref_with_anchor) {
       sourcemeta::blaze::Documentation::Type::Expression::Primitive::String,
       false);
 
-  EXPECT_ROW_ARRAY_OF_DYNAMIC_REF(3, documentation, 2,
-                                  PATH(LITERAL("children")), false, "node");
+  EXPECT_ROW_ARRAY_OF_RECURSIVE_REF(3, documentation, 2,
+                                    PATH(LITERAL("children")), false, 1);
 }
 
 TEST(Documentation_2020_12, dynamic_ref_standalone) {

test/documentation/documentation_test_utils.h

@@ -930,6 +930,22 @@
     _EXPECT_ROW_NOTES_NONE(_row);                                              \
   }
 
+#define EXPECT_WILDCARD_ROW_OBJECT_WITH_CONSTRAINTS(                           \
+    expected_identifier, documentation, index, expected_path, ...)             \
+  {                                                                            \
+    const auto &_row{(documentation).rows.at((index))};                        \
+    _EXPECT_PATH(_row, expected_path);                                         \
+    EXPECT_EQ(_row.identifier, (expected_identifier));                         \
+    _EXPECT_ROW_BASE(_row);                                                    \
+    EXPECT_FALSE(_row.required.has_value());                                   \
+    EXPECT_TRUE(_row.type.badges.empty());                                     \
+    EXPECT_TRUE(std::holds_alternative<                                        \
+                sourcemeta::blaze::Documentation::Type::Expression::Object>(   \
+        _row.type.expression.value));                                          \
+    _EXPECT_CONSTRAINTS(_row, __VA_ARGS__);                                    \
+    _EXPECT_ROW_NOTES_NONE(_row);                                              \
+  }
+
 #define _EXPECT_BADGE(row, badge_index, expected_kind, expected_value)         \
   EXPECT_EQ((row).type.badges.at((badge_index)).kind, (expected_kind));        \
   EXPECT_EQ((row).type.badges.at((badge_index)).value, (expected_value));