Separate common tests (for XSLT and XQuery) from generate-tests-utils.xspec (only for XSLT) #83
Conversation
….xspec (only for XSLT)
to make file comparison easier
AirQuick
force-pushed
the
workaround_issue-82
branch
from
8eb2615
to
942899e
Compare
| <!-- Copyright (c) 2010 Jeni Tennsion (see end of file.) --> | ||
| <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> | ||
| <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" query="http://www.jenitennison.com/xslt/unit-test" query-at="../src/compiler/generate-query-utils.xql" stylesheet="../src/compiler/generate-tests-utils.xsl"> | ||
| <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" stylesheet="../src/compiler/generate-tests-utils.xsl"> |
There was a problem hiding this comment.
I suggest to reinstate the copyright at the beginning and the end of the file. I would personally prefer to have all these copyright infos consolidated in the license file rather than at the beginning of each script but it may be complicated or long winded to get the consent from the original developers. Feel free to add your nickname as reviewer in the author comment or add a comment extended by.
There was a problem hiding this comment.
Good point.
But, it may not be appropriate to simply reinstate the original copyright description. Neither Florent nor Jeni wrote the code in this file. In this pull request, the original code has been migrated to generate-x-utils.xspec.
So this file is essentially derived from 86e9bbf and 9b94529. What to do in this case?
There was a problem hiding this comment.
I see. Then it's fine not to add the copyright as what it is left here is only the original filename. I'll merge the pull request then.
There was a problem hiding this comment.
This looks good to me and I approve it in principle. I just added a comment for a trivial change. If you agree with it, please add it to your pull request and I will merge the code into master.
I tested this pull request by running locally both generate-tests-utils.xspec and generate-x-utils.xspec and inspecting the code. When running these XSpec tests, I got this warning:
Warning: at xsl:stylesheet on line 20 column 75 of generate-tests-utils.xsl:
Stylesheet module file:/tmp/xspec/src/compiler/generate-tests-utils.xsl is included or
imported more than once. This is permitted, but may lead to errors or unexpected behavior
I remember seeing this warning before so this has not been introduced in this pull request. I had a quick look at generate-tests-utils.xsl but I could not see any obvious case of double import (I have not looked at this thoroughly though). This is not a blocker for merging this pull request but I wanted to report it.
* 'master' of git://github.com/xspec/xspec: Separate common tests (for XSLT and XQuery) from generate-tests-utils.xspec (only for XSLT) (#83) Make XProc testing command lines more portable (xspec#98) Update Saxon versions (xspec#116) Display result.log on test failure (xspec#110) # Conflicts: # test/generate-tests-utils.xspec
* 'master' of git://github.com/xspec/xspec: Do not copy unused namespaces from format utils to output (xspec#91) Stop using functx namespace (xspec#104) Migrate test:tests to test/*.xspec (xspec#118) Added documentation for attributes in RNG schema (xspec#115) Separate common tests (for XSLT and XQuery) from generate-tests-utils.xspec (only for XSLT) (#83) Make XProc testing command lines more portable (xspec#98) Update Saxon versions (xspec#116) Display result.log on test failure (xspec#110)
Currently
test/generate-tests-utils.xspec, despite its filename, has scenarios both for XSLT (src/compiler/generate-tests-utils.xsl) and XQuery (src/compiler/generate-query-utils.xql). So three kinds of scenarios coexist intest/generate-tests-utils.xspec:src/compiler/generate-query-utils.xql)This pull request does two things:
test/generate-x-utils.xspectest/generate-tests-utils.xspecIn consequence,
test/generate-x-utils.xspecfor XQuery. All its scenarios should be Success.)test/generate-x-utils.xspecresembles one of the previous snapshots oftest/generate-tests-utils.xspec.