From 979a55a1ef3f5d7402b76f5fe50e59315b24de25 Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Sat, 12 Oct 2013 19:02:21 +0200 Subject: Add explanation to QEXPECT_FAIL statements Added clarifying explanations to the QEXPECT_FAIL statements. Now it should be easier to understand what is expected from the parser. Change-Id: I1dacd60564f292d9ce43de7254525c34fa7cdc55 Reviewed-by: Thiago Macieira --- .../sax/qxmlsimplereader/tst_qxmlsimplereader.cpp | 84 +++++++++++----------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp') diff --git a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp index 5be43e2c8f..f09fbff6c4 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp +++ b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp @@ -315,7 +315,7 @@ void tst_QXmlSimpleReader::testGoodXmlFile() QVERIFY(file.open(QIODevice::ReadOnly)); Parser parser; - QEXPECT_FAIL("xmldocs/valid/sa/089.xml", "", Continue); + QEXPECT_FAIL("xmldocs/valid/sa/089.xml", "a form feed character is not accepted in XML", Continue); QVERIFY(parser.parseFile(&file)); QFile ref_file(file_name + ".ref"); @@ -352,46 +352,46 @@ void tst_QXmlSimpleReader::testBadXmlFile() QVERIFY(file.open(QIODevice::ReadOnly)); Parser parser; - QEXPECT_FAIL("xmldocs/not-wf/sa/030.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/031.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/032.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/033.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/038.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/072.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/073.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/074.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/076.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/077.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/078.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/085.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/086.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/087.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/101.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/102.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/104.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/116.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/117.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/119.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/122.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/132.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/142.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/143.xml", "", Continue); - - QEXPECT_FAIL("xmldocs/not-wf/sa/144.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/145.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/146.xml", "", Abort); - QEXPECT_FAIL("xmldocs/not-wf/sa/160.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/162.xml", "", Continue); - - QEXPECT_FAIL("xmldocs/not-wf/sa/168.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/169.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/170.xml", "", Continue); - - QEXPECT_FAIL("xmldocs/not-wf/sa/180.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/181.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/182.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/185.xml", "", Continue); - QEXPECT_FAIL("xmldocs/not-wf/sa/186.xml", "", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/030.xml", "a form feed character is not accepted in XML", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/031.xml", "a form feed character is not accepted in a processing instruction", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/032.xml", "a form feed character is not accepted in a comment", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/033.xml", "overlong sequence - small latin letter d should be rejected", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/038.xml", "attribute x redefined; should be rejected", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/072.xml", "entity foo not defined", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/073.xml", "entity f not defined", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/074.xml", "entity e is not well-formed ()", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/076.xml", "entity foo is not defined", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/077.xml", "entity bar is not defined within the definition of entity foo", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/078.xml", "entity foo not defined", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/085.xml", "Unfinished Public or System Id", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/086.xml", "Unfinished Public or System Id", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/087.xml", "Unfinished Public or System Id", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/101.xml", "Invalid XML encoding name (space before utf-8)", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/102.xml", "Invalid version specification (1.0 followed by space)", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/104.xml", "Premature end of data in tag foo", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/116.xml", "Invalid decimal value", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/117.xml", "No name", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/119.xml", "No name", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/122.xml", "; expected in declaration of element", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/132.xml", "; expected in declaration of element", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/142.xml", "Invalid value '0'", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/143.xml", "Invalid value '31'", Continue); + + QEXPECT_FAIL("xmldocs/not-wf/sa/144.xml", "noncharacter code 0xFFFF should be rejected", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/145.xml", "surrogate code point 0xD800 should be rejected", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/146.xml", "code point out-of-range 0x110000 (must be < 0x10FFFE)", Abort); + QEXPECT_FAIL("xmldocs/not-wf/sa/160.xml", "Parameter references forbidden in internal subset", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/162.xml", "Parameter references forbidden in internal subset", Continue); + + QEXPECT_FAIL("xmldocs/not-wf/sa/168.xml", "Surrogate code point 0xEDA080 should be rejected", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/169.xml", "Surrogate code point 0xEDB080 should be rejected", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/170.xml", "Code point 0xF7808080 should be rejected", Continue); + + QEXPECT_FAIL("xmldocs/not-wf/sa/180.xml", "Entity e is not defined", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/181.xml", "Unregistered error message", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/182.xml", "Comment not terminated", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/185.xml", "Entity e not defined", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/186.xml", "Attributes constructs error", Continue); QVERIFY(!parser.parseFile(&file)); @@ -401,7 +401,7 @@ void tst_QXmlSimpleReader::testBadXmlFile() ref_stream.setCodec("UTF-8"); QString ref_file_contents = ref_stream.readAll(); - QEXPECT_FAIL("xmldocs/not-wf/sa/145.xml", "", Continue); + QEXPECT_FAIL("xmldocs/not-wf/sa/145.xml", "Surrogate code point 0xD800 should be rejected", Continue); QCOMPARE(parser.result(), ref_file_contents); } -- cgit v1.2.3