aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-01-17 10:33:34 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2018-01-17 13:09:09 +0000
commit6b1682870c20a0fc86e0bb2ea8d63c3d1df1be86 (patch)
tree56b734379cd360df0a7d993432e8fbf92fc800e7 /tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp
parent2b8bc44a88490d359b986ecfbf7c71d8216daa4c (diff)
Blacklist test_move() in tst_qquickcustomaffector on win/gcc
The test is unstable. Also, print the actual numbers if the fuzzyCompare QVERIFYs fail again. This way we can see better what is going on. Task-number: QTBUG-65819 Change-Id: I65368300498382f7bfebb25299280aa15e3a56ef Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp')
-rw-r--r--tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp
index ee05fb29c9..cad3813e92 100644
--- a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp
+++ b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp
@@ -98,16 +98,17 @@ void tst_qquickcustomaffector::test_move()
if (!d->stillAlive(system))
continue; //parameters no longer get set once you die
- QVERIFY(myFuzzyCompare(d->curX(system), 50.0));
- QVERIFY(myFuzzyCompare(d->curY(system), 50.0));
- QVERIFY(myFuzzyCompare(d->curVX(system), 50.0));
- QVERIFY(myFuzzyCompare(d->curVY(system), 50.0));
- QVERIFY(myFuzzyCompare(d->curAX(), 50.0));
- QVERIFY(myFuzzyCompare(d->curAY(), 50.0));
+ QVERIFY2(myFuzzyCompare(d->curX(system), 50.0), QByteArray::number(d->curX(system)));
+ QVERIFY2(myFuzzyCompare(d->curY(system), 50.0), QByteArray::number(d->curY(system)));
+ QVERIFY2(myFuzzyCompare(d->curVX(system), 50.0), QByteArray::number(d->curVX(system)));
+ QVERIFY2(myFuzzyCompare(d->curVY(system), 50.0), QByteArray::number(d->curVY(system)));
+ QVERIFY2(myFuzzyCompare(d->curAX(), 50.0), QByteArray::number(d->curAX()));
+ QVERIFY2(myFuzzyCompare(d->curAY(), 50.0), QByteArray::number(d->curAY()));
QCOMPARE(d->lifeSpan, 0.5f);
QCOMPARE(d->size, 32.f);
QCOMPARE(d->endSize, 32.f);
- QVERIFY(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0)));
+ QVERIFY2(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0)),
+ QString::fromLatin1("%1 <= %2 / 1000").arg(d->t).arg(system->timeInt).toUtf8());
}
delete view;
}