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

Fix a test error in xspec-three-dots.xspec (multiple nodes in a document) #429

Merged
merged 671 commits into from
Apr 7, 2019

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Nov 16, 2018

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


Fixes a test error in test/end-to-end/cases/xspec-three-dots.xsl. The document node created by the variable was meant to contain multiple nodes, but actually contained a single element node.

No XSpec code change.

@AirQuick AirQuick added the test label Nov 16, 2018
@AirQuick AirQuick changed the title Fix a test error in xspec-three-dots.xspec (multiple nodes in a document) Fix a test error in xspec-three-dots.xspec (multiple nodes in a document) Nov 16, 2018
@AirQuick AirQuick added the bug label Nov 17, 2018
…talog

# Conflicts:
#	build.xml
#	test/ant/common/generate-build-worker.xsl
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…-151

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…-151

# Conflicts:
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…est_doc_multi-nodes

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…ic-env-vars

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…talog

# Conflicts:
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
…from-xquery-xml

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…result-naming-collision_label

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…result-naming-collision_e2e

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…-output-escaping

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…-folding-img-src

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…sult-prefixes

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…lize

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…ormat-xslt

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…erialize

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…359-367

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…-flags

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…diff

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…ort-value

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
…355-357-358-360-361

# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	build.xml
#	test/ant/README.md
#	test/ant/build.xml
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.xsl
#	test/end-to-end/processor/base/_util.xsl
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/processor/html/_serializer.xsl
#	test/end-to-end/processor/junit/_deserializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/junit/_serializer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	test/win-bats/collection.xml
# Conflicts:
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
# Conflicts:
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
# Conflicts:
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
# Conflicts:
#	bin/xspec.bat
#	bin/xspec.sh
#	java/com/jenitennison/xslt/tests/XSLTCoverageTraceListener.class
#	java/com/jenitennison/xslt/tests/XSLTCoverageTraceListener.java
#	src/common/xspec-utils.xsl
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-tests.xsl
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/reporter/format-xspec-report.xsl
#	src/reporter/junit-report.xsl
#	src/schematron/schut-to-xspec.xsl
#	test/end-to-end/cases/expected/query/xspec-focus-1-result.html
#	test/end-to-end/cases/expected/query/xspec-function-result.html
#	test/end-to-end/cases/expected/query/xspec-import-result.html
#	test/end-to-end/cases/expected/query/xspec-imported-result.html
#	test/end-to-end/cases/expected/query/xspec-pending-result.html
#	test/end-to-end/cases/expected/schematron/schematron-01-result.xml
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-coverage.html
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-153-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-177-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-177-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-177-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-214-coverage.html
#	test/end-to-end/cases/expected/stylesheet/xspec-214-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-214-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-23_2-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-23_2-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-23_2-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-50-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-55-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-67-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-67-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-ambiguous-expect-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-ambiguous-expect-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-focus-1-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-function-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-import-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-imported-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-pending-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-xslt2-result.xml
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/coverage/_serializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/xml/_normalizer.xsl
#	test/schematron-param-001.xspec
#	test/win-bats/collection.xml
#	test/xspec-space_stylesheet.xspec
#	test/xspec-utils.xspec
#	test/xspec.bats
…test-params

# Conflicts:
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	test/end-to-end/cases/expected/query/xspec-346-result.html
#	test/end-to-end/cases/expected/query/xspec-346-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-346-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-346-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-346-result.xml
#	test/end-to-end/cases/xspec-346.xspec
@AirQuick AirQuick added this to the v1.3.0 milestone Mar 11, 2019
…est_doc_multi-nodes

# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.xml
@AirQuick AirQuick merged commit a67d249 into xspec:master Apr 7, 2019
@AirQuick AirQuick deleted the fix_dots-test_doc_multi-nodes branch April 7, 2019 00:59
@AirQuick
Copy link
Member Author

AirQuick commented Apr 7, 2019

@cirulls
Merged this fix of a test error. (not a bug fix in XSpec code)

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