diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-25 21:59:08 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-25 22:39:41 (GMT) |
| commit | 61811d9b43828c1cc53c773fd66b78313f4fb942 (patch) | |
| tree | 5ac661e2d1b1f411ec1d6ed75170f8378e0adcee /tests | |
| parent | 3752d188c46c6eed5d190900fe6654642b3b8c63 (diff) | |
| download | Qt-61811d9b43828c1cc53c773fd66b78313f4fb942.zip Qt-61811d9b43828c1cc53c773fd66b78313f4fb942.tar.gz Qt-61811d9b43828c1cc53c773fd66b78313f4fb942.tar.bz2 | |
Update test numbers after change to default transformOrigin.
Also make one comparison a bit more fuzzy.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp index 5ffce11..facf159 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp @@ -445,10 +445,8 @@ void tst_qdeclarativestates::parentChange() rect->setState("reparented"); QCOMPARE(innerRect->rotation(), qreal(15)); QCOMPARE(innerRect->scale(), qreal(.5)); - QEXPECT_FAIL("", "QTBUG-2919", Continue); - QCOMPARE(QString("%1").arg(innerRect->x()), QString("%1").arg(12.4148145657)); - QEXPECT_FAIL("", "QTBUG-2919", Continue); - QCOMPARE(QString("%1").arg(innerRect->y()), QString("%1").arg(10.6470476128)); + QCOMPARE(QString("%1").arg(innerRect->x()), QString("%1").arg(-19.9075)); + QCOMPARE(QString("%1").arg(innerRect->y()), QString("%1").arg(-8.73433)); } { @@ -469,8 +467,8 @@ void tst_qdeclarativestates::parentChange() QCOMPARE(innerRect->rotation(), qreal(0)); QCOMPARE(innerRect->scale(), qreal(1)); QCOMPARE(innerRect->x(), qreal(5)); - QEXPECT_FAIL("", "QTBUG-2919", Continue); - QCOMPARE(innerRect->y(), qreal(0)); + //do a non-qFuzzyCompare fuzzy compare + QVERIFY(innerRect->y() < qreal(0.00001) && innerRect->y() > qreal(-0.00001)); } } |