|
From: Dannes W. <no...@gi...> - 2026-10-12 19:10:25
|
Branch: refs/heads/develop Home: https://github.com/eXist-db/exist Commit: 20351cb51c1bfd53d51f45ec70fa75b07916652a https://github.com/eXist-db/exist/commit/20351cb51c1bfd53d51f45ec70fa75b07916652a Author: Joe Wicentowski <jo...@gm...> Date: 2026-08-30 (Sun, 30 Aug 2026) Changed paths: A exist-core/src/test/xquery/xquery3/fnSerializeExtensionParamKeyForms.xqm M extensions/modules/file/src/main/java/org/exist/xquery/modules/file/Sync.java M extensions/modules/file/src/test/xquery/modules/file/sync-serialize.xqm Log Message: ----------- [bugfix] file:sync: honor exist:expand-xincludes supplied via the options map file:sync's 3rd-argument options map (since 6.1.0) accepts serialization options, but the eXist extension parameter expand-xincludes could not be set to a non-default value: it was silently overwritten by the hard-coded default. SerializerUtils.getSerializationOptions reads W3C parameters by their string key but the eXist extension parameters by their exist-namespace QName key; Sync.getOptions' "fill defaults" loop re-checked the input map by the bare string key only, so for an exist-namespaced parameter the lookup always missed and the default clobbered the supplied value. Fix: the "supplied?" check (extracted as suppliedInOptionsMap) tests both key forms -- the bare string key for W3C parameters and the exist-namespace QName key for the extension parameters. Tests use the spec-conformant exist-namespace QName key as the primary form (the existing insert-final-newline tests are converted to it too). A canonical test (fnSerializeExtensionParamKeyForms.xqm) documents the key-form contract for exist serialization parameters: the QName key is honored; the prefixed "exist:..." string key and the bare local name are both ignored. Depends on the MapType same-key conformance fix (eXist-db/exist#6491, merged 2026-08-18): that PR removed the map key-coercion that previously let a bare "exist:..." string key match an exist serialization parameter, so this branch's tests assume the QName-only behavior. Relates to https://github.com/eXist-db/exist/issues/3704 (the options-map key-matching defect; the conf.xml-default-reading half of #3704 remains open). Co-Authored-By: Claude Opus 4.8 (1M context) <no...@an...> Commit: e52e92cf30559a3b996a79eda4660e724fe9ce35 https://github.com/eXist-db/exist/commit/e52e92cf30559a3b996a79eda4660e724fe9ce35 Author: Joe Wicentowski <jo...@gm...> Date: 2026-08-30 (Sun, 30 Aug 2026) Changed paths: M exist-core/src/test/xquery/xquery3/fnSerializeExtensionParamKeyForms.xqm M extensions/modules/file/src/test/xquery/modules/file/sync-serialize.xqm Log Message: ----------- [test] Strengthen the serialization key-form assertions Duncan's review point on eXist-db/exist#6492: %test:assertTrue on a contains() predicate reports only "expected true but was false" -- the serialized output that actually differed never reaches the failure message, so a regression here told you nothing about what went wrong. Return the serialized document (or the synced file's contents) from each test function and assert with %test:assertXPath instead, one annotation per condition. XQSuite binds the returned value to $result and prints it on failure, and splitting the conjunctions means a failure pinpoints which half broke rather than collapsing both into a single false. Deliberately breaking one predicate now reports: expected:<[contains($result, 'DELIBERATE_BREAK') (assertXPath failed.)]> but was:<[<doc xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="target.xml"/></doc>]> The pre-existing %test:assertEquals("true", "true") + helper:assert-file-contents pattern elsewhere in sync-serialize.xqm is left alone; converting it is unrelated to this fix. Co-Authored-By: Claude Opus 5 <no...@an...> Commit: b57ae3255d3f7e6c797441d7d5e8f42a62a4270a https://github.com/eXist-db/exist/commit/b57ae3255d3f7e6c797441d7d5e8f42a62a4270a Author: Dannes Wessels <di...@us...> Date: 2026-10-12 (Mon, 12 Oct 2026) Changed paths: A exist-core/src/test/xquery/xquery3/fnSerializeExtensionParamKeyForms.xqm M extensions/modules/file/src/main/java/org/exist/xquery/modules/file/Sync.java M extensions/modules/file/src/test/xquery/modules/file/sync-serialize.xqm Log Message: ----------- Merge pull request #6492 from joewiz/bugfix/filesync-expand-xincludes-map [bugfix] file:sync: honor exist:expand-xincludes supplied via the options map Compare: https://github.com/eXist-db/exist/compare/31bc2ec90b67...b57ae3255d3f To unsubscribe from these emails, change your notification settings at https://github.com/eXist-db/exist/settings/notifications |