From 058d4afe3d755d2e31e077c26aa338417fa31f72 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 25 Aug 2011 12:53:07 +1000 Subject: [PATCH] Remove mode parameter from QTestLog::addSkip(). The mode parameter is never used by the logging code, so there's little value in passing it there. Change-Id: Ibe2cbe5eaf457a7e3ffd3aea3a4be7c8278c91b6 Reviewed-on: http://codereview.qt.nokia.com/3547 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- src/testlib/qtestcase.cpp | 2 +- src/testlib/qtestlog.cpp | 3 +-- src/testlib/qtestlog_p.h | 3 +-- src/testlib/qtestresult.cpp | 5 ++--- src/testlib/qtestresult_p.h | 3 +-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index c63d333261..9c50257b44 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1959,7 +1959,7 @@ bool QTest::qVerify(bool statement, const char *statementStr, const char *descri void QTest::qSkip(const char *message, QTest::SkipMode mode, const char *file, int line) { - QTestResult::addSkip(message, mode, file, line); + QTestResult::addSkip(message, file, line); if (mode == QTest::SkipAll) QTestResult::setSkipCurrentTest(true); } diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index 674772f95b..a13bcdc7f8 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -275,8 +275,7 @@ void QTestLog::addXPass(const char *msg, const char *file, int line) QTest::testLogger->addIncident(QAbstractTestLogger::XPass, msg, file, line); } -void QTestLog::addSkip(const char *msg, QTest::SkipMode /*mode*/, - const char *file, int line) +void QTestLog::addSkip(const char *msg, const char *file, int line) { QTEST_ASSERT(QTest::testLogger); QTEST_ASSERT(msg); diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index ee94404744..006b3ac12f 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -72,8 +72,7 @@ public: static void addFail(const char *msg, const char *file, int line); static void addXFail(const char *msg, const char *file, int line); static void addXPass(const char *msg, const char *file, int line); - static void addSkip(const char *msg, QTest::SkipMode mode, - const char *file, int line); + static void addSkip(const char *msg, const char *file, int line); static void addBenchmarkResult(const QBenchmarkResult &result); static void addIgnoreMessage(QtMsgType type, const char *msg); static int unhandledIgnoreMessages(); diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 7fb0208bb3..4a6764b115 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -285,12 +285,11 @@ void QTestResult::addFailure(const char *message, const char *file, int line) ++QTest::fails; } -void QTestResult::addSkip(const char *message, QTest::SkipMode mode, - const char *file, int line) +void QTestResult::addSkip(const char *message, const char *file, int line) { clearExpectFail(); - QTestLog::addSkip(message, mode, file, line); + QTestLog::addSkip(message, file, line); ++QTest::skips; } diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h index a3e265ffac..1ce81854b5 100644 --- a/src/testlib/qtestresult_p.h +++ b/src/testlib/qtestresult_p.h @@ -93,8 +93,7 @@ public: static void setCurrentTestFunction(const char *func); static void setCurrentTestLocation(TestLocation loc); static void setCurrentTestObject(const char *name); - static void addSkip(const char *message, QTest::SkipMode mode, - const char *file, int line); + static void addSkip(const char *message, const char *file, int line); static bool expectFail(const char *dataIndex, const char *comment, QTest::TestFailMode mode, const char *file, int line); static bool verify(bool statement, const char *statementStr, const char *extraInfo,