TOOLSDEV-567: update tests and testing architecture#251
Open
ghyman-oreilly wants to merge 18 commits intostagingfrom
Open
TOOLSDEV-567: update tests and testing architecture#251ghyman-oreilly wants to merge 18 commits intostagingfrom
ghyman-oreilly wants to merge 18 commits intostagingfrom
Conversation
…summary Toolsdev 389 accessibility summary
Though the caller is expected to pass the values for these parameters, declaring them with a default value is best practice and allows the spec tests to pass.
Upgrading aligns us with the version of Saxon used by the Atlas workers, and it allows for testing against some of the more modern XSL features (e.g., exsl:node-set()) that have been incorporated in recent repo updates.
Update the OPF test suite to work correctly after the XSpec and Saxon upgrades. Add run-as="external" to the spec root, required by XSpec v3 for stylesheets that use certain XSLT features. Set generate.root.chunk to 0 globally to avoid context-dependent //h:section and /* expressions that break under external execution. Pass computed.identifier explicitly in the no-metadata scenario to satisfy the template's now-required input. Refactor the nav.in.spine scenarios from nested to sibling structure, and update assertions to use $x:result and the self:: axis rather than absolute XPath expressions, which no longer work under XSpec v3's evaluation model.
Add run-as="external" to the spec root, required by XSpec v3 for scenario-level <x:param> usage. Move nav.in.ncx from the deprecated <x:context>/<x:param> pattern to a scenario-level <x:param>, which was causing a "context item is absent" runtime error. Update not(exists(ncx:navPoint)) assertions to empty($x:result), which is the correct way to assert on mode output under XSpec v3's external execution model.
Add run-as="external" to enable scenario-level parameter overrides. Move the book-language override for the Spanish localization test to a scenario-level <x:param>, which is the correct pattern under XSpec v3's external execution model. Correct the expected heading value from Nota to nota to match what the Spanish localization file actually produces for the "note" key.
…wrappers for XSpec The HTMLBook → EPUB/chunked HTML pipeline runs via lxml/libxslt in production, which supports EXSL func:function syntax (functions-exsl.xsl). The XSpec test suite runs under Saxon HE 12.5, which does not. Both implement identical logic. Add wrapper stylesheets (xspec-chunk.xsl, xspec-epub.xsl, xspec-htmlbook.xsl) that import the core stylesheet and substitute functions-xslt2.xsl, allowing chunk.xspec, epub.xspec, fileextension.xspec, and tocgen.xspec to run under Saxon. Update htmlbook.xsl with a comment explaining the two-processor split so the rationale is clear to future maintainers.
Replace set:intersection() with XPath 2.0's intersect operator in htmlbook:chunk-for-node(), and remove the now-unused set: namespace declaration. functions-xslt2.xsl is used by the XSpec test suite (Saxon HE 12.5), which does not support EXSL set extensions. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…c files Several global params (book-language, generate.cover.html, metadata.unique-identifier, generate.root.chunk) have document-dependent computed defaults that reference the source tree via // expressions. Under XSpec's default (non-external) execution mode, no context document exists at param initialization time, causing XPDY0002 errors. Add run-as="external" and pin these params to static values in chunk.xspec, indexgen.xspec, ncx.xspec, tocgen.xspec, and xrefgen.xspec. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Three fixes to test expressions that were never valid: - contains(@type='text' and @title='...') passed a boolean to contains() instead of two strings; replace with a plain predicate conjunction. - every $chunk in (...) satisfies ... used $chunk as a range variable, conflicting with the $chunk param name in surrounding scenarios and causing a compile-time "variable not declared" error; rename to $dtype and use $x:result instead of /. - generate-id($chunk) in x:param/@select referenced a sibling param, which is not in scope within x:call; inline the document() expressions directly. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…ios in common.xspec Converts common.xspec to use xspec-htmlbook.xsl + run-as="external" (consistent with the other xspec files), and adds a book-language global param to avoid context-dependent initialization. This unlocks scenario-level <x:param> overrides for global stylesheet parameters. The five previously-pending stub scenarios that had empty <x:context> blocks (causing the entire test suite to abort with a fatal xsl:message) are now fully implemented: * Part and chapter labels with label.section.with.ancestors = 1 — demonstrates that top-level elements are unaffected (no ancestor sections) * Subsection label with label.section.with.ancestors = 1 — demonstrates the prepended ancestor label (1.a format) * Example label with label.formal.with.ancestor enabled and disabled
… XPDY0002 errors Several global params in epub.xsl have defaults that evaluate XPath against the source document (e.g. generate.root.chunk uses //h:section, computed.identifier uses ., metadata.title uses //h:head/h:title, metadata.rights and others use //h:head/h:meta). When called from XSpec named-template scenarios with no implicit source document, these cause XPDY0002 at runtime. Fixes: pin generate.root.chunk, computed.identifier, metadata.title, and metadata.modified as global <x:param> values. For scenarios that call templates which trigger the $chunks key variable in chunk.xsl (which requires a context item), provide <x:context href="skeleton.html"/> at the scenario level. Also fixes two remaining test="not(exists(ncx:navPoint))" assertions that fail on empty results — replaced with empty($x:result).
Switches common.xspec to xspec-htmlbook.xsl for Saxon HE 12.5 compatibility (no run-as="external" — import mode is correct here since no global param overrides are needed per-scenario). Implements previously-pending stubs that were broken in two ways: * class.attribute mode tests used //@Class absolute paths, which fail because XSpec cannot wrap an attribute node in a document root. Fixed to use $x:result instead (valid in XSpec v3+, import and external mode alike). * class.value/xref target tests used <x:param select="//*[@id='...']"> in child contexts, which XSpec v3.4.3 cannot evaluate against the parent's context document. Fixed to pass the target element as inline content — valid because semantic-name only inspects the node's element name, @data-Type, and @Class, never traversing the document. The three label.section.with.ancestors stubs are extracted to a new common-label-ancestors.xspec, which sets label.section.with.ancestors=1 as a description-level global param. Keeping them in common.xspec would have required run-as="external" and cascading fixes to ~14 existing tests.
… suites chunk.xsl: Fix stealth-XREF handler to accept and forward autogenerate.xref.pagenum.style param so data-xref-pagenum-style is generated when the param is enabled. Fix both XREF and non-XREF <a> fallback branches to output $calculated-output-href instead of the raw @href, so bogus hrefs are normalized (# prepended, chunk filename stripped) consistently. chunk.xspec: Update chap-num-title expectation to use curly-quoted title text (matching actual gentext output). Implement the Spanish chap-num-title localization scenario (previously stubbed as FILL ME IN LATER). Update cross-chunk href expectations to reflect that $chunks is empty in inline XSpec mode and chunk filenames cannot be computed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update testing architecture to use latest versions of Saxon and XSpec, which will support testing recent features added to the working templates, and fix tests so all tests are run and pass. A few changes made to the working templates to fix latent bugs and support testing.
We'll want to test a good set of cases in Atlas staging against builds in production to ensure the minimal changes made to the working XSL templates haven't adversely changed template behavior.