diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-09 17:01:38 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-13 15:14:35 +0200 |
commit | 92e696b4bad52c40c6cdc1c5bf7c0c0ea8a2b283 (patch) | |
tree | dd87bef36f4b7a06d395237ee0a66b816d6598ca /tests/auto/testlib/selftests/expected_cmptest.txt | |
parent | 3fee97c4ab0796fcafcdea692ff7c7e83005a2aa (diff) |
Use debug stream in QTest::toString's default fallback if possible
For built-in types, this is a compile-time assert - we should not have
any types in Qt for which we have neither debug streaming nor a
QTest::toString specialization implemented. A build of most of Qt
submodules passes with this change, after minor modifications to some
tests. We cannot declare QSizeHint::Policy as a metatype after the
QMetaType has already been instantiated for it, and the QDebug stream
operator for QElaspedTimer needs to be correctly declared within the
namespace.
Add a self-test function for a custom type, and update reference files
of the self-test.
Task-number: QTBUG-104867
Pick-to: 6.4
Change-Id: I2936db5933f4589fce45f47cf2f3224ed614d8c9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_cmptest.txt')
-rw-r--r-- | tests/auto/testlib/selftests/expected_cmptest.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt index 993cbfa53b..8547119988 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.txt +++ b/tests/auto/testlib/selftests/expected_cmptest.txt @@ -55,6 +55,10 @@ FAIL! : tst_Cmptest::compare_unknown() Compared values are not the same Actual : a Expected : b Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] +FAIL! : tst_Cmptest::compare_textFromDebug() Compared values are not the same + Actual (a): QDebug stream: 0 + Expected (b): QDebug stream: 1 + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQObjects() Compared QObject pointers are not the same Actual (&object1): QObject/"object1" Expected (&object2): QObject/"object2" @@ -197,5 +201,5 @@ FAIL! : tst_Cmptest::tryVerify2() 'opaqueFunc() < 2' returned FALSE. (42) Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::verifyExplicitOperatorBool() PASS : tst_Cmptest::cleanupTestCase() -Totals: 21 passed, 47 failed, 0 skipped, 0 blacklisted, 0ms +Totals: 21 passed, 48 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Cmptest ********* |