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 468 (XSLT and XQuery different attribute(date) in XML report) #469

Merged
merged 918 commits into from
May 24, 2019

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Nov 24, 2018

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


Fixes #468

This pull request fixes the XQuery compiler to align with the XSLT compiler.
Now /x:report/@date in XML report is timestamp of run time in both cases.

There is no specific test (until #559). I just updated the end-to-end test processor to ensure that the @date attribute is an instance of xs:dateTime.

…doc_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
…e-node-generator

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	test/win-bats/collection.xml
#	test/xspec.bats
…rom-del-cmd

# 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/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
# 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
…308_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
…nt-family

# 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
…-folding-img-src

# 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
…-cmdline

# Conflicts:
#	.travis.yml
#	appveyor.yml
This reverts commit bff83d3.
@AirQuick AirQuick added this to the v1.4.0 milestone Apr 30, 2019
@AirQuick AirQuick merged commit c4784f8 into xspec:master May 24, 2019
@AirQuick AirQuick deleted the fix_issue-468 branch May 24, 2019 02:13
@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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

XSLT and XQuery different attribute(date) in XML report
1 participant