whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed xml unittests to work from installation directory 

- Changed to use QFINDTESTDATA and TESTDATA

Change-Id: Ib738adfb6d0553e4c995ccaa51e34335f00f50f0
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
bb10
Kurt Korbatits 2012-01-18 12:32:58 +10:00 committed by Qt by Nokia
parent 67a3698b3c
commit 3664d3b842
6 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/xml/dom/qdom/qdom.pro
View File

@ -6,15 +6,8 @@ QT = core xml testlib
QT -= gui
wince* {
addFiles.files = testdata doubleNamespaces.xml umlaut.xml
addFiles.path = .
DEPLOYMENT += addFiles
wince*|qt_not_deployed {
DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
}
DEFINES += SRCDIR=\\\"\\\"
}
else {
DEFINES += SRCDIR=\\\"$$PWD/\\\"
}
TESTDATA += testdata/* doubleNamespaces.xml umlaut.xml

60
tests/auto/xml/dom/qdom/tst_qdom.cpp
View File

@ -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");
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("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");
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;

6
tests/auto/xml/sax/qxml/qxml.pro
View File

@ -4,8 +4,4 @@ TARGET = tst_qxml
SOURCES += tst_qxml.cpp
QT = core xml testlib
wince* {
addFiles.files = 0x010D.xml
addFiles.path = .
DEPLOYMENT += addFiles
}
TESTDATA += 0x010D.xml

5
tests/auto/xml/sax/qxml/tst_qxml.cpp
View File

@ -196,7 +196,10 @@ void tst_QXml::interpretedAs0D() const
QChar(0x010D) +
QLatin1String("reated-by=\"an attr value\"/>"));
QFile f("0x010D.xml");
QString testFile = QFINDTESTDATA("0x010D.xml");
if (testFile.isEmpty())
QFAIL("Cannot find test file 0x010D.xml!");
QFile f(testFile);
QVERIFY(f.open(QIODevice::ReadOnly));
QXmlInputSource data(&f);

6
tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
View File

@ -12,8 +12,4 @@ CONFIG += no_batch
QT += network xml testlib
QT -= gui
wince* {
addFiles.files = encodings parser xmldocs
addFiles.path = .
DEPLOYMENT += addFiles
}
TESTDATA += encodings/* xmldocs/*

11
tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
View File

@ -141,7 +141,7 @@ class tst_QXmlSimpleReader : public QObject
~tst_QXmlSimpleReader();
private slots:
void initTestCase();
void testGoodXmlFile();
void testGoodXmlFile_data();
void testBadXmlFile();
@ -164,6 +164,7 @@ class tst_QXmlSimpleReader : public QObject
private:
static QDomDocument fromByteArray(const QString &title, const QByteArray &ba, bool *ok);
XmlServer *server;
QString prefix;
};
tst_QXmlSimpleReader::tst_QXmlSimpleReader()
@ -210,6 +211,14 @@ public:
};
void tst_QXmlSimpleReader::initTestCase()
{
prefix = QFileInfo(QFINDTESTDATA("xmldocs")).absolutePath();
if (prefix.isEmpty())
QFAIL("Cannot find xmldocs testdata!");
QDir::setCurrent(prefix);
}
void tst_QXmlSimpleReader::idsInParseException1()
{
MyErrorHandler handler;