Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace xsl:value-of with xsl:sequence in schematron-019.sch #495

Merged
merged 1,097 commits into from
Jun 20, 2019

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Jan 2, 2019

This pull request derives from #494. So needs to be handled after that.


F:\xspec\test>..\bin\xspec.bat -s schematron-019.xspec
...
Running Tests...
Warning at function e:add on line 30 of schematron-019.sch-compiled.xsl:
  SXWN9000: A function that computes atomic values should use xsl:sequence rather than xsl:value-of
Testing with SAXON EE 9.9.0.2

This pull request just addresses this warning.

No change in actual tests.

…alid-xsl

# Conflicts:
#	bin/xspec.bat
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	bin/xspec.bat
#	test/win-bats/collection.xml
#	test/xspec.bats
…-cmdline

# Conflicts:
#	bin/xspec.bat
#	test/win-bats/collection.xml
#	test/xspec.bats
…-ant

# Conflicts:
#	bin/xspec.bat
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/xspec-rule.xspec
#	test/win-bats/collection.xml
#	test/xspec-node-selection.xspec
#	test/xspec.bats
…-59-2_xquery

# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/xspec-rule.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…-151

# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/xspec-rule.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…d-like

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…erwise

# Conflicts:
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…-output-escaping

# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…-folding-img-src

# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…sult-prefixes

# Conflicts:
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…lize

# Conflicts:
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…ormat-xslt

# Conflicts:
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…erialize

# Conflicts:
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…359-367

# Conflicts:
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…-flags

# Conflicts:
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…diff

# Conflicts:
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…ort-value

# Conflicts:
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…355-357-358-360-361

# Conflicts:
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…e-type

# Conflicts:
#	test/xspec-result-naming-collision.xspec
@AirQuick AirQuick requested a review from vincentml March 14, 2019 17:15
@AirQuick AirQuick added this to the v1.4.0 milestone Apr 30, 2019
…ce-in-sch-019

# Conflicts:
#	test/xspec.bats
@AirQuick AirQuick merged commit 075be3e into xspec:master Jun 20, 2019
@AirQuick AirQuick deleted the xsl-sequence-in-sch-019 branch June 20, 2019 09:46
@AirQuick
Copy link
Member Author

@cirulls
Merged this bug fix in a test.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant