test(conformance): add a DTD content-model corpus

Grow the Tier-2 conformance corpus with 14 DTD content-model cases (sequence
order/completeness, choice exclusivity, the *, +, ? occurrence indicators,
#PCDATA, mixed content, EMPTY, and ANY) validated against the internal subset
and checked through the validation-driven harness. Own suite.

Part of #105 (Tier 2)
This commit is contained in:
Mihaela Mihaljevic 2026-06-10 02:32:58 +02:00
parent 0cf697c4ba
commit 1aea327709
3 changed files with 53 additions and 2 deletions

View File

@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Conformance corpus harness (#105, Tier 2): the start of conformance-suite checking, expressed through the validation framework (the OpenAPIKit idiom). A `PureXML.Validation.ConformanceCase` is a `Validatable` named expectation (actual vs spec-authoritative expected output), and `Conformance.matchesExpected` is a `Validation<ConformanceCase, Void>` rule that emits one located `ValidationError` per diverging case, so a whole suite reports every failure at once with the case name as its coding path. Seeded with a Canonical XML 1.0 corpus (attribute ordering, empty-element expansion, comment removal, CDATA-to-escaped-text, processing instructions, namespace rendering) an XPath 1.0 core-function corpus, and an XSD datatype/facet corpus (length, range, pattern, enumeration, lexical space), a RELAX NG pattern corpus (text, optional, repetition, choice, ordered group, attribute, interleave, empty), an XSLT 1.0 transformation corpus (value-of, for-each, if, choose, sort, variable, format-number, apply-templates, call-template), an HTML5 tree-construction corpus (void elements, implied tag closing, case normalization, the adoption agency, entities), a Schematron corpus (assert, report, rule context), a C14N exclusive/2.0 corpus (unused-namespace dropping, render-at-use, whitespace trimming), and an XPath axes/predicates corpus (descendant, ancestor, sibling axes, positional and attribute predicates, union). The HTML corpus surfaced its first divergence (the fragment parser does not reconstruct active formatting elements like the document parser, tracked as #109). Growing the corpora against the official W3C/OASIS suites is the ongoing Tier-2 work.
- Conformance corpus harness (#105, Tier 2): the start of conformance-suite checking, expressed through the validation framework (the OpenAPIKit idiom). A `PureXML.Validation.ConformanceCase` is a `Validatable` named expectation (actual vs spec-authoritative expected output), and `Conformance.matchesExpected` is a `Validation<ConformanceCase, Void>` rule that emits one located `ValidationError` per diverging case, so a whole suite reports every failure at once with the case name as its coding path. Seeded with a Canonical XML 1.0 corpus (attribute ordering, empty-element expansion, comment removal, CDATA-to-escaped-text, processing instructions, namespace rendering) an XPath 1.0 core-function corpus, and an XSD datatype/facet corpus (length, range, pattern, enumeration, lexical space), a RELAX NG pattern corpus (text, optional, repetition, choice, ordered group, attribute, interleave, empty), an XSLT 1.0 transformation corpus (value-of, for-each, if, choose, sort, variable, format-number, apply-templates, call-template), an HTML5 tree-construction corpus (void elements, implied tag closing, case normalization, the adoption agency, entities), a Schematron corpus (assert, report, rule context), a C14N exclusive/2.0 corpus (unused-namespace dropping, render-at-use, whitespace trimming), an XPath axes/predicates corpus (descendant, ancestor, sibling axes, positional and attribute predicates, union), and a DTD content-model corpus (sequence, choice, occurrence indicators, mixed, EMPTY, ANY). The HTML corpus surfaced its first divergence (the fragment parser does not reconstruct active formatting elements like the document parser, tracked as #109). Growing the corpora against the official W3C/OASIS suites is the ongoing Tier-2 work.
- EXSLT extension functions (#105, Tier 3): the `common`, `math`, and `sets` EXSLT modules, dispatched by resolving a function's prefix to its namespace (so any prefix bound to an EXSLT namespace works). `math:min`, `math:max`, `math:highest`, `math:lowest`, `math:abs`, `math:sqrt` (with the EXSLT NaN rule for non-numeric nodes); `set:distinct`, `set:difference`, `set:intersection`, `set:has-same-node`, `set:leading`, `set:trailing` (by node identity and document order); `exsl:object-type`. `math:power` and the other transcendentals are omitted because they need a C math library, which the pure-Swift, Foundation-free target excludes; `exsl:node-set` awaits result-tree-fragment support.
- Canonical XML 1.1 (#105, Tier 3): a `Canonical.Options.canonical11` preset and a `mergeInheritedBase` option. When canonicalizing a document subset, the `xml:base` values of the apex's omitted ancestors are merged into the apex by RFC 3986 reference resolution (vs. 1.0's nearest-ancestor rule), the apex's own relative `xml:base` is resolved against that chain, and `xml:id` is no longer inherited; `xml:lang` and `xml:space` still inherit the nearest. A self-contained RFC 3986 resolver (scheme/authority/path parsing, path merging, dot-segment removal) backs the merge.
- Single-byte legacy encodings (#97): the byte decoder gains a table-based single-byte path and the full set of single-byte legacy encodings, selected by the XML declaration's `encoding` name for both the whole-buffer and streaming decoders: the complete ISO-8859 family (parts 2 through 16), Windows-1250/1251/1253/1254/1255/1256/1257/1258, and KOI8-R/U. Most are vendored verbatim from the authoritative `unicode.org` mapping files; ISO-8859-5/9/15 are derived exactly; Windows-1254 composes from Windows-1252. Multi-byte CJK encodings (#99) are tracked separately.

View File

@ -99,7 +99,7 @@ flowchart TB
PureXML is a working, dependency-free XML library today: parse, emit, validate,
query, and stream documents on macOS, Linux, Windows, and WASM. The test suite
currently runs **819 tests in 128 suites** (`swift test`).
currently runs **820 tests in 129 suites** (`swift test`).
### Shipped (libxml2-aligned surface)

View File

@ -0,0 +1,51 @@
@testable import PureXML
import Testing
/// DTD content-model conformance, driven through the validation framework (its
/// own suite to keep the main corpus under the cap).
@Suite("Conformance corpus: DTD content models")
struct ConformanceDTDTests {
private struct DTDSpec {
let name: String
let model: String
let xml: String
let valid: Bool
}
/// Sequences, choices, occurrence indicators, mixed, EMPTY, and ANY content
/// models, validated against the verdict the XML 1.0 DTD rules prescribe.
private func corpus() throws -> [PureXML.Validation.ConformanceCase] {
let specs = [
DTDSpec(name: "sequence-ok", model: "(b,c)", xml: "<a><b/><c/></a>", valid: true),
DTDSpec(name: "sequence-wrong-order", model: "(b,c)", xml: "<a><c/><b/></a>", valid: false),
DTDSpec(name: "sequence-missing", model: "(b,c)", xml: "<a><b/></a>", valid: false),
DTDSpec(name: "choice-ok", model: "(b|c)", xml: "<a><c/></a>", valid: true),
DTDSpec(name: "choice-both-rejected", model: "(b|c)", xml: "<a><b/><c/></a>", valid: false),
DTDSpec(name: "star-empty", model: "(b)*", xml: "<a></a>", valid: true),
DTDSpec(name: "star-many", model: "(b)*", xml: "<a><b/><b/></a>", valid: true),
DTDSpec(name: "plus-requires-one", model: "(b)+", xml: "<a></a>", valid: false),
DTDSpec(name: "optional-too-many", model: "(b)?", xml: "<a><b/><b/></a>", valid: false),
DTDSpec(name: "pcdata-text", model: "(#PCDATA)", xml: "<a>t</a>", valid: true),
DTDSpec(name: "pcdata-rejects-child", model: "(#PCDATA)", xml: "<a><b/></a>", valid: false),
DTDSpec(name: "mixed-content", model: "(#PCDATA|b)*", xml: "<a>t<b/>u</a>", valid: true),
DTDSpec(name: "empty-rejects-content", model: "EMPTY", xml: "<a>x</a>", valid: false),
DTDSpec(name: "any-allows-anything", model: "ANY", xml: "<a><b/>x</a>", valid: true),
]
return try specs.map { spec in
let dtd = "<!ELEMENT a \(spec.model)><!ELEMENT b EMPTY><!ELEMENT c EMPTY>"
let doc = "<!DOCTYPE a [\(dtd)]>\(spec.xml)"
let errors = try PureXML.validateAgainstInternalDTD(doc)
return PureXML.Validation.ConformanceCase(
name: spec.name,
actual: errors.isEmpty ? "valid" : "invalid",
expected: spec.valid ? "valid" : "invalid",
)
}
}
@Test("The DTD content-model conformance corpus passes with no located failures")
func test_dtdCorpusConforms() throws {
let failures = try PureXML.Validation.Conformance.failures(in: corpus())
#expect(failures.isEmpty, "\(failures.map(\.reason))")
}
}