diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-09-25 16:23:45 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 18:45:16 +0200 |
commit | a3530859e9a7423db0b6839f15538f248aaf4a79 (patch) | |
tree | 72bc9467a84a8e74b212d9539201087777b06e11 /tests/auto/corelib/kernel/qcoreapplication | |
parent | 0bf30a7caba53aa85dcbdc877ace5e25bf45b526 (diff) |
Expose QTest::currentAppName() and remove hard-coded argv[0] in tests
Except where we're actually testing QCoreApplication::applicationName()
and friends.
Change-Id: I25514884c11f43a4f82b1f818f822dc3d79f69a3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qcoreapplication')
-rw-r--r-- | tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index ccaa2bec4f..78f2cdae69 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -88,7 +88,7 @@ public: void tst_QCoreApplication::sendEventsOnProcessEvents() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); EventSpy spy; @@ -110,7 +110,7 @@ void tst_QCoreApplication::getSetCheck() // Test the property { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); QCOMPARE(app.property("applicationVersion").toString(), v); } @@ -135,7 +135,7 @@ void tst_QCoreApplication::argc() { { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); QCOMPARE(argc, 1); QCOMPARE(app.arguments().count(), 1); @@ -143,7 +143,7 @@ void tst_QCoreApplication::argc() { int argc = 4; - char *argv[] = { const_cast<char*>("tst_qcoreapplication"), + char *argv[] = { const_cast<char*>(QTest::currentAppName()), const_cast<char*>("arg1"), const_cast<char*>("arg2"), const_cast<char*>("arg3") }; @@ -162,7 +162,7 @@ void tst_QCoreApplication::argc() { int argc = 2; - char *argv[] = { const_cast<char*>("tst_qcoreapplication"), + char *argv[] = { const_cast<char*>(QTest::currentAppName()), const_cast<char*>("-qmljsdebugger=port:3768,block") }; QCoreApplication app(argc, argv); QCOMPARE(argc, 1); @@ -196,7 +196,7 @@ public: void tst_QCoreApplication::postEvent() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); EventSpy spy; @@ -281,7 +281,7 @@ void tst_QCoreApplication::postEvent() void tst_QCoreApplication::removePostedEvents() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); EventSpy spy; @@ -460,7 +460,7 @@ public: void tst_QCoreApplication::deliverInDefinedOrder() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); DeliverInDefinedOrderObject obj(&app); @@ -500,7 +500,7 @@ public: void tst_QCoreApplication::globalPostedEventsCount() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); QCoreApplication::sendPostedEvents(); @@ -546,7 +546,7 @@ public: void tst_QCoreApplication::processEventsAlwaysSendsPostedEvents() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); ProcessEventsAlwaysSendsPostedEventsObject object; @@ -564,7 +564,7 @@ void tst_QCoreApplication::processEventsAlwaysSendsPostedEvents() void tst_QCoreApplication::reexec() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); // exec once @@ -579,7 +579,7 @@ void tst_QCoreApplication::reexec() void tst_QCoreApplication::execAfterExit() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); app.exit(1); @@ -590,7 +590,7 @@ void tst_QCoreApplication::execAfterExit() void tst_QCoreApplication::eventLoopExecAfterExit() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); // exec once and exit @@ -648,7 +648,7 @@ void tst_QCoreApplication::customEventDispatcher() QVERIFY(!weak_ed.isNull()); { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); // instantiating app should not overwrite the ED QCOMPARE(QCoreApplication::eventDispatcher(), ed); @@ -763,7 +763,7 @@ private slots: void tst_QCoreApplication::testQuitLock() { int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); QuitTester tester; @@ -782,7 +782,7 @@ void tst_QCoreApplication::QTBUG31606_QEventDestructorDeadLock() }; int argc = 1; - char *argv[] = { const_cast<char*>("tst_qcoreapplication") }; + char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; QCoreApplication app(argc, argv); EventSpy spy; |