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 /tests | |
| 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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_xunit.txt | 13 |
1 files changed, 7 insertions, 6 deletions
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 ********* |