summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-11-29 16:45:52 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-01 09:12:57 +0100
commit8481369f3d80d33aa9504e762c8a1cb28769e9be (patch)
treea62985e3969274c7abd330d1ad087323e9f2c50c /tests
parent3385fb91e1e55e1bfa1f78dfb8ce2e9f3fdaedef (diff)
testlib: add QFINDTESTDATA macro for finding testdata files
Automated tests often need to load some data from external files. Currently, a wide variety of approaches for this have been used in Qt autotests, including: - embed the source directory into the test binary at compile time, and find the testdata relative to that; this fails when the source tree is no longer available (e.g. when the tests are deployed to a device). - use a path relative to the current working directory, and trust that the caller always sets the current working directory such that the testdata can be found; this fails when the caller uses a different working directory than expected. - use a path relative to QCoreApplication::applicationDirPath(); this fails when source tree != build tree (since testdata is not automatically copied into the build tree). - compile the files into the binary using the Qt resource system; this should work, but does not allow for testing of code which genuinely needs external files. It seems that there is not a simple method for determining the testdata path which can be reliably used in all circumstances, so various tests have reinvented the testdata location method in different ways. Therefore, this is a good candidate for an addition to the testlib API. The current implementation of QFINDTESTDATA is able to find testdata in all three of (build tree, install tree, source tree), in that order. Change-Id: Ib2fed860723ccf437240da3b00db22dfe1a6b56c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/testlib/selftests/expected_findtestdata.lightxml16
-rw-r--r--tests/auto/testlib/selftests/expected_findtestdata.txt9
-rw-r--r--tests/auto/testlib/selftests/expected_findtestdata.xml19
-rw-r--r--tests/auto/testlib/selftests/expected_findtestdata.xunitxml15
-rw-r--r--tests/auto/testlib/selftests/findtestdata/findtestdata.cpp144
-rw-r--r--tests/auto/testlib/selftests/findtestdata/findtestdata.pro8
-rw-r--r--tests/auto/testlib/selftests/findtestdata/qt.conf4
-rw-r--r--tests/auto/testlib/selftests/selftests.pro2
-rw-r--r--tests/auto/testlib/selftests/selftests.qrc4
-rw-r--r--tests/auto/testlib/selftests/tst_selftests.cpp1
10 files changed, 221 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.lightxml b/tests/auto/testlib/selftests/expected_findtestdata.lightxml
new file mode 100644
index 0000000000..f1944c4897
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_findtestdata.lightxml
@@ -0,0 +1,16 @@
+<Environment>
+ <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="paths">
+<Message type="warn" file="findtestdata.cpp" line="131">
+ <Description><![CDATA[testdata testfile could not be located!]]></Description>
+</Message>
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.txt b/tests/auto/testlib/selftests/expected_findtestdata.txt
new file mode 100644
index 0000000000..e9387a38c8
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_findtestdata.txt
@@ -0,0 +1,9 @@
+********* Start testing of FindTestData *********
+Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
+PASS : FindTestData::initTestCase()
+WARNING: FindTestData::paths() testdata testfile could not be located!
+ Loc: [findtestdata.cpp(131)]
+PASS : FindTestData::paths()
+PASS : FindTestData::cleanupTestCase()
+Totals: 3 passed, 0 failed, 0 skipped
+********* Finished testing of FindTestData *********
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xml b/tests/auto/testlib/selftests/expected_findtestdata.xml
new file mode 100644
index 0000000000..bcb5a2e536
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_findtestdata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<TestCase name="FindTestData">
+<Environment>
+ <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="paths">
+<Message type="warn" file="findtestdata.cpp" line="131">
+ <Description><![CDATA[testdata testfile could not be located!]]></Description>
+</Message>
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+</TestCase>
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xunitxml b/tests/auto/testlib/selftests/expected_findtestdata.xunitxml
new file mode 100644
index 0000000000..60283a1064
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_findtestdata.xunitxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite errors="1" failures="0" tests="3" name="FindTestData">
+ <properties>
+ <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+ <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
+ </properties>
+ <testcase result="pass" name="initTestCase"/>
+ <testcase result="pass" name="paths">
+ <!-- message="testdata testfile could not be located!" type="warn" -->
+ </testcase>
+ <testcase result="pass" name="cleanupTestCase"/>
+ <system-err>
+<![CDATA[testdata testfile could not be located!]]>
+ </system-err>
+</testsuite>
diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp b/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp
new file mode 100644
index 0000000000..473ba19798
--- /dev/null
+++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtCore/QtCore>
+#include <QtTest/QtTest>
+
+#define TESTFILE "testfile"
+
+class FindTestData: public QObject
+{
+ Q_OBJECT
+private slots:
+ void initTestCase();
+ void cleanupTestCase();
+
+ void paths();
+
+private:
+ bool touch(QString const&);
+};
+
+void FindTestData::initTestCase()
+{
+ // verify that our qt.conf is working as expected.
+ QString app_path = QCoreApplication::applicationDirPath();
+ QString install_path = app_path + "/tests";
+ QVERIFY(QDir("/").mkpath(install_path));
+ QVERIFY(QDir("/").mkpath(install_path + "/findtestdata"));
+ QCOMPARE(QLibraryInfo::location(QLibraryInfo::TestsPath), install_path);
+
+ // make fake source and build directories
+ QVERIFY(QDir("/").mkpath(app_path + "/fakesrc"));
+ QVERIFY(QDir("/").mkpath(app_path + "/fakebuild"));
+}
+
+void FindTestData::cleanupTestCase()
+{
+ QString app_path = QCoreApplication::applicationDirPath();
+ QFile(app_path + "/tests/findtestdata/" TESTFILE).remove();
+ QFile(app_path + "/tests/" TESTFILE).remove();
+ QFile(app_path + "/fakesrc/" TESTFILE).remove();
+ QDir("/").rmpath(app_path + "/tests/findtestdata");
+ QDir("/").rmpath(app_path + "/fakesrc");
+ QDir("/").rmpath(app_path + "/fakebuild");
+}
+
+// Create an empty file at the specified path (or return false)
+bool FindTestData::touch(QString const& path)
+{
+ QFile file(path);
+ if (!file.open(QIODevice::WriteOnly)) {
+ qWarning("Failed to create %s: %s", qPrintable(path), qPrintable(file.errorString()));
+ return false;
+ }
+ return true;
+}
+
+void FindTestData::paths()
+{
+ // There are three possible locations for the testdata.
+ // In this test, we will put the testdata at all three locations,
+ // then remove it from one location at a time and verify that
+ // QFINDTESTDATA correctly falls back each time.
+
+ // 1. relative to test binary.
+ QString app_path = QCoreApplication::applicationDirPath();
+ QString testfile_path1 = app_path + "/" TESTFILE;
+ QVERIFY(touch(testfile_path1));
+
+ // 2. at the test install path (faked via qt.conf)
+ QString testfile_path2 = app_path + "/tests/findtestdata/" TESTFILE;
+ QVERIFY(touch(testfile_path2));
+
+ // 3. at the source path (which we will fake later on)
+ QString testfile_path3 = app_path + "/fakesrc/" TESTFILE;
+ QVERIFY(touch(testfile_path3));
+
+ // OK, all testdata created. Verify that they are found in correct priority order.
+
+ QCOMPARE(QFINDTESTDATA(TESTFILE), testfile_path1);
+ QVERIFY(QFile(testfile_path1).remove());
+
+ QCOMPARE(QFINDTESTDATA(TESTFILE), testfile_path2);
+ QVERIFY(QFile(testfile_path2).remove());
+
+ // We cannot reasonably redefine __FILE__, so we call the underlying function instead.
+ // __FILE__ may be absolute or relative path; test both.
+
+ // absolute:
+ QCOMPARE(QTest::qFindTestData(TESTFILE, qPrintable(app_path + "/fakesrc/fakefile.cpp"), __LINE__), testfile_path3);
+
+ // relative: (pretend that we were compiled within fakebuild directory, pointing at files in ../fakesrc)
+ QCOMPARE(QTest::qFindTestData(TESTFILE, "../fakesrc/fakefile.cpp", __LINE__, qPrintable(app_path + "/fakebuild")), testfile_path3);
+
+ QVERIFY(QFile(testfile_path3).remove());
+
+ // Note, this is expected to generate a warning.
+ // We can't use ignoreMessage, because the warning comes from testlib,
+ // not via a "normal" qWarning. But it's OK, our caller (tst_selftests)
+ // will verify that the warning is printed.
+ QCOMPARE(QFINDTESTDATA(TESTFILE), QString());
+}
+
+QTEST_MAIN(FindTestData)
+#include "findtestdata.moc"
diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro
new file mode 100644
index 0000000000..6e072aeb6f
--- /dev/null
+++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro
@@ -0,0 +1,8 @@
+SOURCES += findtestdata.cpp
+QT = core testlib
+
+mac:CONFIG -= app_bundle
+CONFIG -= debug_and_release_target
+
+
+TARGET = findtestdata
diff --git a/tests/auto/testlib/selftests/findtestdata/qt.conf b/tests/auto/testlib/selftests/findtestdata/qt.conf
new file mode 100644
index 0000000000..f65543c63c
--- /dev/null
+++ b/tests/auto/testlib/selftests/findtestdata/qt.conf
@@ -0,0 +1,4 @@
+# This file does not need to contain anything.
+# Its mere presence will cause this directory to be treated as the
+# Qt install prefix. The findtestdata test uses this to "fake" the
+# tests install path.
diff --git a/tests/auto/testlib/selftests/selftests.pro b/tests/auto/testlib/selftests/selftests.pro
index 9f772ebdea..68239754aa 100644
--- a/tests/auto/testlib/selftests/selftests.pro
+++ b/tests/auto/testlib/selftests/selftests.pro
@@ -6,7 +6,7 @@ SUBDIRS = subtest test warnings maxwarnings cmptest globaldata skip \
exceptionthrow qexecstringlist datatable commandlinedata\
benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \
benchliboptions xunit badxml longstring float printdatatags \
- printdatatagswithglobaltags
+ printdatatagswithglobaltags findtestdata
INSTALLS =
diff --git a/tests/auto/testlib/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc
index 2baa49cc56..fb303af2b5 100644
--- a/tests/auto/testlib/selftests/selftests.qrc
+++ b/tests/auto/testlib/selftests/selftests.qrc
@@ -124,6 +124,10 @@
<file>expected_subtest.txt</file>
<file>expected_subtest.xml</file>
<file>expected_subtest.xunitxml</file>
+ <file>expected_findtestdata.lightxml</file>
+ <file>expected_findtestdata.txt</file>
+ <file>expected_findtestdata.xml</file>
+ <file>expected_findtestdata.xunitxml</file>
<file>expected_warnings.lightxml</file>
<file>expected_warnings.txt</file>
<file>expected_warnings.xml</file>
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 7f82b7d899..b98a02aa4e 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -335,6 +335,7 @@ void tst_Selftests::runSubTest_data()
<< "sleep"
<< "strcmp"
<< "subtest"
+ << "findtestdata"
<< "warnings"
<< "xunit"
;