diff options
Diffstat (limited to 'tests/auto/xml/dom/qdom/tst_qdom.cpp')
| -rw-r--r-- | tests/auto/xml/dom/qdom/tst_qdom.cpp | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp index b5dc2e6081..a2f6d36264 100644 --- a/tests/auto/xml/dom/qdom/tst_qdom.cpp +++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp @@ -290,18 +290,20 @@ void tst_QDom::setContent() void tst_QDom::toString_01_data() { QTest::addColumn<QString>("fileName"); + const QString prefix = QFINDTESTDATA("testdata/toString_01"); + if (prefix.isEmpty()) + QFAIL("Cannot find testdata directory!"); + QTest::newRow( "01" ) << QString(prefix + "/doc01.xml"); + QTest::newRow( "02" ) << QString(prefix + "/doc02.xml"); + QTest::newRow( "03" ) << QString(prefix + "/doc03.xml"); + QTest::newRow( "04" ) << QString(prefix + "/doc04.xml"); + QTest::newRow( "05" ) << QString(prefix + "/doc05.xml"); - QTest::newRow( "01" ) << QString(SRCDIR "testdata/toString_01/doc01.xml"); - QTest::newRow( "02" ) << QString(SRCDIR "testdata/toString_01/doc02.xml"); - QTest::newRow( "03" ) << QString(SRCDIR "testdata/toString_01/doc03.xml"); - QTest::newRow( "04" ) << QString(SRCDIR "testdata/toString_01/doc04.xml"); - QTest::newRow( "05" ) << QString(SRCDIR "testdata/toString_01/doc05.xml"); - - QTest::newRow( "euc-jp" ) << QString(SRCDIR "testdata/toString_01/doc_euc-jp.xml"); - QTest::newRow( "iso-2022-jp" ) << QString(SRCDIR "testdata/toString_01/doc_iso-2022-jp.xml"); - QTest::newRow( "little-endian" ) << QString(SRCDIR "testdata/toString_01/doc_little-endian.xml"); - QTest::newRow( "utf-16" ) << QString(SRCDIR "testdata/toString_01/doc_utf-16.xml"); - QTest::newRow( "utf-8" ) << QString(SRCDIR "testdata/toString_01/doc_utf-8.xml"); + QTest::newRow( "euc-jp" ) << QString(prefix + "/doc_euc-jp.xml"); + QTest::newRow( "iso-2022-jp" ) << QString(prefix + "/doc_iso-2022-jp.xml"); + QTest::newRow( "little-endian" ) << QString(prefix + "/doc_little-endian.xml"); + QTest::newRow( "utf-16" ) << QString(prefix + "/doc_utf-16.xml"); + QTest::newRow( "utf-8" ) << QString(prefix + "/doc_utf-8.xml"); } @@ -471,7 +473,10 @@ void tst_QDom::save() void tst_QDom::initTestCase() { - QFile file(SRCDIR "testdata/excludedCodecs.txt"); + QString testFile = QFINDTESTDATA("testdata/excludedCodecs.txt"); + if (testFile.isEmpty()) + QFAIL("Cannot find testdata/excludedCodecs.txt"); + QFile file(testFile); QVERIFY(file.open(QIODevice::ReadOnly|QIODevice::Text)); QByteArray codecName; @@ -546,19 +551,21 @@ void tst_QDom::saveWithSerialization() const void tst_QDom::saveWithSerialization_data() const { QTest::addColumn<QString>("fileName"); - - QTest::newRow("doc01.xml") << QString(SRCDIR "testdata/toString_01/doc01.xml"); - QTest::newRow("doc01.xml") << QString(SRCDIR "testdata/toString_01/doc01.xml"); - QTest::newRow("doc02.xml") << QString(SRCDIR "testdata/toString_01/doc02.xml"); - QTest::newRow("doc03.xml") << QString(SRCDIR "testdata/toString_01/doc03.xml"); - QTest::newRow("doc04.xml") << QString(SRCDIR "testdata/toString_01/doc04.xml"); - QTest::newRow("doc05.xml") << QString(SRCDIR "testdata/toString_01/doc05.xml"); - - QTest::newRow("doc_euc-jp.xml") << QString(SRCDIR "testdata/toString_01/doc_euc-jp.xml"); - QTest::newRow("doc_iso-2022-jp.xml") << QString(SRCDIR "testdata/toString_01/doc_iso-2022-jp.xml"); - QTest::newRow("doc_little-endian.xml") << QString(SRCDIR "testdata/toString_01/doc_little-endian.xml"); - QTest::newRow("doc_utf-16.xml") << QString(SRCDIR "testdata/toString_01/doc_utf-16.xml"); - QTest::newRow("doc_utf-8.xml") << QString(SRCDIR "testdata/toString_01/doc_utf-8.xml"); + const QString prefix = QFINDTESTDATA("testdata/toString_01"); + if (prefix.isEmpty()) + QFAIL("Cannot find testdata!"); + QTest::newRow("doc01.xml") << QString(prefix + "/doc01.xml"); + QTest::newRow("doc01.xml") << QString(prefix + "/doc01.xml"); + QTest::newRow("doc02.xml") << QString(prefix + "/doc02.xml"); + QTest::newRow("doc03.xml") << QString(prefix + "/doc03.xml"); + QTest::newRow("doc04.xml") << QString(prefix + "/doc04.xml"); + QTest::newRow("doc05.xml") << QString(prefix + "/doc05.xml"); + + QTest::newRow("doc_euc-jp.xml") << QString(prefix + "/doc_euc-jp.xml"); + QTest::newRow("doc_iso-2022-jp.xml") << QString(prefix + "/doc_iso-2022-jp.xml"); + QTest::newRow("doc_little-endian.xml") << QString(prefix + "/doc_little-endian.xml"); + QTest::newRow("doc_utf-16.xml") << QString(prefix + "/doc_utf-16.xml"); + QTest::newRow("doc_utf-8.xml") << QString(prefix + "/doc_utf-8.xml"); } void tst_QDom::cloneNode_data() @@ -1775,7 +1782,10 @@ void tst_QDom::doubleNamespaceDeclarations() const { QDomDocument doc; - QFile file(SRCDIR "doubleNamespaces.xml" ); + QString testFile = QFINDTESTDATA("doubleNamespaces.xml"); + if (testFile.isEmpty()) + QFAIL("Cannot find test file doubleNamespaces.xml!"); + QFile file(testFile); QVERIFY(file.open(QIODevice::ReadOnly)); QXmlSimpleReader reader; |