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

Schema: Add as? to global-param #350

Merged
merged 543 commits into from
Mar 2, 2019
Merged

Schema: Add as? to global-param #350

merged 543 commits into from
Mar 2, 2019

Conversation

AirQuick
Copy link
Member

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

In the current schema, as? is missing from global-param.
So /x:description/x:param/@as is rejected without reason. (Travis, AppVeyor)

This pull request fixes it.

@AirQuick AirQuick added the bug label Sep 10, 2018
@AirQuick AirQuick mentioned this pull request Sep 10, 2018
Merged
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-226
a0f887e 
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
4ea450c 
…211_cumulative
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into e2e-test_ant
0033999 
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-xquery-…
e318a91 
…tutorial-from-e2e

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-ns-juni…
5e3ff8e 
…t-report

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix-xq-htm…
269f0cc 
…l-uri
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_xml-r…
4099cda 
…eport
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into indent-xqu…
43fa79b 
…ery-result-xml

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-pkg-ns-…
0dca4f9 
…from-xquery-xml

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into rm-pkg-ns-…
cae88fe 
…from-ws

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_xml-st…
39f00b4 
…ylesheet-pi

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_schem…
5216f1f 
…a-aware_e2e

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_cover…
3a848ba 
…age-e2e

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
8b832f1 
…214_cumulative

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
e9233a8 
…204_cumulative

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
8022f83 
…208_cumulative

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
866f730 
…177_cumulative

# Conflicts:
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_xml-base
f56e9e9 
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_global…
eb09f73 
…-param-common-attrs

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_param-as
f30d6cd 
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_global…
9511470 
…-param-as

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
e2d3079 
…185_cumulative

# Conflicts:
#	build.xml
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
6c7f860 
…185_cumulative

# Conflicts:
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into align-bats…
7d1031b 
…-tests

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into indent-xqu…
e1f394f 
…ery-result-xml

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
dcbd661 
…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into align-bats…
4780abd 
…-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_sch-co…
d3b29b3 
…ntext

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
@AirQuick
Merge branch 'fix_issue-177_cumulative' into test_xml-base
0e1383d
@AirQuick
Merge branch 'test_xml-base' into fix_global-param-common-attrs
5eb0582
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_param-as
e9edb81 
# Conflicts:
#	.travis.yml
#	appveyor.yml
@AirQuick
Merge branch 'test_param-as' into fix_global-param-as
ddcf656
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_global…
505d2a8 
…-param-as

# Conflicts:
#	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/xspec-rule.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
27b507f 
…177_cumulative

# Conflicts:
#	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/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_xml-base
bb0eff8 
# Conflicts:
#	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/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_global…
c528e1d 
…-param-common-attrs

# Conflicts:
#	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/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into test_param-as
5088467 
# Conflicts:
#	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/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_global…
ad549a4 
…-param-as

# Conflicts:
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
@AirQuick AirQuick added this to the v1.3.0 milestone Feb 11, 2019
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_issue-…
4caf2d1 
…177_cumulative

# Conflicts:
#	test/end-to-end/cases/expected/schematron/schematron-01-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-153-result.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-pending-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-xslt2-result.xml
@AirQuick
Revert an unrelated change
9549cfd
@AirQuick
Merge branch 'fix_issue-177_cumulative' into test_xml-base
273dcb6
@AirQuick
Merge branch 'test_xml-base' into fix_global-param-common-attrs
cbd9848
@AirQuick
Merge branch 'fix_global-param-common-attrs' into test_param-as
a1c67df
@AirQuick
Merge branch 'test_param-as' into fix_global-param-as
d494334 
# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_global…
f49fb78 
…-param-as
@AirQuick
Merge branch 'master' of git://github.com/xspec/xspec into fix_global…
7f83e65 
…-param-as

# Conflicts:
#	src/schemas/xspec.rnc
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick AirQuick requested a review from galtm March 1, 2019 15:58
@AirQuick
Copy link
Member Author

AirQuick commented Mar 1, 2019

@galtm
This change isn't related directly to #475 but this pull request is mentioned there.
So this review request is more like a FYI than a serious request. Just a glance at the change would be enough.

galtm
galtm approved these changes Mar 1, 2019
View reviewed changes
Copy link
Member

@galtm galtm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@galtm
Copy link
Member

galtm commented Mar 1, 2019

This change isn't related directly to #475 but this pull request is mentioned there.

I'm inclined to remove my "Check effect of @as in XSLT" scenario from xspec-variable_stylesheet.xspec in my PR#475 and add code to xspec-param-as.xspec, to keep all the @as testing in one place. Do you agree?

@AirQuick
Copy link
Member Author

AirQuick commented Mar 1, 2019

keep all the @as testing in one place

Yes, that would be greatly appreciated.

@AirQuick AirQuick merged commit 51f868b into xspec:master Mar 2, 2019
@AirQuick AirQuick deleted the fix_global-param-as branch March 2, 2019 02:08
@AirQuick
Copy link
Member Author

AirQuick commented Mar 2, 2019

Thanks, @galtm.

@cirulls
Merged this bug fix.

@galtm
Copy link
Member

galtm commented Mar 4, 2019

keep all the @as testing in one place

Yes, that would be greatly appreciated.

I just uploaded ca91913.

@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

@galtm galtm galtm approved these changes

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
v1.3.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@AirQuick @galtm