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.

Sign up for GitHub

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

Jump to bottom

Test node-selection on XQuery #431

Merged
merged 687 commits into from
Apr 9, 2019
Merged

Test node-selection on XQuery #431

merged 687 commits into from
Apr 9, 2019

Conversation

AirQuick
Copy link
Member

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

This pull request just adapts test/xspec-node-selection.xspec to XQuery. It's now tested both on XSLT and XQuery.
XSLT-only tests are extracted to xspec-node-selection_stylesheet.xspec.

@AirQuick AirQuick added the test label Nov 16, 2018
@AirQuick AirQuick mentioned this pull request Nov 16, 2018
Merged
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-disable…
efae3ee 
…-output-escaping

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_format…
a529939 
…-folding-img-src

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into exclude-re…
28f9a5f 
…sult-prefixes

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_seria…
45757b9 
…lize

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into annotate-f…
d4be9e0 
…ormat-xslt

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into simplify-s…
7bd3b01 
…erialize

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
7fdd8b6 
…359-367

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into deep-equal…
f29cf22 
…-flags

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into ignore-ws-…
f38cd05 
…diff

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rename-rep…
31d7af1 
…ort-value

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
0e87686 
…355-357-358-360-361

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into compile-UTF-8
07468b2 
# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-ns-alias
113f03e 
# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into wrappable-…
4c8e9d6 
…sequence

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-379
b42cc2a 
# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_issue…
12d663d 
…-151

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-386
738d649 
# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into generic-fo…
5819120 
…nt-family

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into update-com…
938dd50 
…ments-in-xslt

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into choose-oth…
f6b6613 
…erwise

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-q-opt-f…
02e37fd 
…rom-del-cmd

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into reset-publ…
533feb5 
…ic-env-vars

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_sch-v…
8b3dfa1 
…alid-xsl

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into ant-sch-xsl
ae33656 
# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_ls-de…
3c3e9b0 
…fault-output-dir

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into sch-params…
9102f07 
…-cmdline

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into sch-params…
c04fdb9 
…-ant

# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-412
465ddb7 
# 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/_serializer.xsl
#	test/end-to-end/processor/base/_deserializer.xsl
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/base/_serializer.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/html/_serializer.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
@AirQuick
Merge branch 'fix_issue-412' into x-text
3de4c3f
@AirQuick
Merge branch 'x-text' into simplify-coverage-report-h2
5634557
@AirQuick
Merge branch 'simplify-coverage-report-h2' into xquery-report-ws
eb74675
@AirQuick
Merge branch 'xquery-report-ws' into test-deps-2018-11-12
3b1a9f5
@AirQuick
Merge branch 'test-deps-2018-11-12' into add-as-to-test-params
e90ee54 
# Conflicts:
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
@AirQuick
Merge branch 'add-as-to-test-params' into test-node-deep-equal-elements
80c06ad 
# Conflicts:
#	test/generate-x-utils.xspec
@AirQuick
Merge branch 'test-node-deep-equal-elements' into mode-create-node-ge…
d907fbe 
…nerator
@AirQuick
Merge branch 'mode-create-node-generator' into fix-todo-xquery-param
2129000 
# Conflicts:
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
@AirQuick
Merge branch 'fix-todo-xquery-param' into fix-todo-xquery-expect
2c1f800 
# Conflicts:
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
@AirQuick
Merge branch 'fix-todo-xquery-expect' into fix_dots-test_doc_multi-nodes
a3bc1df 
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
@AirQuick
Merge branch 'fix_dots-test_doc_multi-nodes' into test_issue-59-2_xquery
66f7a70
@AirQuick
Merge branch 'test_issue-59-2_xquery' into test_node-selection_xquery
5931171
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into x-text
271db58 
# Conflicts:
#	bin/xspec.bat
#	bin/xspec.sh
#	java/com/jenitennison/xslt/tests/XSLTCoverageTraceListener.class
#	java/com/jenitennison/xslt/tests/XSLTCoverageTraceListener.java
#	src/common/xspec-utils.xsl
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-tests.xsl
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/reporter/format-xspec-report.xsl
#	src/reporter/junit-report.xsl
#	src/schematron/schut-to-xspec.xsl
#	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/schematron/schematron-01-result.xml
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-coverage.html
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-153-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-177-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-177-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-177-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-214-coverage.html
#	test/end-to-end/cases/expected/stylesheet/xspec-214-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-214-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-23_2-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-23_2-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-23_2-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-50-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-55-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-67-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-67-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-ambiguous-expect-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-ambiguous-expect-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-focus-1-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-function-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-import-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-imported-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-pending-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-junit.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-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.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-xslt2-result.xml
#	test/end-to-end/processor/base/_normalizer.xsl
#	test/end-to-end/processor/coverage/_serializer.xsl
#	test/end-to-end/processor/junit/_normalizer.xsl
#	test/end-to-end/processor/xml/_normalizer.xsl
#	test/schematron-param-001.xspec
#	test/win-bats/collection.xml
#	test/xspec-space_stylesheet.xspec
#	test/xspec-utils.xspec
#	test/xspec.bats
@AirQuick
Merge branch 'x-text' into test-deps-2018-11-12
9982c91
@AirQuick
Merge branch 'test-deps-2018-11-12' into add-as-to-test-params
ec8320c
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into add-as-to-…
021f6b1 
…test-params

