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

Remove disable-output-escaping #369

Merged
merged 283 commits into from
Mar 9, 2019

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Sep 18, 2018

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


coverage-report.xsl and format-xspec-report.xsl in src/reporter/ use @disable-output-escaping which is deprecated and distracting.
This pull request replaces it with a character map.

I manually tested the pull request and verified these things:

  • xspec.bat -c tutorial\coverage\demo.xspec generates the same demo-coverage.html and demo-result.html as the previous commit (except for timestap).
  • ant -lib "saxon9ee.jar" -Dxspec.xml=tutorial\coverage\demo.xspec -Dxspec.coverage.enabled=true generates the same demo-coverage.html and demo-result.html as xspec.bat (except for timestamp).
  • java -cp "xmlcalabash.jar" com.xmlcalabash.drivers.Main -i source=tutorial/coverage/demo.xspec -p xspec-home=file:///[XSpec]/ -o result=tutorial/coverage/demo-result.html src\harnesses\saxon\saxon-xslt-harness.xproc generates the same demo-result.html as the previous commit (except for timestamp).
  • ant -lib "saxon9ee.jar" -Dxspec.xml=tutorial\coverage\demo.xspec -Dxspec.html.reporter.xsl=src\reporter\format-xspec-report-folding.xsl generates the same demo-result.html as the previous commit (except for timestamp).

…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
# 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
# Conflicts:
#	src/reporter/coverage-report.xsl
#	src/reporter/format-xspec-report.xsl
@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
…-output-escaping

# Conflicts:
#	src/reporter/coverage-report.xsl
#	src/reporter/format-utils.xsl
#	src/reporter/format-xspec-report.xsl
@AirQuick AirQuick merged commit a16e6bd into xspec:master Mar 9, 2019
@AirQuick AirQuick deleted the rm-disable-output-escaping branch March 9, 2019 22:41
@AirQuick
Copy link
Member Author

AirQuick commented Mar 9, 2019

@cirulls
Merged this internal improvement.

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

2 participants