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 issue 356 (! is missing from reported comment) #366

Merged
merged 264 commits into from
Mar 9, 2019

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Sep 12, 2018

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


Fixes #356

…k/xspec into fix_xspec-result-naming-collision_e2e

# Conflicts:
#	appveyor.yml
#	build.xml
#	test/xspec-bat.cmd
#	test/xspec.bats
…talog

# Conflicts:
#	build.xml
#	test/ant/common/generate-build-worker.xsl
#	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
…from-xquery-xml

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…talog

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…talog

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…nto rm-pkg-ns-from-xquery-xml

# Conflicts:
#	bin/xspec.bat
#	build.xml
#	test/ant/common/generate-build-worker.xsl
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/base/compare.xsl
#	test/end-to-end/processor/base/normalize.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/xspec.bats
…result-naming-collision_e2e

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…result-naming-collision_label

# 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
…result-naming-collision_label

# 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
…result-naming-collision_e2e

# 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
# 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
@AirQuick AirQuick added this to the v1.3.0 milestone Feb 11, 2019
…result-naming-collision_label

# Conflicts:
#	bin/xspec.sh
#	java/com/jenitennison/xslt/tests/XSLTCoverageTraceListener.class
#	java/com/jenitennison/xslt/tests/XSLTCoverageTraceListener.java
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/xml/_normalizer.xsl
#	test/win-bats/collection.xml
#	test/xspec-space_stylesheet.xspec
#	test/xspec.bats
@AirQuick AirQuick merged commit 69b4917 into xspec:master Mar 9, 2019
@AirQuick AirQuick deleted the fix_issue-356 branch March 9, 2019 00:10
@AirQuick
Copy link
Member Author

AirQuick commented Mar 9, 2019

@cirulls
Merged this bug fix.

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

Successfully merging this pull request may close these issues.

! is missing from reported comment
2 participants