From d17eba9d34f412e592c3b049c6c14fd9ccada87b Mon Sep 17 00:00:00 2001 From: "David E. Narvaez" Date: Sun, 21 Jun 2015 22:24:39 -0400 Subject: Iterate Over the Items (Not the Operands) of a Literal Sequence The current code iterates over the (empty) list of operands of a Literal Sequence, ignoring any items in it, so Literal Sequences are always ignored in the ExpressionSequence. Task-number: QTBUG-35897 Change-Id: I60341ac21c8e3b77bf6d8dfeebdbafe010844406 Reviewed-by: Erik Verbruggen --- tests/auto/qxmlquery/tst_qxmlquery.cpp | 2 +- tests/auto/xmlpatterns/queries/literalsequence.xq | 1 + .../auto/xmlpatterns/stderrBaselines/QTBUG35897literalsequence.txt | 0 tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 7 +++++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 tests/auto/xmlpatterns/queries/literalsequence.xq create mode 100644 tests/auto/xmlpatterns/stderrBaselines/QTBUG35897literalsequence.txt (limited to 'tests') diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 3350911..cc2cb13 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -231,7 +231,7 @@ private: /** * One excluded, since we skip static-base-uri.xq. */ - ExpectedQueryCount = 29 + ExpectedQueryCount = 30 }; static void checkBaseURI(const QUrl &baseURI, const QString &candidate); diff --git a/tests/auto/xmlpatterns/queries/literalsequence.xq b/tests/auto/xmlpatterns/queries/literalsequence.xq new file mode 100644 index 0000000..3420df0 --- /dev/null +++ b/tests/auto/xmlpatterns/queries/literalsequence.xq @@ -0,0 +1 @@ +("someString", tokenize("a,b",",")) diff --git a/tests/auto/xmlpatterns/stderrBaselines/QTBUG35897literalsequence.txt b/tests/auto/xmlpatterns/stderrBaselines/QTBUG35897literalsequence.txt new file mode 100644 index 0000000..e69de29 diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 85dc50a..ffb1697 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -757,6 +757,13 @@ void tst_XmlPatterns::xquerySupport_data() const << QString() << QString(); + QTest::newRow("QTBUG-35897: literal sequence") + << 0 + << QByteArray("someString a b\n") + << QStringList((path + QStringLiteral("literalsequence.xq"))) + << QString() + << QString(); + // TODO https? // TODO pass external variables that allows space around the equal sign. // TODO run fn:trace() -- cgit v1.2.1