Changeset 846 for trunk/src/testlib/qtestcase.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qtestcase.cpp (modified) (18 diffs)

trunk/src/testlib/qtestcase.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -55 +55 @@
 #include <QtCore/qprocess.h>
 #include <QtCore/qdebug.h>
-#include <QtCore/qlibraryinfo.h>
 
 #include "QtTest/private/qtestlog_p.h"
@@ -300 +299 @@
     \relates QTest
 
-    Implements a main() function that instantiates a QApplication object and
+    Implements a main() function that instantiates application object and
     the \a TestClass, and executes all tests in the order they were defined.
     Use this macro to build stand-alone executables.
+
+
+
+
 
     \bold {Note:} On platforms that have keypad navigation enabled by default (eg: Symbian),
@@ -757 +760 @@
     the sequence by calling press(), move(), release() and stationary(), and let the
     instance run out of scope to commit the sequence to the event system.
+
+
+
 */
 
@@ -847 +853 @@
     static int eventDelay = -1;
     static int keyVerbose = -1;
+
+
+
 
 void filter_unprintable(char *str)
@@ -873 +882 @@
 
     return res;
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -977 +999 @@
          " -maxwarnings n    : Sets the maximum amount of messages to output.\n"
          "                     0 means unlimited, default: 2000\n"
+
+
+
          "\n"
          " Benchmark related options:\n"
@@ -990 +1015 @@
         " -median  n      : Sets the number of median iterations.\n"
         " -vb             : Print out verbose benchmarking information.\n"
-#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS)
-        " -chart          : Create chart based on the benchmark result.\n"
-#endif
          "\n"
         " -help      : This help\n";
@@ -1057 +1079 @@
                 QTestLog::setMaxWarnings(qToInt(argv[++i]));
             }
+
+
+
+
         } else if (strcmp(argv[i], "-keyevent-verbose") == 0) {
             QTest::keyVerbose = 1;
@@ -1106 +1132 @@
         } else if (strcmp(argv[i], "-vb") == 0) {
             QBenchmarkGlobalData::current->verboseOutput = true;
-#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS)
         } else if (strcmp(argv[i], "-chart") == 0) {
-            QBenchmarkGlobalData::current->createChart = true;
-            QTestLog::setLogMode(QTestLog::XML);
-            QTestLog::redirectOutput("results.xml");
-#endif
+            fprintf(stderr, "Warning: `-chart' option is not available\n");
         } else if (strcmp(argv[i], "-qws") == 0) {
             // do nothing
@@ -1204 +1226 @@
         do {
             QTestResult::setCurrentTestLocation(QTestResult::InitFunc);
-            QMetaObject::invokeMethod(QTest::currentTestObject, "init");
+            ");
             if (QTestResult::skipCurrentTest())
                 break;
@@ -1224 +1246 @@
 
             QTestResult::setCurrentTestLocation(QTestResult::CleanupFunc);
-            QMetaObject::invokeMethod(QTest::currentTestObject, "cleanup");
+            ");
             QTestResult::setCurrentTestLocation(QTestResult::NoWhere);
 
@@ -1291 +1313 @@
         if (curGlobalDataIndex == 0) {
             QTestResult::setCurrentTestLocation(QTestResult::DataFunc);
-            QTest::qt_snprintf(member, 512, "%s_data", slot);
-            QMetaObject::invokeMethod(QTest::currentTestObject, member, Qt::DirectConnection);
+            QTest::qt_snprintf(member, 512, "%s_data()", slot);
+            invokeMethod(QTest::currentTestObject, member);
+
             // if we encounter a SkipAll in the _data slot, we skip the whole
             // testfunction, no matter how much global data exists
@@ -1457 +1480 @@
     QTestResult::setCurrentTestLocation(QTestResult::DataFunc);
     QTestTable::globalTestTable();
-    QMetaObject::invokeMethod(testObject, "initTestCase_data", Qt::DirectConnection);
+    );
 
     if (!QTestResult::skipCurrentTest() && !QTest::currentTestFailed()) {
         QTestResult::setCurrentTestLocation(QTestResult::InitFunc);
-        QMetaObject::invokeMethod(testObject, "initTestCase");
+        ");
 
         // finishedCurrentTestFunction() resets QTestResult::testFailed(), so use a local copy.
@@ -1489 +1512 @@
         QTestResult::setSkipCurrentTest(false);
         QTestResult::setCurrentTestFunction("cleanupTestCase");
-        QMetaObject::invokeMethod(testObject, "cleanupTestCase");
+        ");
     }
     QTestResult::finishedCurrentTestFunction();
@@ -1542 +1565 @@
         // Don't overwrite any non-default handlers
         // however, we need to replace the default QWS handlers
-        if (oldact.sa_flags & SA_SIGINFO || oldact.sa_handler != SIG_DFL) {
+        if (
+#ifdef SA_SIGINFO
+            oldact.sa_flags & SA_SIGINFO ||
+#endif
+            oldact.sa_handler != SIG_DFL) {
             sigaction(fatalSignals[i], &oldact, 0);
         } else
@@ -1682 +1709 @@
     {
 #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
-        FatalSignalHandler handler;
+        QScopedPointer<FatalSignalHandler> handler;
+        if (!noCrashHandler)
+            handler.reset(new FatalSignalHandler);
 #endif
         qInvokeTestMethods(testObject);
@@ -1712 +1741 @@
          IOPMAssertionRelease(powerID);
      }
-#endif
-
-
-#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS)
-    if (QBenchmarkGlobalData::current->createChart) {
-        QString chartLocation = QLibraryInfo::location(QLibraryInfo::BinariesPath);
-#ifdef Q_OS_WIN
-        chartLocation += QLatin1String("/../tools/qtestlib/chart/release/chart.exe");
-#else
-        chartLocation += QLatin1String("/../tools/qtestlib/chart/chart");
-#endif
-        if (QFile::exists(chartLocation)) {
-            QProcess p;
-            p.setProcessChannelMode(QProcess::ForwardedChannels);
-            p.start(chartLocation, QStringList() << QLatin1String("results.xml"));
-            p.waitForFinished(-1);
-        } else {
-            qDebug() << QLatin1String("Could not find the chart tool in ") + chartLocation + QLatin1String(", please make sure it is compiled.");
-        }
-    }
 #endif