aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlincubator
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-24 15:27:58 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-29 09:44:39 +0000
commit0ea3c24cfe7d1057964fe864924a7ee083764084 (patch)
tree681b7df0a201641203c936e748afd7d6a7ec39b5 /tests/auto/qml/qqmlincubator
parentbb87365ffabcba3a70dd49a4c3232a12b5b224a3 (diff)
tests/qml: 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: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/qml/qqmlincubator')
-rw-r--r--tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
index 26092595d9..4f559b0d33 100644
--- a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
+++ b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
@@ -148,7 +148,7 @@ void tst_qqmlincubator::objectDeleted()
component.create(incubator);
QCOMPARE(incubator.status(), QQmlIncubator::Loading);
- QVERIFY(SelfRegisteringType::me() == 0);
+ QVERIFY(!SelfRegisteringType::me());
while (SelfRegisteringOuterType::me() == 0 && incubator.isLoading()) {
bool b = false;
@@ -172,7 +172,7 @@ void tst_qqmlincubator::objectDeleted()
QVERIFY(incubator.isError());
VERIFY_ERRORS(incubator, "objectDeleted.errors.txt");
- QVERIFY(incubator.object() == 0);
+ QVERIFY(!incubator.object());
}
QVERIFY(SelfRegisteringOuterType::beenDeleted);
}
@@ -236,7 +236,7 @@ void tst_qqmlincubator::clear()
incubator.clear();
QVERIFY(incubator.isNull());
- QVERIFY(incubator.object() == 0);
+ QVERIFY(!incubator.object());
QVERIFY(!obj.isNull());
delete obj;
@@ -413,7 +413,7 @@ void tst_qqmlincubator::clearDuringCompletion()
component.create(incubator);
QCOMPARE(incubator.status(), QQmlIncubator::Loading);
- QVERIFY(CompletionRegisteringType::me() == 0);
+ QVERIFY(!CompletionRegisteringType::me());
while (CompletionRegisteringType::me() == 0 && incubator.isLoading()) {
bool b = false;
@@ -622,7 +622,7 @@ void tst_qqmlincubator::asynchronousIfNested()
component.create(incubator);
QVERIFY(incubator.isLoading());
- QVERIFY(SelfRegisteringType::me() == 0);
+ QVERIFY(!SelfRegisteringType::me());
while (SelfRegisteringType::me() == 0 && incubator.isLoading()) {
bool b = false;
controller.incubateWhile(&b);
@@ -741,7 +741,7 @@ void tst_qqmlincubator::chainedAsynchronousIfNested()
component.create(incubator);
QVERIFY(incubator.isLoading());
- QVERIFY(SelfRegisteringType::me() == 0);
+ QVERIFY(!SelfRegisteringType::me());
while (SelfRegisteringType::me() == 0 && incubator.isLoading()) {
bool b = false;
@@ -855,7 +855,7 @@ void tst_qqmlincubator::chainedAsynchronousIfNestedOnCompleted()
component.create(incubator);
QVERIFY(incubator.isLoading());
- QVERIFY(SelfRegisteringType::me() == 0);
+ QVERIFY(!SelfRegisteringType::me());
while (SelfRegisteringType::me() == 0 && incubator.isLoading()) {
bool b = false;
@@ -983,7 +983,7 @@ void tst_qqmlincubator::chainedAsynchronousClear()
component.create(incubator);
QVERIFY(incubator.isLoading());
- QVERIFY(SelfRegisteringType::me() == 0);
+ QVERIFY(!SelfRegisteringType::me());
while (SelfRegisteringType::me() == 0 && incubator.isLoading()) {
bool b = false;
@@ -1106,7 +1106,7 @@ void tst_qqmlincubator::selfDelete()
component.create(*incubator);
QCOMPARE(incubator->QQmlIncubator::status(), QQmlIncubator::Loading);
- QVERIFY(SelfRegisteringType::me() == 0);
+ QVERIFY(!SelfRegisteringType::me());
while (SelfRegisteringType::me() == 0 && incubator->isLoading()) {
bool b = false;