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

Test ... on XQuery and fix reporting node order #458

Merged
merged 836 commits into from
May 2, 2019

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Nov 21, 2018

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


Following #457, this pull request enables testing the ... feature on XQuery.
Also fixed an XQuery issue in reporting node order.

  • 049777c enables testing the ... feature on XQuery. (The test passes (incorrectly) on Saxon 9.7, but fails (correctly) on 9.8 and 9.9.)
  • a7434cc fixes it.

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/xspec.bats
…ic-env-vars

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
…ort-ws

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
…e-node-generator

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
…alid-xsl

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
…-cmdline

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
…-ant

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
…445-452

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
…test_xquery

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
…-dots_xquery

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/win-bats/generate.xsl
#	test/xspec.bats
This reverts commit 3396ae0.
This reverts commit bff83d3.
@AirQuick AirQuick added this to the v1.3.0 milestone Mar 30, 2019
@AirQuick AirQuick mentioned this pull request Apr 30, 2019
…-dots_xquery

# Conflicts:
#	src/compiler/generate-query-utils.xql
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/xspec-three-dots.xspec
@AirQuick AirQuick merged commit d448ec3 into xspec:master May 2, 2019
@AirQuick AirQuick deleted the test_three-dots_xquery branch May 2, 2019 04:53
@AirQuick
Copy link
Member Author

AirQuick commented May 2, 2019

@cirulls
Merged an enhancement of test and a bug fix.

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