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

Make xspec-space_stylesheet.xspec more portable #531

Merged
merged 1,203 commits into from
Jul 6, 2019
Merged

Make xspec-space_stylesheet.xspec more portable #531

merged 1,203 commits into from
Jul 6, 2019

Conversation

AirQuick
Copy link
Member

@AirQuick AirQuick commented Mar 2, 2019

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

This pull request makes test/xspec-space_stylesheet.xspec more portable (more adaptable to XQuery):

  • Give namespace to variables
  • Replace <x:context /> with <x:call function="false" />
  • Remove some x:expect of (verified via wrapper document) when its scenario is applicable to XQuery
  • Append $x:result/self:: to some @test

No XSpec code change.

@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-447
070424b 
# 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
#	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-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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into merge-test…
b065b5e 
…s_generate-xspec-tests

# 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
#	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-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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-468
e1e9a27 
# 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
#	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-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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-467
6995115 
# 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
#	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-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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-392
4d872bf 
# 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
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	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-variable.xspec
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-466
f3b8368 
# 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
#	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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-xs-from…
a735e19 
…-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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test-deps-…
945b9a2 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_share…
142d254 
…d-like
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test-deps-…
ad183c4 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into xquery-cop…
bed4671 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-480
50ec84e 
# 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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into prep_177-t…
e44ef1c 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
2aca3e7 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_issue…
f6050b1 
…-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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into xquery-imp…
eaa91a0 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test-items-ns
aa2aba9 
# 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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into xquery-ins…
f689866 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
6417968 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into xquery-nod…
80a975b 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_wrapp…
52e314f 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_repor…
6349a8d 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_seria…
edae458 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-xq-comm…
1c5632c 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into undup-sch-…
06924d7 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into xsl-sequen…
28de159 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into xsl-namesp…
a801b27 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into xquery-ver…
7fa5e4a 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into xquery-rep…
f569546 
…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
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into simplify_x…
74b22ed 
…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
@AirQuick AirQuick added this to the v1.4.0 milestone Apr 30, 2019
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into run_xspec-…
03ec4d5 
…ambiguous-expect_xquery

# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick
Merge branch 'run_xspec-ambiguous-expect_xquery' into test-deps-2019-…
81e5741 
…01-22
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test-deps-…
96e1af0 
…2019-01-22
@AirQuick
Merge branch 'test-deps-2019-01-22' into simplify_xspec-153-xspec
b0cd2e0
@AirQuick
Merge branch 'simplify_xspec-153-xspec' into test_inline-css_coverage
cf99b5e
@AirQuick
Merge branch 'test_inline-css_coverage' into test_inline-css_coverage…
b32ca49 
…_ant
@AirQuick
Merge branch 'test_inline-css_coverage_ant' into test_inline-css_html…
4b72106 
…_ant
@AirQuick
Merge branch 'test_inline-css_html_ant' into test_report-css-uri
97a9a7a
@AirQuick
Merge branch 'test_report-css-uri' into normalized-file-ext
57da4e9
@AirQuick
Merge branch 'normalized-file-ext' into test_param-position
7bfe5c5
@AirQuick
Merge branch 'test_param-position' into xquery-html-reporter-pi
7248432
@AirQuick
Merge branch 'xquery-html-reporter-pi' into simplify-report-test
980db3b
@AirQuick
Merge branch 'simplify-report-test' into follow-up_issue-526
59c3969
@AirQuick
Merge branch 'follow-up_issue-526' into fix_issue-528
82579ac
@AirQuick
Merge branch 'fix_issue-528' into common-result-xml-parser
f545ce9
@AirQuick
Merge branch 'common-result-xml-parser' into adjust-xslt-space-test
d1aa5a1
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into adjust-xsl…
ec52c3b 
…t-space-test
@AirQuick AirQuick merged commit cf7b351 into xspec:master Jul 6, 2019
@AirQuick AirQuick deleted the adjust-xslt-space-test branch July 6, 2019 00:09
@AirQuick
Copy link
Member Author

AirQuick commented Jul 6, 2019

@cirulls
Merged this adjustment of tests.

@galtm
This one and #532 conflict with #475. I think they are the last major conflict we need to resolve.
As written in #532, the goal is merging xspec-space_xquery.xspec and xspec-space_stylesheet.xspec into xspec-space.xspec as much as possible. xspec-space_xquery.xspec and xspec-space_stylesheet.xspec had to be separated in the past because of big differences between XSLT implementation and XQuery implementation. Now that XSLT and XQuery are getting close to each other, we can merge them.

@galtm
Copy link
Member

galtm commented Jul 17, 2019

This one and #532 conflict with #475. I think they are the last major conflict we need to resolve.

@AirQuick : I should be able to resolve this conflict with #475 in the next few days. Thanks for the explanations and also for mentioning that it may be the last major conflict!

@galtm
Copy link
Member

galtm commented Jul 18, 2019

@AirQuick : I uploaded eb704b1 to #475 to resolve the conflict. Now, #475 does not have any changes in xspec-space_stylesheet.xspec because all the tests for space in variables are in xspec-space.xspec.

@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.4.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@AirQuick @galtm