Tests: fix index out of range in applicationFilePath()

Most probably in order to prevent instantiating QApplication despite QtGui module was used, some test cases used QTEST_APPLESS_MAIN and instantiated QCoreApplication manually, passing argc=0. QCoreApplication::applicationFilePath() does not expect argc ever being less than one. Qt5 testlib comes with QTEST_GUILESS_MAIN which works as expected here. For Qt4 build QTEST_GUILESS_MAIN definition is available from project file. This also fixes many failures to find a file at path relative to test executable. Note that in ft_locales.cpp QTEST_MAIN is used as QGuiApplication is needed by the code.
sailfishos · Oct 7, 2014 · 95a5e84 · 95a5e84
1 parent a681185
commit 95a5e84
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 101 deletions.
diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri
@@ -29,3 +29,11 @@ equals(QT_MAJOR_VERSION, 5): support_files.path = $$[QT_INSTALL_LIBS]/libmlocale
 INSTALLS += support_files
 
 CONFIG-=app_bundle
+
+equals(QT_MAJOR_VERSION, 4): DEFINES += '\'QTEST_GUILESS_MAIN(TestObject)=\
+int main(int argc, char *argv[]) \
+{ \
+    QCoreApplication app(argc, argv); \
+    TestObject tc; \
+    return QTest::qExec(&tc, argc, argv); \
+}\''
diff --git a/benchmarks/pt_mcalendar/pt_mcalendar.cpp b/benchmarks/pt_mcalendar/pt_mcalendar.cpp
@@ -29,9 +29,6 @@ using ML10N::MCalendar;
 
 void Pt_MCalendar::initTestCase()
 {
-    static int argc = 0;
-    static char *argv[1] = { (char *) "" };
-    qap = new QCoreApplication(argc, argv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
@@ -48,7 +45,6 @@ void Pt_MCalendar::initTestCase()
 
 void Pt_MCalendar::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Pt_MCalendar::init()
@@ -339,5 +335,5 @@ void Pt_MCalendar::benchmarkFormatDateTimeICU()
     }
 }
 
-QTEST_APPLESS_MAIN(Pt_MCalendar);
+QTEST_GUILESS_MAIN(Pt_MCalendar);
 
diff --git a/benchmarks/pt_mcalendar/pt_mcalendar.h b/benchmarks/pt_mcalendar/pt_mcalendar.h
@@ -31,7 +31,6 @@ class Pt_MCalendar : public QObject
     Q_OBJECT
 
 private:
-    QCoreApplication *qap;
     QString icuPackageVersion;
 
 private slots:

diff --git a/benchmarks/pt_mcharsetdetector/pt_mcharsetdetector.cpp b/benchmarks/pt_mcharsetdetector/pt_mcharsetdetector.cpp
@@ -24,17 +24,13 @@ using ML10N::MCharsetMatch;
 
 void Pt_MCharsetDetector::initTestCase()
 {
-    static int argc = 0;
-    static char *argv[1] = { (char *) "" };
-    qap = new QCoreApplication(argc, argv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
 }
 
 void Pt_MCharsetDetector::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Pt_MCharsetDetector::init()
@@ -148,4 +144,4 @@ void Pt_MCharsetDetector::benchmarkDetection()
     }
 }
 
