From 871e8fe8dc562b77e759ac876f1c7d17cac1a81f Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 18 May 2011 12:04:14 +1000 Subject: [PATCH] Remove Q_ASSERT's from qdbustype autotest Change-Id: I276750d8acda3744ee8a9c424b2da0a08e8c7461 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern --- tests/auto/qdbustype/tst_qdbustype.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/qdbustype/tst_qdbustype.cpp b/tests/auto/qdbustype/tst_qdbustype.cpp index 676a904..2a10fe1 100644 --- a/tests/auto/qdbustype/tst_qdbustype.cpp +++ b/tests/auto/qdbustype/tst_qdbustype.cpp @@ -185,8 +185,8 @@ void tst_QDBusType::isValidFixedType() QFETCH(QString, data); QFETCH(bool, result); QFETCH(bool, isValid); - Q_ASSERT_X(data.length() == 1, "tst_QDBusType", "Test is malformed, this function must test only one-letter types"); - Q_ASSERT(isValid || (!isValid && !result)); + QVERIFY2(data.length() == 1, "Test is malformed, this function must test only one-letter types"); + QVERIFY(isValid || (!isValid && !result)); int type = data.at(0).unicode(); if (isValid) @@ -207,8 +207,8 @@ void tst_QDBusType::isValidBasicType() QFETCH(QString, data); QFETCH(bool, result); QFETCH(bool, isValid); - Q_ASSERT_X(data.length() == 1, "tst_QDBusType", "Test is malformed, this function must test only one-letter types"); - Q_ASSERT(isValid || (!isValid && !result)); + QVERIFY2(data.length() == 1, "Test is malformed, this function must test only one-letter types"); + QVERIFY(isValid || (!isValid && !result)); int type = data.at(0).unicode(); if (isValid) -- 2.7.4