leptris 1.9.320.0-arm-linux → 1.9.321.0-arm-linux

data/vendor-src/libleptris/test/xsd/test_xsd_compile.cpp

@@ -264,3 +264,256 @@ TEST(XsdDatatypes, LocalBaseChainValidatesEveryHop) {
 }
 
 }  // namespace
+
+// ---- slice 3: content models ---------------------------------------
+namespace {
+
+const char* k_cm_schema =
+    "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\""
+    " targetNamespace=\"urn:t\">"
+    "<xs:complexType name=\"pairT\">"
+    "<xs:sequence>"
+    "<xs:element name=\"a\"/>"
+    "<xs:element name=\"b\"/>"
+    "</xs:sequence></xs:complexType>"
+    "<xs:element name=\"pair\" type=\"pairT\"/>"
+
+    "<xs:complexType name=\"pickT\">"
+    "<xs:choice>"
+    "<xs:element name=\"x\"/>"
+    "<xs:element name=\"y\"/>"
+    "</xs:choice></xs:complexType>"
+    "<xs:element name=\"pick\" type=\"pickT\"/>"
+
+    "<xs:complexType name=\"twoToThreeT\">"
+    "<xs:sequence>"
+    "<xs:element name=\"a\" minOccurs=\"2\" maxOccurs=\"3\"/>"
+    "</xs:sequence></xs:complexType>"
+    "<xs:element name=\"twoToThree\" type=\"twoToThreeT\"/>"
+
+    "<xs:complexType name=\"listT\">"
+    "<xs:sequence>"
+    "<xs:element name=\"item\" maxOccurs=\"unbounded\"/>"
+    "</xs:sequence></xs:complexType>"
+    "<xs:element name=\"list\" type=\"listT\"/>"
+
+    "<xs:complexType name=\"looseT\">"
+    "<xs:sequence>"
+    "<xs:any namespace=\"##other\" processContents=\"skip\"/>"
+    "</xs:sequence></xs:complexType>"
+    "<xs:element name=\"loose\" type=\"looseT\"/>"
+
+    "<xs:complexType name=\"nestedT\">"
+    "<xs:sequence>"
+    "<xs:choice>"
+    "<xs:element name=\"x\"/>"
+    "<xs:element name=\"y\"/>"
+    "</xs:choice>"
+    "<xs:element name=\"c\"/>"
+    "</xs:sequence></xs:complexType>"
+    "<xs:element name=\"nested\" type=\"nestedT\"/>"
+
+    "<xs:element name=\"text\" type=\"xs:string\"/>"
+    "</xs:schema>";
+
+LeptrisXsdSchema compile_cm() {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisXsdSchema s =
+        leptris_xsd_compile(k_cm_schema, strlen(k_cm_schema), &st);
+    EXPECT_EQ(st, LEPTRIS_OK);
+    return s;
+}
+
+TEST(XsdContent, SequenceInOrder) {
+    LeptrisXsdSchema s = compile_cm();
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    const char* ab[] = {"a", "b"};
+    EXPECT_EQ(leptris_xsd_content_valid(s, "pair", ab, NULL, 2), 1);
+    const char* ba[] = {"b", "a"};
+    EXPECT_EQ(leptris_xsd_content_valid(s, "pair", ba, NULL, 2), 0);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "pair", ab, NULL, 1), 0);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "pair", NULL, NULL, 0), 0);
+    leptris_xsd_free(s);
+}
+
+TEST(XsdContent, ChoicePicksExactlyOne) {
+    LeptrisXsdSchema s = compile_cm();
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    const char* x[] = {"x"};
+    const char* y[] = {"y"};
+    const char* xy[] = {"x", "y"};
+    EXPECT_EQ(leptris_xsd_content_valid(s, "pick", x, NULL, 1), 1);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "pick", y, NULL, 1), 1);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "pick", xy, NULL, 2), 0);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "pick", NULL, NULL, 0), 0);
+    leptris_xsd_free(s);
+}
+
+TEST(XsdContent, OccurrenceBoundsHold) {
+    LeptrisXsdSchema s = compile_cm();
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    const char* a1[] = {"a"};
+    const char* a2[] = {"a", "a"};
+    const char* a3[] = {"a", "a", "a"};
+    const char* a4[] = {"a", "a", "a", "a"};
+    SCOPED_TRACE("a1");
+    EXPECT_EQ(leptris_xsd_content_valid(s, "twoToThree", a1, NULL, 1), 0);
+    SCOPED_TRACE("a2");
+    EXPECT_EQ(leptris_xsd_content_valid(s, "twoToThree", a2, NULL, 2), 1);
+    SCOPED_TRACE("a3");
+    EXPECT_EQ(leptris_xsd_content_valid(s, "twoToThree", a3, NULL, 3), 1);
+    SCOPED_TRACE("a4");
+    EXPECT_EQ(leptris_xsd_content_valid(s, "twoToThree", a4, NULL, 4), 0);
+    leptris_xsd_free(s);
+}
+
+TEST(XsdContent, UnboundedRepeats) {
+    LeptrisXsdSchema s = compile_cm();
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    const char* i3[] = {"item", "item", "item"};
+    const char* i30[30];
+    for (int i = 0; i < 30; i++) i30[i] = "item";
+    EXPECT_EQ(leptris_xsd_content_valid(s, "list", NULL, NULL, 0), 0);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "list", i3, NULL, 3), 1);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "list", i30, NULL, 30), 1);
+    leptris_xsd_free(s);
+}
+
+TEST(XsdContent, WildcardNamespaceFilter) {
+    LeptrisXsdSchema s = compile_cm();
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    /* ##other: anything qualified OUTSIDE urn:t */
+    const char* w[] = {"widget"};
+    const char* tns[] = {"urn:t"};
+    const char* other[] = {"urn:elsewhere"};
+    EXPECT_EQ(leptris_xsd_content_valid(s, "loose", w, other, 1), 1);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "loose", w, tns, 1), 0);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "loose", w, NULL, 1), 0);
+    leptris_xsd_free(s);
+}
+
+TEST(XsdContent, NestedGroupsCompose) {
+    LeptrisXsdSchema s = compile_cm();
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    const char* xc[] = {"x", "c"};
+    const char* yc[] = {"y", "c"};
+    const char* cc[] = {"c", "c"};
+    EXPECT_EQ(leptris_xsd_content_valid(s, "nested", xc, NULL, 2), 1);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "nested", yc, NULL, 2), 1);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "nested", cc, NULL, 2), 0);
+    leptris_xsd_free(s);
+}
+
+TEST(XsdContent, SimpleTypedElementTakesNoChildren) {
+    LeptrisXsdSchema s = compile_cm();
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    const char* x[] = {"x"};
+    EXPECT_EQ(leptris_xsd_content_valid(s, "text", NULL, NULL, 0), 1);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "text", x, NULL, 1), 0);
+    EXPECT_EQ(leptris_xsd_content_valid(s, "noSuchElement", x, NULL, 1),
+              -1);
+    leptris_xsd_free(s);
+}
+
+}  // namespace
+
+// ---- slice 4: instance validation ----------------------------------
+namespace {
+
+const char* k_v_schema =
+    "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+    "<xs:complexType name=\"rowT\">"
+    "<xs:sequence>"
+    "<xs:element name=\"id\" type=\"xs:integer\"/>"
+    "<xs:element name=\"name\" type=\"xs:string\"/>"
+    "</xs:sequence>"
+    "<xs:attribute name=\"status\" type=\"xs:string\"/>"
+    "<xs:attribute name=\"version\" type=\"xs:integer\""
+    " use=\"required\"/>"
+    "</xs:complexType>"
+    "<xs:element name=\"rows\" type=\"rowT\"/>"
+    "<xs:element name=\"count\" type=\"xs:positiveInteger\"/>"
+    "</xs:schema>";
+
+int validate_doc(const char* schema, const char* xml) {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisXsdSchema s =
+        leptris_xsd_compile(schema, strlen(schema), &st);
+    if (!s) return -2;
+    LeptrisDocument d = leptris_parse_string(xml, strlen(xml), &st);
+    if (!d) {
+        leptris_xsd_free(s);
+        return -3;
+    }
+    int r = leptris_xsd_validate(s, d);
+    leptris_document_free(d);
+    leptris_xsd_free(s);
+    return r;
+}
+
+TEST(XsdValidate, ValidDocumentPasses) {
+    EXPECT_EQ(validate_doc(k_v_schema,
+                           "<rows version=\"2\" status=\"ok\">"
+                           "<id>7</id><name>abc</name></rows>"), 1);
+    EXPECT_EQ(validate_doc(k_v_schema, "<count>3</count>"), 1);
+}
+
+TEST(XsdValidate, ContentModelViolationReports) {
+    EXPECT_EQ(validate_doc(k_v_schema,
+                           "<rows version=\"1\">"
+                           "<name>abc</name><id>7</id></rows>"), 0);
+}
+
+TEST(XsdValidate, RequiredAttributeAbsentReports) {
+    int r = validate_doc(k_v_schema, "<rows><id>7</id><name>a</name></rows>");
+    EXPECT_EQ(r, 0);
+}
+
+TEST(XsdValidate, AttributeTypeViolationReports) {
+    EXPECT_EQ(validate_doc(k_v_schema,
+                           "<rows version=\"x\"><id>7</id>"
+                           "<name>a</name></rows>"), 0);
+}
+
+TEST(XsdValidate, ElementTextTypeViolationReports) {
+    EXPECT_EQ(validate_doc(k_v_schema, "<count>-2</count>"), 0);
+    EXPECT_EQ(validate_doc(k_v_schema, "<count>0</count>"), 0);
+}
+
+TEST(XsdValidate, ChildElementTypeViolationReports) {
+    EXPECT_EQ(validate_doc(k_v_schema,
+                           "<rows version=\"1\">"
+                           "<id>nan</id><name>a</name></rows>"), 0);
+}
+
+TEST(XsdValidate, ErrorsEnumerate) {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisXsdSchema s =
+        leptris_xsd_compile(k_v_schema, strlen(k_v_schema), &st);
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    const char* bad = "<rows><id>nan</id><name>a</name></rows>";
+    LeptrisDocument d = leptris_parse_string(bad, strlen(bad), &st);
+    ASSERT_NE(d, nullptr);
+    int r = leptris_xsd_validate(s, d);
+    EXPECT_EQ(r, 0);
+    EXPECT_GE(leptris_xsd_error_count(s), 1u);
+    const char* first = leptris_xsd_error_at(s, 0);
+    EXPECT_NE(first, nullptr);
+    EXPECT_EQ(leptris_xsd_error_at(s, 99), nullptr);
+    leptris_document_free(d);
+    leptris_xsd_free(s);
+}
+
+TEST(XsdValidate, NullTolerant) {
+    LeptrisStatus st = LEPTRIS_OK;
+    LeptrisXsdSchema s =
+        leptris_xsd_compile(k_v_schema, strlen(k_v_schema), &st);
+    ASSERT_NE(s, (LeptrisXsdSchema)0);
+    EXPECT_EQ(leptris_xsd_validate(NULL, NULL), -1);
+    EXPECT_EQ(leptris_xsd_validate(s, NULL), -1);
+    EXPECT_EQ(leptris_xsd_error_count(NULL), 0u);
+    EXPECT_EQ(leptris_xsd_error_at(NULL, 0), nullptr);
+    leptris_xsd_free(s);
+}
+
+}  // namespace

data/vendor-src/libleptris/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "leptris",
-  "version": "1.9.320",
+  "version": "1.9.321",
   "description": "High-performance XML parser and XPath 1.0 engine in C (libleptris)",
   "homepage": "https://github.com/leptris/leptris",
   "license": "MIT",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leptris
 version: !ruby/object:Gem::Version
-  version: 1.9.320.0
+  version: 1.9.321.0
 platform: arm-linux
 authors:
 - Ribose Inc.
@@ -697,7 +697,9 @@ files:
 - vendor-src/libleptris/src/leptris/xpath/xpath_variables.h
 - vendor-src/libleptris/src/leptris/xquery/xquery.c
 - vendor-src/libleptris/src/leptris/xsd/compile.c
+- vendor-src/libleptris/src/leptris/xsd/content_model.c
 - vendor-src/libleptris/src/leptris/xsd/datatypes.c
+- vendor-src/libleptris/src/leptris/xsd/validate.c
 - vendor-src/libleptris/src/leptris/xsd/xsd_internal.h
 - vendor-src/libleptris/src/leptris/xslt/xslt_exec.c
 - vendor-src/libleptris/src/leptris/xslt/xslt_functions.c