Fix issue 355 357 358 360 (broken report) for XQuery and run test for issue 59 on XQuery #498

AirQuick · 2019-01-02T15:11:39Z

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

Fixes the followings for XQuery, in the same way as XSLT fixed by #380.

As a result, the test cases for #59 now work on XQuery.

Commits

21dd94b adapts xspec-59.xspec to XQuery. It doesn't work yet.

F:\xspec\test>..\bin\xspec.bat -q xspec-59_query.xspec
...
Running Tests...
Error evaluating ((if($test) then ... else ..., ...)) on line 202 column 12 of generate-query-utils.xql:
  XQTY0024: A namespace node (namespace-name) cannot be created after a child of the
  containing element. Most recent element start tag was output at line 180 of module
  generate-query-utils.xql
  at test:report-sequence() (.../xspec/test/xspec/xspec-59_query.xq#615)
...
*** Error running the test suite

04732d4 fixes the issues by duplicating test:report-sequence() from XSLT.
xspec-59.xspec now works on XQuery.
7fb9fe0 updates generate-query-utils.xspec to reflect the fix.
ce552c6 includes xspec-report.xspec in XQuery's end-to-end test.
8beaa66 updates the expected results of the end-to-end test.
You can verify that the XQuery's expected results now resemble closely the XSLT's expected results, by comparing test/end-to-end/cases/expected/query/*.* with test/end-to-end/cases/expected/stylesheet/*.* using your favorite comparison tool.

…-59-2_xquery # 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

…-151 # 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

…ort-sequence # Conflicts: # test/end-to-end/cases/xspec-ambiguous-expect.xspec # test/win-bats/collection.xml # test/xspec.bats

…d-like # 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 # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/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

…erwise # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

# 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

…-output-escaping # 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

…-folding-img-src # 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

…sult-prefixes # Conflicts: # src/compiler/generate-xspec-tests.xsl # 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/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…lize # Conflicts: # src/compiler/generate-xspec-tests.xsl # 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/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…ormat-xslt # Conflicts: # src/compiler/generate-xspec-tests.xsl # 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/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…erialize # Conflicts: # src/compiler/generate-xspec-tests.xsl # 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/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…359-367 # Conflicts: # src/compiler/generate-xspec-tests.xsl # 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/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…-flags # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # 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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…diff # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # 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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…ort-value # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # 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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…355-357-358-360-361 # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…sequence # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…-151 # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # 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/generate-tests-utils.xspec # test/generate-x-utils.xspec # test/generate-xspec-tests.xspec

# Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…nt-family # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…ments-in-xslt # Conflicts: # src/compiler/generate-query-utils.xql # src/compiler/generate-tests-utils.xsl # src/compiler/generate-xspec-tests.xsl # test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html # test/end-to-end/cases/expected/stylesheet/xspec-three-dots-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/generate-x-utils.xspec # test/generate-xspec-tests.xspec # test/win-bats/collection.xml # test/xspec.bats

…erwise

…e-type # Conflicts: # test/xspec-result-naming-collision.xspec

…uery

…hut-to-xspec

…ort-sequence # Conflicts: # src/compiler/generate-query-utils.xql # test/end-to-end/cases/expected/query/xspec-177-junit.xml # test/end-to-end/cases/expected/query/xspec-177-result.html # test/end-to-end/cases/expected/query/xspec-177-result.xml # test/end-to-end/cases/expected/query/xspec-346-junit.xml # 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/query/xspec-452-result.html # test/end-to-end/cases/expected/query/xspec-452-result.xml # test/end-to-end/cases/expected/query/xspec-467-junit.xml # test/end-to-end/cases/expected/query/xspec-467-result.html # test/end-to-end/cases/expected/query/xspec-467-result.xml # test/end-to-end/cases/expected/query/xspec-67-junit.xml # test/end-to-end/cases/expected/query/xspec-67-result.html # test/end-to-end/cases/expected/query/xspec-67-result.xml # test/end-to-end/cases/expected/query/xspec-serialize-junit.xml # test/end-to-end/cases/expected/query/xspec-serialize-result.html # test/end-to-end/cases/expected/query/xspec-serialize-result.xml # test/end-to-end/cases/expected/query/xspec-three-dots-junit.xml # test/end-to-end/cases/expected/query/xspec-three-dots-result.html # test/end-to-end/cases/expected/query/xspec-three-dots-result.xml # test/end-to-end/cases/xspec-report.xspec # test/generate-query-utils.xspec # test/win-bats/collection.xml # test/xspec.bats

AirQuick · 2019-06-22T10:39:37Z

@cirulls
Merged this bug fix.

AirQuick added the bug label Jan 2, 2019

AirQuick added 2 commits January 19, 2019 02:49

AirQuick mentioned this pull request Jan 19, 2019

Testing a function/template that returns an attribute with x:expect/@test #59

Closed

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

8580252

…ort-sequence # Conflicts: # test/end-to-end/cases/xspec-ambiguous-expect.xspec # test/win-bats/collection.xml # test/xspec.bats

AirQuick mentioned this pull request Jan 19, 2019

Simplify x:call in xspec-ambiguous-expect.xspec #502

Merged

AirQuick added 24 commits January 28, 2019 16:58

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

6477ae2

…erwise

AirQuick added 20 commits March 7, 2019 08:50

Merge branch 'test-deps-2018-12-24' into xquery-copy-desc-ns

53c4d3e

Merge branch 'xquery-copy-desc-ns' into fix_issue-480

8e62577

Merge branch 'fix_issue-480' into prep_177-test_xquery

58cd952

Merge branch 'prep_177-test_xquery' into fix_issue-177_xquery

13cac10

Merge branch 'fix_issue-177_xquery' into test_issue-153_xquery

b1e98c2

Merge branch 'test_issue-153_xquery' into xquery-import-test-utils

ba45b31

Merge branch 'xquery-import-test-utils' into test-items-ns

11bb965

Merge branch 'test-items-ns' into xquery-instance-of-namespace

0eb55be

Merge branch 'xquery-instance-of-namespace' into fix_issue-67_xquery

88b265a

Merge branch 'fix_issue-67_xquery' into xquery-node-type

d9a6677

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

bf9ef7e

…e-type # Conflicts: # test/xspec-result-naming-collision.xspec

Merge branch 'xquery-node-type' into test_wrappable-sequence

f760e29

Merge branch 'test_wrappable-sequence' into test_report-sequence_xquery

10a5d92

Merge branch 'test_report-sequence_xquery' into test_serialization_xq…

247d98f

…uery

Merge branch 'test_serialization_xquery' into rm-xq-comment-from-build

7f0e07f

Merge branch 'rm-xq-comment-from-build' into undup-sch-location-compare

30867b7

Merge branch 'undup-sch-location-compare' into xsl-sequence-in-sch-019

db860a0

Merge branch 'xsl-sequence-in-sch-019' into xsl-namespace-first-in-sc…

f87e545

…hut-to-xspec

Merge branch 'xsl-namespace-first-in-schut-to-xspec' into xquery-version

1eb913a

Merge branch 'xquery-version' into xquery-report-sequence

6cbc235

AirQuick changed the title ~~Fix issue 357 358 360 (broken report) for XQuery and run test for issue 59 on XQuery~~ Fix issue 355 357 358 360 (broken report) for XQuery and run test for issue 59 on XQuery Mar 16, 2019

This was referenced Mar 17, 2019

Test terminates with FOTY0012 in test:report-sequence #151

Closed

Test for issue 151 (Test terminates with FOTY0012 in test:report-sequence) on XQuery #553

Merged

AirQuick added this to the v1.4.0 milestone Apr 30, 2019

AirQuick mentioned this pull request Jun 18, 2019

x:description/attribute(xquery-version) #497

Merged

AirQuick merged commit 2a037bb into xspec:master Jun 22, 2019

AirQuick deleted the xquery-report-sequence branch June 22, 2019 09:59

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

Fix issue 355 357 358 360 (broken report) for XQuery and run test for issue 59 on XQuery #498

Fix issue 355 357 358 360 (broken report) for XQuery and run test for issue 59 on XQuery #498

AirQuick commented Jan 2, 2019 •

edited

Loading

AirQuick commented Jun 22, 2019

Fix issue 355 357 358 360 (broken report) for XQuery and run test for issue 59 on XQuery #498

Fix issue 355 357 358 360 (broken report) for XQuery and run test for issue 59 on XQuery #498

Conversation

AirQuick commented Jan 2, 2019 • edited Loading

Commits

AirQuick commented Jun 22, 2019

AirQuick commented Jan 2, 2019 •

edited

Loading