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 355 357 358 360 361 (broken report) #380

Merged
merged 405 commits into from
Mar 16, 2019

Conversation

AirQuick
Copy link
Member

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


Fixes #355
Fixes #357
Fixes #358
Fixes #360
Fixes #361

The reporting template in generate-tests-utils.xsl assumes only a few patterns of items.
This pull request revises the template to handle various items.

This reverts commit 3de253c.
@AirQuick AirQuick added this to the v1.3.0 milestone Feb 17, 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
…355-357-358-360-361

# Conflicts:
#	src/compiler/generate-tests-utils.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-177-junit.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/expected/stylesheet/xspec-ambiguous-expect-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-result-naming-collision-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-result-naming-collision-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-result-naming-collision-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-serialize-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-serialize-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-serialize-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.html
#	test/end-to-end/cases/xspec-result-naming-collision.xspec
#	test/end-to-end/processor/xml/_normalizer.xsl
@AirQuick AirQuick merged commit 4d75a81 into xspec:master Mar 16, 2019
@AirQuick AirQuick deleted the fix_issue-355-357-358-360-361 branch March 16, 2019 23:44
@AirQuick
Copy link
Member Author

@cirulls
Merged this bug fix.

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