diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-08-25 15:43:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 12:17:45 +0200 |
commit | cb57d36f4559faf63acdca2cfb7b35431b959164 (patch) | |
tree | 6605f7c9c28fdd9cc2bb7c2c729697d47143f05b | |
parent | 24b99f819cdd78d3e0feee4847e69d62e41fd7ef (diff) |
Make QTest::qWarn() use __FILE__ and __LINE__.
This change makes QTest::qWarn() consistent with similar testlib
functions, which take __FILE__ and __LINE__.
Change-Id: I12977cb30672899ab38877b4a656f0cc0c7ea02c
Reviewed-on: http://codereview.qt-project.org/3559
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r-- | src/testlib/qtestcase.cpp | 4 | ||||
-rw-r--r-- | src/testlib/qtestcase.h | 4 | ||||
-rw-r--r-- | src/testlib/qtestlog.cpp | 4 | ||||
-rw-r--r-- | src/testlib/qtestlog_p.h | 2 | ||||
-rw-r--r-- | tests/auto/testlib/selftests/expected_xunit.txt | 13 |
5 files changed, 14 insertions, 13 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index d4703b7b3d..898e46de61 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1963,9 +1963,9 @@ bool QTest::qExpectFail(const char *dataIndex, const char *comment, /*! \internal */ -void QTest::qWarn(const char *message) +void QTest::qWarn(const char *message, const char *file, int line) { - QTestLog::warn(message); + QTestLog::warn(message, file, line); } /*! diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index b08b22e52b..b3ac5f0c4f 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -109,7 +109,7 @@ do {\ } while (0) #define QWARN(msg)\ - QTest::qWarn(msg) + QTest::qWarn(msg, __FILE__, __LINE__) class QObject; class QTestData; @@ -139,7 +139,7 @@ namespace QTest Q_TESTLIB_EXPORT void qSkip(const char *message, SkipMode mode, const char *file, int line); Q_TESTLIB_EXPORT bool qExpectFail(const char *dataIndex, const char *comment, TestFailMode mode, const char *file, int line); - Q_TESTLIB_EXPORT void qWarn(const char *message); + Q_TESTLIB_EXPORT void qWarn(const char *message, const char *file = 0, int line = 0); Q_TESTLIB_EXPORT void ignoreMessage(QtMsgType type, const char *message); Q_TESTLIB_EXPORT void *qData(const char *tagName, int typeId); diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index f3b416d3d1..acd1a49d44 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -385,12 +385,12 @@ bool QTestLog::loggerUsingStdout() return QTest::loggerUsingStdout; } -void QTestLog::warn(const char *msg) +void QTestLog::warn(const char *msg, const char *file, int line) { QTEST_ASSERT(msg); if (QTest::TestLoggers::loggerCount() > 0) - QTest::TestLoggers::addMessage(QAbstractTestLogger::Warn, msg); + QTest::TestLoggers::addMessage(QAbstractTestLogger::Warn, msg, file, line); } void QTestLog::info(const char *msg, const char *file, int line) diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index fe37469dc6..692a36a4e6 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -77,7 +77,7 @@ public: static int unhandledIgnoreMessages(); static void printUnhandledIgnoreMessages(); - static void warn(const char *msg); + static void warn(const char *msg, const char *file, int line); static void info(const char *msg, const char *file, int line); static void startLogging(); diff --git a/tests/auto/testlib/selftests/expected_xunit.txt b/tests/auto/testlib/selftests/expected_xunit.txt index 7eb4bffae8..ae2508c590 100644 --- a/tests/auto/testlib/selftests/expected_xunit.txt +++ b/tests/auto/testlib/selftests/expected_xunit.txt @@ -2,24 +2,25 @@ Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Xunit::initTestCase() WARNING: tst_Xunit::testFunc1() just a QWARN() ! + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(67)] PASS : tst_Xunit::testFunc1() QDEBUG : tst_Xunit::testFunc2() a qDebug() call with comment-ending stuff --> FAIL! : tst_Xunit::testFunc2() Compared values are not the same Actual (2): 2 Expected (3): 3 - Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(74)] + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(74)] SKIP : tst_Xunit::testFunc3() skipping this function! - Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(79)] + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(79)] FAIL! : tst_Xunit::testFunc4() a forced failure! - Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(84)] + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(84)] XFAIL : tst_Xunit::testFunc5() this failure is expected - Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(98)] + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(98)] PASS : tst_Xunit::testFunc5() XFAIL : tst_Xunit::testFunc6() this failure is also expected - Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(104)] + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(104)] PASS : tst_Xunit::testFunc6() XPASS : tst_Xunit::testFunc7() 'true' returned FALSE. () - Loc: [/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp(110)] + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(110)] PASS : tst_Xunit::cleanupTestCase() Totals: 5 passed, 3 failed, 1 skipped ********* Finished testing of tst_Xunit ********* |