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

Use fixed date time stamp in end-to-end test #559

Merged
merged 1,307 commits into from
Jul 28, 2019
Merged

Conversation

AirQuick
Copy link
Member

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


The end-to-end test normalizes the runtime date time strings to ONCE-UPON-A-TIME:

XML

HTML

This pull request removes that naive normalization.

Instead, this pull request sets Saxon -now:2000-01-01T00:00:00Z command line option:

XML

HTML

<p>Tested: 1 January 2000 at 00:00</p>

# Conflicts:
#	test/end-to-end/cases/expected/query/xspec-153-result.html
# Conflicts:
#	test/generate-tests-utils.xspec
# Conflicts:
#	test/end-to-end/cases/expected/query/xspec-67-result.html
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
# Conflicts:
#	test/generate-tests-utils.xspec
# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
…01-22

# Conflicts:
#	.travis.yml
#	appveyor.yml
This reverts commit e67a373.
…t-css-uri

# Conflicts:
#	bin/xspec.bat
#	bin/xspec.sh
#	src/common/xspec-utils.xsl
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-tests.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schematron/schut-to-xspec.xsl
#	test/ant/build.xml
#	test/ant/worker/build-worker_util.xml
#	test/ant/worker/generate.xsl
#	test/end-to-end/cases/expected/schematron/schematron-01-result.html
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-153-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-50-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-55-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-67-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-ambiguous-expect-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-focus-1-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-function-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-import-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-imported-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-pending-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-xslt2-result.html
#	test/end-to-end/processor/base/_normalizer.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/xspec-utils.xspec
#	test/xspec.bats
…nario-block

# Conflicts:
#	src/reporter/format-xspec-report.xsl
#	test/end-to-end/cases/expected/query/xspec-153-result.html
#	test/end-to-end/cases/expected/query/xspec-177-result.html
#	test/end-to-end/cases/expected/query/xspec-346-result.html
#	test/end-to-end/cases/expected/query/xspec-452-result.html
#	test/end-to-end/cases/expected/query/xspec-467-result.html
#	test/end-to-end/cases/expected/query/xspec-67-result.html
#	test/end-to-end/cases/expected/query/xspec-ambiguous-expect-result.html
#	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/query/xspec-report-result.html
#	test/end-to-end/cases/expected/query/xspec-serialize-result.html
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-151-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-153-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-177-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-23_2-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-346-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-452-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-467-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-50-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-528-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-55-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-67-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-ambiguous-expect-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-focus-1-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-function-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-import-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-imported-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-pending-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-report-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-result-naming-collision-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-serialize-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-xslt2-result.html
@AirQuick AirQuick merged commit af33891 into xspec:master Jul 28, 2019
@AirQuick AirQuick deleted the e2e-test-now branch July 28, 2019 15:14
@AirQuick
Copy link
Member Author

@cirulls
Merged this improvement of test.

Thanks @galtm for the review.

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.

2 participants