diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-12-03 16:59:30 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-12-10 05:26:05 +0000 |
commit | 1289bc8172a6829884a670a2f91ee863add5d042 (patch) | |
tree | ac72a4da3d5b84d1c2fa09582a1f545ce4bae15b /tests/auto/corelib/json/tst_qtjson.cpp | |
parent | 872b9b231ef966ce7b2b40785ee92a0d4a8d2851 (diff) |
Tests: Remove empty init/cleanup slots, constructors and destructors.
Move some code (like registrations of meta types) from init() to
initTestCase() in the process.
Change-Id: I57db5156647cfadab554fbed853b2e68b2815f3b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'tests/auto/corelib/json/tst_qtjson.cpp')
-rw-r--r-- | tests/auto/corelib/json/tst_qtjson.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp index aebf332fe3..165464e7b9 100644 --- a/tests/auto/corelib/json/tst_qtjson.cpp +++ b/tests/auto/corelib/json/tst_qtjson.cpp @@ -46,14 +46,9 @@ class tst_QtJson: public QObject { Q_OBJECT -public: - tst_QtJson(QObject *parent = 0); private Q_SLOTS: void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); void testValueSimple(); void testNumbers(); @@ -151,10 +146,6 @@ private: QString testDataDir; }; -tst_QtJson::tst_QtJson(QObject *parent) : QObject(parent) -{ -} - void tst_QtJson::initTestCase() { testDataDir = QFileInfo(QFINDTESTDATA("test.json")).absolutePath(); @@ -162,18 +153,6 @@ void tst_QtJson::initTestCase() testDataDir = QCoreApplication::applicationDirPath(); } -void tst_QtJson::cleanupTestCase() -{ -} - -void tst_QtJson::init() -{ -} - -void tst_QtJson::cleanup() -{ -} - void tst_QtJson::testValueSimple() { QJsonObject object; |