From a68e4f3b96a82a93898f381e8ddc7f50f9c89d40 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 9 Dec 2019 10:37:28 +0100 Subject: Use the new QMetaType API in QVariant Change-Id: I5495ee1159864ebd64083fadbfac7e07177ed406 Reviewed-by: Thiago Macieira --- tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'tests/auto/corelib/kernel/qvariant') diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 265ae166c1..22464daf67 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -349,13 +349,13 @@ void tst_QVariant::constructor_invalid() QFETCH(uint, typeId); { - QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:")); + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type")); QVariant variant(static_cast(typeId)); QVERIFY(!variant.isValid()); QCOMPARE(variant.userType(), int(QMetaType::UnknownType)); } { - QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:")); + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type")); QVariant variant(typeId, /* copy */ 0); QVERIFY(!variant.isValid()); QCOMPARE(variant.userType(), int(QMetaType::UnknownType)); @@ -1433,10 +1433,7 @@ void tst_QVariant::checkDataStream() const int typeId = QMetaType::LastCoreType + 1; QVERIFY(!QMetaType::isRegistered(typeId)); - QByteArray errorMessage("Trying to construct an instance of an invalid type, type id: "); - errorMessage.append(QString::number(typeId, 10)); - - QTest::ignoreMessage(QtWarningMsg, errorMessage.constData()); + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type")); QByteArray settingsHex("000000"); settingsHex.append(QString::number(typeId, 16)); settingsHex.append("ffffffffff"); @@ -2839,7 +2836,7 @@ void tst_QVariant::loadUnknownUserType() void tst_QVariant::loadBrokenUserType() { - QTest::ignoreMessage(QtWarningMsg, "Trying to construct an instance of an invalid type, type id: 127"); + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type")); char data[] = {0, 0, 0, 127, 0 }; QByteArray ba(data, sizeof(data)); -- cgit v1.2.3