-QTEST_APPLESS_MAIN(Pt_MCharsetDetector);
+QTEST_GUILESS_MAIN(Pt_MCharsetDetector);
diff --git a/benchmarks/pt_mcharsetdetector/pt_mcharsetdetector.h b/benchmarks/pt_mcharsetdetector/pt_mcharsetdetector.h
@@ -32,9 +32,6 @@ class Pt_MCharsetDetector : public QObject
 {
     Q_OBJECT
 
-private:
-    QCoreApplication *qap;
-
 private slots:
     void initTestCase();
     void cleanupTestCase();

diff --git a/benchmarks/pt_mlocale/pt_mlocale.cpp b/benchmarks/pt_mlocale/pt_mlocale.cpp
@@ -26,9 +26,6 @@ using ML10N::MCollator;
 
 void Pt_MLocale::initTestCase()
 {
-    static int argc = 0;
-    static char *argv[1] = { (char *) "" };
-    qap = new QCoreApplication(argc, argv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
@@ -47,7 +44,6 @@ void Pt_MLocale::initTestCase()
 
 void Pt_MLocale::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Pt_MLocale::init()
@@ -275,4 +271,4 @@ void Pt_MLocale::benchmarkCollatorStrengthSwitching()
     }
 }
 #endif
-QTEST_APPLESS_MAIN(Pt_MLocale);
+QTEST_GUILESS_MAIN(Pt_MLocale);
diff --git a/benchmarks/pt_mlocale/pt_mlocale.h b/benchmarks/pt_mlocale/pt_mlocale.h
@@ -37,7 +37,6 @@ class Pt_MLocale : public QObject
     Q_OBJECT
 
 private:
-    QCoreApplication *qap;
     QString icuPackageVersion;
 
 private slots:

diff --git a/benchmarks/pt_mlocationdatabase/pt_mlocationdatabase.cpp b/benchmarks/pt_mlocationdatabase/pt_mlocationdatabase.cpp
@@ -28,17 +28,13 @@ using ML10N::MLocationDatabase;
 
 void Pt_MLocationDatabase::initTestCase()
 {
-    static int argc = 0;
-    static char *argv[1] = { (char *) "" };
-    qap = new QCoreApplication(argc, argv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
 }
 
 void Pt_MLocationDatabase::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Pt_MLocationDatabase::init()
@@ -108,5 +104,5 @@ void Pt_MLocationDatabase::benchmarkMatchingCities()
     }
 }
 
-QTEST_APPLESS_MAIN(Pt_MLocationDatabase);
+QTEST_GUILESS_MAIN(Pt_MLocationDatabase);
 
