Move pass/fail/skip counters from QTestResult to QTestLog.

This change will enable further simplification of QTestResult and
QTestLog in the future, including removing a circular dependency between
the two classes.

The "getter" functions in QTestResult are retained for now, but will be
removed in a future commit, once QtQuickTest has been changed to call
the getters that this commit adds to QTestLog.

This commit is adapted from an unfinished change by Henrik Hartz.

Change-Id: Ife7f80ac6a4310449a4712e96e0bea6c02139a5a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

1 files changed, 34 insertions, 0 deletions

diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 695c001e0f..b4a4256a59 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -58,6 +58,10 @@ QT_BEGIN_NAMESPACE
 
 namespace QTest {
 
+    int fails = 0;
+    int passes = 0;
+    int skips = 0;
+
     struct IgnoreResultList
     {
         inline IgnoreResultList(QtMsgType tp, const char *message)
@@ -305,6 +309,8 @@ void QTestLog::addPass(const char *msg)
 
     QTEST_ASSERT(msg);
 
+    ++QTest::passes;
+
     QTest::TestLoggers::addIncident(QAbstractTestLogger::Pass, msg);
 }
 
@@ -312,6 +318,8 @@ void QTestLog::addFail(const char *msg, const char *file, int line)
 {
     QTEST_ASSERT(msg);
 
+    ++QTest::fails;
+
     QTest::TestLoggers::addIncident(QAbstractTestLogger::Fail, msg, file, line);
 }
 
@@ -328,6 +336,8 @@ void QTestLog::addXPass(const char *msg, const char *file, int line)
     QTEST_ASSERT(msg);
     QTEST_ASSERT(file);
 
+    ++QTest::fails;
+
     QTest::TestLoggers::addIncident(QAbstractTestLogger::XPass, msg, file, line);
 }
 
@@ -336,6 +346,8 @@ void QTestLog::addSkip(const char *msg, const char *file, int line)
     QTEST_ASSERT(msg);
     QTEST_ASSERT(file);
 
+    ++QTest::skips;
+
     QTest::TestLoggers::addMessage(QAbstractTestLogger::Skip, msg, file, line);
 }
 
@@ -447,4 +459,26 @@ void QTestLog::setPrintAvailableTagsMode()
     printAvailableTags = true;
 }
 
+int QTestLog::passCount()
+{
+    return QTest::passes;
+}
+
+int QTestLog::failCount()
+{
+    return QTest::fails;
+}
+
+int QTestLog::skipCount()
+{
+    return QTest::skips;
+}
+
+void QTestLog::resetCounters()
+{
+    QTest::passes = 0;
+    QTest::fails = 0;
+    QTest::skips = 0;
+}
+
 QT_END_NAMESPACE