# Conflicts:
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	test/end-to-end/cases/expected/query/xspec-346-result.html
#	test/end-to-end/cases/expected/query/xspec-346-result.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/xspec-346.xspec
@AirQuick
Merge branch 'add-as-to-test-params' into test-node-deep-equal-elements
b250884
@AirQuick
Merge branch 'test-node-deep-equal-elements' into mode-create-node-ge…
c65b188 
…nerator
@AirQuick
Merge branch 'mode-create-node-generator' into fix-todo-xquery-param
04132a0
@AirQuick
Merge branch 'fix-todo-xquery-param' into fix-todo-xquery-expect
f4add0d
@AirQuick
Merge branch 'fix-todo-xquery-expect' into fix_dots-test_doc_multi-nodes
6b63ab5
@AirQuick
Merge branch 'fix_dots-test_doc_multi-nodes' into test_issue-59-2_xquery
7a24af7
@AirQuick
Merge branch 'test_issue-59-2_xquery' into test_node-selection_xquery
5b9d591
@AirQuick AirQuick added this to the v1.3.0 milestone Mar 11, 2019
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_node-…
d5d4e4c 
…selection_xquery

# Conflicts:
#	test/schema/build.xml
@AirQuick AirQuick merged commit b6e381c into xspec:master Apr 9, 2019
@AirQuick AirQuick deleted the test_node-selection_xquery branch April 9, 2019 22:58
@AirQuick
Copy link
Member Author

AirQuick commented Apr 9, 2019

@cirulls
Merged this enhancement of test.

@galtm
#475 conflicts with this change in test/xspec-node-selection.xspec. The conflict is trivial and you can resolve it easily in namespace declarations in /x:description.
Note that now xspec-node-selection.xspec is run both on XSLT and XQuery. In xspec-node-selection.xspec, you need to not only resolve the conflict but also replace x:context with x:call.

@galtm
Copy link
Member

galtm commented Apr 10, 2019

#475 conflicts with this change in test/xspec-node-selection.xspec. The conflict is trivial and you can resolve it easily in namespace declarations in /x:description.
Note that now xspec-node-selection.xspec is run both on XSLT and XQuery. In xspec-node-selection.xspec, you need to not only resolve the conflict but also replace x:context with x:call.

@AirQuick
Uploaded c5c0265 to #475. This commit resolves the conflict in x:description, replaces x:context with x:call in the scenarios about x:variable, and makes the white space consistent in the file (This file uses tabs, not spaces.).

@cirulls cirulls mentioned this pull request Sep 5, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
test
Projects
None yet
Milestone
v1.3.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@AirQuick @galtm