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

Merge xspec-space_*.xspec #532

Merged
merged 1,209 commits into from
Jul 7, 2019
Merged

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Mar 2, 2019

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


Following #460 and #531, this pull request merges xspec-space_xquery.xspec and a large portion of xspec-space_stylesheet.xspec into xspec-space.xspec.

To get a better diff of xspec-space.xspec, compare it with the previous version of xspec-space_stylesheet.xspec.

No XSpec code change.

…-rnc

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…2018-12-04

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…2018-12-24

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…y-desc-ns

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…est_xquery

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…177_xquery

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…-153_xquery

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…ort-test-utils

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…tance-of-namespace

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…67_xquery

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…e-type

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…able-sequence

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…t-sequence_xquery

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…lization_xquery

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…ent-from-build

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…location-compare

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…ce-in-sch-019

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…ace-first-in-schut-to-xspec

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…sion

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	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/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/win-bats/collection.xml
#	test/xspec-308.xspec
#	test/xspec-59.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-node-selection.xspec
#	test/xspec-variable.xspec
#	test/xspec.bats
…ort-sequence

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/xspec-ambiguous-expect-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-variable.xspec
…spec-ambiguous-expect

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/xspec-ambiguous-expect-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/end-to-end/cases/xspec-three-dots.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/xspec-308.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-variable.xspec
…ambiguous-expect_xquery

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	src/compiler/generate-common-tests.xsl
#	src/compiler/generate-query-utils.xql
#	src/compiler/generate-tests-utils.xsl
#	src/compiler/generate-xspec-tests.xsl
#	src/schemas/xspec.rnc
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/end-to-end/cases/xspec-153.xspec
#	test/end-to-end/cases/xspec-67.xspec
#	test/end-to-end/cases/xspec-focus-1.xspec
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/end-to-end/cases/xspec-pending.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
#	test/items.xsl
#	test/unit-expect-xsl.xspec
#	test/xspec-59_use-case-1.xspec
#	test/xspec-59_use-case-2.xspec
#	test/xspec-variable.xspec
…2019-01-22

# Conflicts:
#	test/end-to-end/cases/xspec-function.xspec
#	test/end-to-end/cases/xspec-import.xspec
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
#	test/generate-xspec-tests.xspec
# Conflicts:
#	src/reporter/coverage-report.xsl
#	src/reporter/format-xspec-report.xsl
@AirQuick AirQuick added this to the v1.4.0 milestone Apr 30, 2019
…ambiguous-expect_xquery

# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
…ry-xslt-space-test

# Conflicts:
#	test/xspec-space_stylesheet.xspec
@AirQuick AirQuick merged commit 473c6a3 into xspec:master Jul 7, 2019
@AirQuick AirQuick deleted the merge-xquery-xslt-space-test branch July 7, 2019 21:16
@AirQuick
Copy link
Member Author

AirQuick commented Jul 7, 2019

@cirulls
Merged this restructure of a test.

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.

None yet

1 participant