Import XQuery module without prefix if not required #442

AirQuick · 2018-11-18T08:45:13Z

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

This pull request addresses a TODO:

xspec/src/compiler/generate-query-tests.xsl

Lines 73 to 76 in 3e1aa9f

    
           <xsl:template match="x:description" mode="x:generate-tests"> 
        
              <xsl:variable name="this" select="."/> 
        
              <!-- A prefix has to be defined for the target namespace on x:description. --> 
        
              <!-- TODO: If not, we should generate one. -->

…nto rm-pkg-ns-from-xquery-xml # Conflicts: # bin/xspec.bat # build.xml # test/ant/common/generate-build-worker.xsl # test/end-to-end/generate-expected.cmd # test/end-to-end/generate-expected.sh # test/end-to-end/processor/base/compare.xsl # test/end-to-end/processor/base/normalize.xsl # test/end-to-end/run-e2e-tests.cmd # test/end-to-end/run-e2e-tests.sh # test/xspec.bats

…ck/xspec into fix_xspec-result-naming-collision_label

…result-naming-collision_e2e # Conflicts: # test/xspec-bat.cmd # test/xspec.bats

…b.com/AirQuick/xspec into fix_issue-359-367

…b.com/AirQuick/xspec into fix_issue-356

…b.com/AirQuick/xspec into css-crlf-lf

…b.com/AirQuick/xspec into rm-disable-output-escaping

…b.com/AirQuick/xspec into fix_format-folding-img-src

…b.com/AirQuick/xspec into exclude-result-prefixes

…b.com/AirQuick/xspec into test_serialize

…b.com/AirQuick/xspec into annotate-format-xslt

…b.com/AirQuick/xspec into simplify-serialize

…b.com/AirQuick/xspec into deep-equal-flags

…b.com/AirQuick/xspec into ignore-ws-diff

…b.com/AirQuick/xspec into rename-report-value

…b.com/AirQuick/xspec into fix_issue-355-357-358-360-361 # Conflicts: # test/end-to-end/processor/base/_normalizer.xsl

# Conflicts: # test/xspec-bat.cmd # test/xspec.bats

…o rm-ns-alias

…o wrappable-sequence

…o fix_issue-379

…o test_issue-151

…o fix_issue-386

…o generic-font-family

…o update-comments-in-xslt

…o choose-otherwise

…o rm-q-opt-from-del-cmd

…o reset-public-env-vars

…o test_sch-valid-xsl

# Conflicts: # test/xspec.bats

# Conflicts: # test/xspec-308.xspec # test/xspec-node-selection.xspec

# 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

…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

…nerator

…mod-wo-prefix # Conflicts: # src/compiler/generate-query-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-346-result.html # test/end-to-end/cases/expected/stylesheet/xspec-346-result.xml # test/xspec-308.xspec # test/xspec-412.xspec # test/xspec-423/test.xspec # test/xspec-438.xspec # test/xspec-node-selection.xspec # test/xspec-uri.xspec

AirQuick · 2019-04-25T06:57:47Z

@cirulls
Merged this enhancement.

