From 7b72cc205ccd3e568b59a32a5cd751bd62b42e94 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 30 Jul 2015 15:16:36 +0200 Subject: tests/auto/widgets: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: Ie29640451dddeb58342038a8cd5fac152cce39e5 Reviewed-by: Mitch Curtis --- tests/auto/widgets/styles/qstyle/tst_qstyle.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/widgets/styles/qstyle/tst_qstyle.cpp') diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 7aa529d5ee..21369d4520 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -214,12 +214,12 @@ void tst_QStyle::testProxyStyle() QProxyStyle *proxyStyle = new QProxyStyle(); QVERIFY(proxyStyle->baseStyle()); QStyle *style = QStyleFactory::create("Windows"); - QVERIFY(style->proxy() == style); + QCOMPARE(style->proxy(), style); proxyStyle->setBaseStyle(style); - QVERIFY(style->proxy() == proxyStyle); - QVERIFY(style->parent() == proxyStyle); - QVERIFY(proxyStyle->baseStyle() == style); + QCOMPARE(style->proxy(), proxyStyle); + QCOMPARE(style->parent(), proxyStyle); + QCOMPARE(proxyStyle->baseStyle(), style); QVERIFY(testAllFunctions(proxyStyle)); proxyStyle->setBaseStyle(0); @@ -236,7 +236,7 @@ void tst_QStyle::testProxyStyle() QLineEdit edit; edit.setStyle(&customStyle); QVERIFY(!customStyle.parent()); - QVERIFY(edit.style()->pixelMetric(QStyle::PM_ButtonIconSize) == 13); + QCOMPARE(edit.style()->pixelMetric(QStyle::PM_ButtonIconSize), 13); } void tst_QStyle::drawItemPixmap() -- cgit v1.2.3