diff options
Diffstat (limited to 'tests/auto/testlib')
-rw-r--r-- | tests/auto/testlib/selftests/expected_warnings.txt | 10 | ||||
-rw-r--r-- | tests/auto/testlib/selftests/warnings/tst_warnings.cpp | 9 |
2 files changed, 1 insertions, 18 deletions
diff --git a/tests/auto/testlib/selftests/expected_warnings.txt b/tests/auto/testlib/selftests/expected_warnings.txt index 0a9437f47c..9a68879847 100644 --- a/tests/auto/testlib/selftests/expected_warnings.txt +++ b/tests/auto/testlib/selftests/expected_warnings.txt @@ -1,18 +1,10 @@ ********* Start testing of tst_Warnings ********* -Config: Using QTest library 4.1.0, Qt 4.1.0 +Config: Using QTest library 5.0.0, Qt 5.0.0 PASS : tst_Warnings::initTestCase() -testWarnings 1: next line prints "Warning" QWARN : tst_Warnings::testWarnings() Warning -testWarnings 2: next line prints nothing -testWarnings 3: next line prints "Warning" QWARN : tst_Warnings::testWarnings() Warning -testWarnings 4: over -testWarnings 5: next line prints "Debug" QDEBUG : tst_Warnings::testWarnings() Debug -testWarnings 6: next line prints nothing -testWarnings 7: next line prints "Debug" QDEBUG : tst_Warnings::testWarnings() Debug -testWarnings 8: next comes "Baba" twice QDEBUG : tst_Warnings::testWarnings() Baba QDEBUG : tst_Warnings::testWarnings() Baba PASS : tst_Warnings::testWarnings() diff --git a/tests/auto/testlib/selftests/warnings/tst_warnings.cpp b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp index 52a992c763..e14f9c3d98 100644 --- a/tests/auto/testlib/selftests/warnings/tst_warnings.cpp +++ b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp @@ -53,33 +53,24 @@ private slots: void tst_Warnings::testWarnings() { - printf("testWarnings 1: next line prints \"Warning\"\n"); qWarning("Warning"); - printf("testWarnings 2: next line prints nothing\n"); QTest::ignoreMessage(QtWarningMsg, "Warning"); qWarning("Warning"); - printf("testWarnings 3: next line prints \"Warning\"\n"); qWarning("Warning"); - printf("testWarnings 4: over\n"); - printf("testWarnings 5: next line prints \"Debug\"\n"); qDebug("Debug"); - printf("testWarnings 6: next line prints nothing\n"); QTest::ignoreMessage(QtDebugMsg, "Debug"); qDebug("Debug"); - printf("testWarnings 7: next line prints \"Debug\"\n"); qDebug("Debug"); - printf("testWarnings 8: next comes \"Baba\" twice\n"); QTest::ignoreMessage(QtDebugMsg, "Bubu"); qDebug("Baba"); qDebug("Bubu"); qDebug("Baba"); - } void tst_Warnings::testMissingWarnings() |