@galtm
#475 conflicts with this change. (very trivial)
This change makes it possible to remove xml:prefix from XQuery /x:description when prefix is not used in the .xspec file. Previously, you always had to declare namespace prefix of the XQuery module being tested.
In consequence, this change has removed some unnecessary xmlns:prefix from test/*.xspec files. The conflict with #475 is very trivial. When resolving the conflict, just make sure the following two removals:

test/xml-base.xspec
- Remove xmlns:xml-base="x-urn:test:xml-base" from /x:description
test/xspec-node-selection.xspec
- Remove xmlns:do-nothing="x-urn:test:do-nothing" from /x:description

galtm · 2019-04-25T12:40:49Z

@AirQuick
I uploaded 63f7ba3 to #475, changing those two files as you suggested.

AirQuick added the enhancement label Nov 18, 2018

AirQuick mentioned this pull request Nov 18, 2018

Fix issue 440 (XQuery x:expect with select and test is terminated with XPTY0004) #443

Merged

AirQuick added 28 commits December 1, 2018 11:25

Merge branch 'rm-pkg-ns-from-xquery-xml' of https://github.com/AirQui…

fcd2de0

…ck/xspec into fix_xspec-result-naming-collision_label

Merge branch 'master' of git://github.com/xspec/xspec into fix_xspec-…

5ccf287

…result-naming-collision_e2e # Conflicts: # test/xspec-bat.cmd # test/xspec.bats

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

323e90b

…b.com/AirQuick/xspec into fix_issue-359-367

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

42aef6e

…b.com/AirQuick/xspec into fix_issue-356

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

818f6b2

…b.com/AirQuick/xspec into css-crlf-lf

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

5a22acd

…b.com/AirQuick/xspec into rm-disable-output-escaping

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

bc45242

…b.com/AirQuick/xspec into fix_format-folding-img-src

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

91fa3e8

…b.com/AirQuick/xspec into exclude-result-prefixes

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

4220981

…b.com/AirQuick/xspec into test_serialize

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

caab45a

…b.com/AirQuick/xspec into annotate-format-xslt

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

ab8bc72

…b.com/AirQuick/xspec into simplify-serialize

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

bd0e086

…b.com/AirQuick/xspec into deep-equal-flags

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

751cba0

…b.com/AirQuick/xspec into ignore-ws-diff

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

a498162

…b.com/AirQuick/xspec into rename-report-value

Merge branch 'fix_xspec-result-naming-collision_e2e' of https://githu…

f351445

…b.com/AirQuick/xspec into fix_issue-355-357-358-360-361 # Conflicts: # test/end-to-end/processor/base/_normalizer.xsl

Merge branch 'master' of git://github.com/xspec/xspec into compile-UTF-8

ae79a14

# Conflicts: # test/xspec-bat.cmd # test/xspec.bats

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

c664c38

…o rm-ns-alias

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

79e6675

…o wrappable-sequence

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

65153fb

…o fix_issue-379

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

cf0b4cf

…o test_issue-151

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

e7f0eda

…o fix_issue-386

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

afe4989

…o generic-font-family

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

2fc8a53

…o update-comments-in-xslt

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

fb1733d

…o choose-otherwise

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

63d95a4

…o rm-q-opt-from-del-cmd

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

b1b810b

…o reset-public-env-vars

Merge branch 'compile-UTF-8' of https://github.com/AirQuick/xspec int…

e555c8c

…o test_sch-valid-xsl

AirQuick added 23 commits February 1, 2019 04:45

Merge branch 'xspec-uri' into rm-source-doc_xquery

f63720c

# Conflicts: # test/xspec.bats

Merge branch 'rm-source-doc_xquery' into rm-source-doc_xslt

27685e2

Merge branch 'rm-source-doc_xslt' into fix_issue-438

c9d69b4

Merge branch 'fix_issue-438' into import-xq-mod-wo-prefix

358e502

# Conflicts: # test/xspec-308.xspec # test/xspec-node-selection.xspec

Merge branch 'x-text' into test-deps-2018-11-12

9982c91

Merge branch 'test-deps-2018-11-12' into add-as-to-test-params

ec8320c

Merge branch 'add-as-to-test-params' into test-node-deep-equal-elements

b250884

Merge branch 'test-node-deep-equal-elements' into mode-create-node-ge…

c65b188

…nerator

Merge branch 'mode-create-node-generator' into fix-todo-xquery-param

04132a0

Merge branch 'fix-todo-xquery-param' into fix-todo-xquery-expect

f4add0d

Merge branch 'fix-todo-xquery-expect' into fix_dots-test_doc_multi-nodes

6b63ab5

Merge branch 'fix_dots-test_doc_multi-nodes' into test_issue-59-2_xquery

7a24af7

Merge branch 'test_issue-59-2_xquery' into test_node-selection_xquery

5b9d591

Merge branch 'test_node-selection_xquery' into fix_issue-308_xquery

902dcff

Merge branch 'fix_issue-308_xquery' into test_issue-423_xproc

c9fd862

Merge branch 'test_issue-423_xproc' into test_issue-423_xquery

8ac4817

Merge branch 'test_issue-423_xquery' into xspec-uri

2756bc1

Merge branch 'xspec-uri' into rm-source-doc_xquery

22bc742

Merge branch 'rm-source-doc_xquery' into rm-source-doc_xslt

75204e8

Merge branch 'rm-source-doc_xslt' into fix_issue-438

cde4060

Merge branch 'fix_issue-438' into import-xq-mod-wo-prefix

31f96d5

AirQuick added this to the v1.3.0 milestone Mar 30, 2019

AirQuick merged commit dd82b64 into xspec:master Apr 25, 2019

AirQuick deleted the import-xq-mod-wo-prefix branch April 25, 2019 06:31

cirulls mentioned this pull request Sep 5, 2019

Automatically generate release notes #601

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Import XQuery module without prefix if not required #442

Import XQuery module without prefix if not required #442

AirQuick commented Nov 18, 2018

AirQuick commented Apr 25, 2019

galtm commented Apr 25, 2019

	<xsl:template match="x:description" mode="x:generate-tests">
	<xsl:variable name="this" select="."/>
	<!-- A prefix has to be defined for the target namespace on x:description. -->
	<!-- TODO: If not, we should generate one. -->

Import XQuery module without prefix if not required #442

Import XQuery module without prefix if not required #442

Conversation

AirQuick commented Nov 18, 2018

AirQuick commented Apr 25, 2019

galtm commented Apr 25, 2019