diff --git a/benchmarks/pt_mlocationdatabase/pt_mlocationdatabase.h b/benchmarks/pt_mlocationdatabase/pt_mlocationdatabase.h
@@ -28,9 +28,6 @@ class Pt_MLocationDatabase : public QObject
 {
     Q_OBJECT
 
-private:
-    QCoreApplication *qap;
-
 private slots:
     void initTestCase();
     void cleanupTestCase();

diff --git a/tests/common_top.pri b/tests/common_top.pri
@@ -30,3 +30,11 @@ support_files.files =
 equals(QT_MAJOR_VERSION, 4): support_files.path = $$[QT_INSTALL_LIBS]/libmlocale-tests
 equals(QT_MAJOR_VERSION, 5): support_files.path = $$[QT_INSTALL_LIBS]/libmlocale-tests5
 INSTALLS += support_files
+
+equals(QT_MAJOR_VERSION, 4): DEFINES += '\'QTEST_GUILESS_MAIN(TestObject)=\
+int main(int argc, char *argv[]) \
+{ \
+    QCoreApplication app(argc, argv); \
+    TestObject tc; \
+    return QTest::qExec(&tc, argc, argv); \
+}\''
diff --git a/tests/ft_breakiterator/ft_breakiterator.cpp b/tests/ft_breakiterator/ft_breakiterator.cpp
@@ -37,17 +37,13 @@ class TestBreakIterator : public MBreakIterator
 
 void Ft_BreakIterator::initTestCase()
 {
-    static int argc = 0;
-    static char *argv[1] = { (char *) "" };
-    qap = new QCoreApplication(argc, argv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
 }
 
 void Ft_BreakIterator::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Ft_BreakIterator::init()
@@ -334,4 +330,4 @@ void Ft_BreakIterator::peek()
 }
 
 
-QTEST_APPLESS_MAIN(Ft_BreakIterator);
+QTEST_GUILESS_MAIN(Ft_BreakIterator);
diff --git a/tests/ft_breakiterator/ft_breakiterator.h b/tests/ft_breakiterator/ft_breakiterator.h
@@ -37,9 +37,6 @@ class Ft_BreakIterator : public QObject
 {
     Q_OBJECT
 
-private:
-    QCoreApplication *qap;
-
 private slots:
     void initTestCase();
     void cleanupTestCase();

diff --git a/tests/ft_localedata/ft_localedata.cpp b/tests/ft_localedata/ft_localedata.cpp
@@ -23,9 +23,6 @@ using ML10N::MLocale;
 
 void Ft_LocaleData::initTestCase()
 {
-    static int argc = 0;
-    static char *argv[1] = { (char *) "" };
-    app = new QCoreApplication(argc, argv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
@@ -99,4 +96,4 @@ void Ft_LocaleData::testNumberData()
     QCOMPARE(locale.formatNumber(value), result);
 }
 
-QTEST_APPLESS_MAIN(Ft_LocaleData);
+QTEST_GUILESS_MAIN(Ft_LocaleData);
diff --git a/tests/ft_localedata/ft_localedata.h b/tests/ft_localedata/ft_localedata.h
@@ -35,9 +35,6 @@ class Ft_LocaleData : public QObject
 {
     Q_OBJECT
 
-private:
-    QCoreApplication *app;
-
 private slots:
     void initTestCase();
 

diff --git a/tests/ft_locales/ft_locales.cpp b/tests/ft_locales/ft_locales.cpp
@@ -31,9 +31,6 @@ class TestLocale : public MLocale
 
 void Ft_Locales::initTestCase()
 {
-    static int dummyArgc = 1;
-    static char *dummyArgv[1] = { (char *) "ft_locales" };
-    qap = new QCoreApplication(dummyArgc, dummyArgv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
@@ -50,7 +47,6 @@ void Ft_Locales::initTestCase()
 
 void Ft_Locales::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Ft_Locales::init()
@@ -4860,4 +4856,4 @@ void Ft_Locales::checkAvailableLocales()
     }
 }
 
-QTEST_APPLESS_MAIN(Ft_Locales);
+QTEST_MAIN(Ft_Locales);
diff --git a/tests/ft_locales/ft_locales.h b/tests/ft_locales/ft_locales.h
@@ -55,7 +55,6 @@ class Ft_Locales : public QObject
     Q_OBJECT
 
 private:
-    QCoreApplication *qap;
     QString libqtcore4PackageVersion;
 
 private slots:

diff --git a/tests/ft_mcharsetdetector/ft_mcharsetdetector.cpp b/tests/ft_mcharsetdetector/ft_mcharsetdetector.cpp
@@ -26,17 +26,13 @@ using ML10N::MCharsetDetector;
 
 void Ft_MCharsetDetector::initTestCase()
 {
-    static int dummyArgc = 1;
-    static char *dummyArgv[1] = { (char *) "ft_mcharsetdetector" };
-    qap = new QCoreApplication(dummyArgc, dummyArgv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
 }
 
 void Ft_MCharsetDetector::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Ft_MCharsetDetector::init()
@@ -2001,4 +1997,4 @@ void Ft_MCharsetDetector::testDetection()
     }
 }
 
-QTEST_APPLESS_MAIN(Ft_MCharsetDetector);
+QTEST_GUILESS_MAIN(Ft_MCharsetDetector);
diff --git a/tests/ft_mcharsetdetector/ft_mcharsetdetector.h b/tests/ft_mcharsetdetector/ft_mcharsetdetector.h
@@ -34,9 +34,6 @@ class Ft_MCharsetDetector : public QObject
 {
     Q_OBJECT
 
-private:
-    QCoreApplication *qap;
-
 private slots:
     void initTestCase();
     void cleanupTestCase();

diff --git a/tests/ft_mlocalebuckets/ft_mlocalebuckets.cpp b/tests/ft_mlocalebuckets/ft_mlocalebuckets.cpp
@@ -38,16 +38,11 @@ using std::endl;
 using ML10N::MLocale;
 using ML10N::MLocaleBuckets;
 
-QCoreApplication *app = 0;
 QStringList inputItems;
 
 
 void Ft_MLocaleBuckets::initTestCase()
 {
-    static char *argv[] = { (char *) "./ft_mlocalebuckets" };
-    static int argc = 1;
-    app = new QCoreApplication(argc, argv);
-
     // This is important for string constants with non-ASCII characters:
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
@@ -74,7 +69,6 @@ void Ft_MLocaleBuckets::initTestCase()
 
 void Ft_MLocaleBuckets::cleanupTestCase()
 {
-    delete app;
 }
 
 
@@ -868,4 +862,4 @@ void Ft_MLocaleBuckets::sortTestFiles()
     testOutputFile.close();
 }
 
-QTEST_APPLESS_MAIN(Ft_MLocaleBuckets)
+QTEST_GUILESS_MAIN(Ft_MLocaleBuckets)
diff --git a/tests/ft_mstringsearch/ft_mstringsearch.cpp b/tests/ft_mstringsearch/ft_mstringsearch.cpp
@@ -27,17 +27,13 @@ using ML10N::MStringSearch;
 
 void Ft_MStringSearch::initTestCase()
 {
-    static int dummyArgc = 1;
-    static char *dummyArgv[1] = { (char *) "ft_mstringsearch" };
-    qap = new QCoreApplication(dummyArgc, dummyArgv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
 }
 
 void Ft_MStringSearch::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Ft_MStringSearch::init()
@@ -682,5 +678,5 @@ void Ft_MStringSearch::testSearch()
     QCOMPARE(matchText, firstMatchText);
 }
 
-QTEST_APPLESS_MAIN(Ft_MStringSearch);
+QTEST_GUILESS_MAIN(Ft_MStringSearch);
 
diff --git a/tests/ft_mstringsearch/ft_mstringsearch.h b/tests/ft_mstringsearch/ft_mstringsearch.h
@@ -37,9 +37,6 @@ class Ft_MStringSearch : public QObject
 {
     Q_OBJECT
 
-private:
-    QCoreApplication *qap;
-
 private slots:
     void initTestCase();
     void cleanupTestCase();

diff --git a/tests/ft_numbers/ft_numbers.cpp b/tests/ft_numbers/ft_numbers.cpp
@@ -25,9 +25,6 @@ using ML10N::MLocale;
 
 void Ft_Numbers::initTestCase()
 {
-    static int argc = 0;
-    static char *argv[1] = { (char *) "" };
-    qap = new QCoreApplication(argc, argv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
@@ -44,7 +41,6 @@ void Ft_Numbers::initTestCase()
 
 void Ft_Numbers::cleanupTestCase()
 {
-    delete qap;
 }
 
 void Ft_Numbers::init()
@@ -3286,5 +3282,5 @@ void Ft_Numbers::testToLocalizedNumbers()
     QCOMPARE(result, expectedResult);
 }
 
-QTEST_APPLESS_MAIN(Ft_Numbers);
+QTEST_GUILESS_MAIN(Ft_Numbers);
 
diff --git a/tests/ft_numbers/ft_numbers.h b/tests/ft_numbers/ft_numbers.h
@@ -41,7 +41,6 @@ class Ft_Numbers : public QObject
     Q_OBJECT
 
 private:
-    QCoreApplication *qap;
     QString icuPackageVersion;
 
 private slots:

diff --git a/tests/ft_sorting/ft_sorting.cpp b/tests/ft_sorting/ft_sorting.cpp
@@ -38,9 +38,6 @@ class TestCollator : public MCollator
 
 void Ft_Sorting::initTestCase()
 {
-    static int argc = 0;
-    static char *argv[1] = { (char *) "" };
-    qap = new QCoreApplication(argc, argv);
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 #endif
@@ -536,4 +533,4 @@ void Ft_Sorting::testCompareWithLocale()
     QVERIFY2(mcomp.compare(loc2, str1, str2) == result, "Compare failed");
 }
 
-QTEST_APPLESS_MAIN(Ft_Sorting);
+QTEST_GUILESS_MAIN(Ft_Sorting);