From bfb342a069e09547c7e3fa9fb5639a118f9b2825 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Thu, 2 Aug 2012 10:42:19 +1000 Subject: Fix instability in QDeclarativeListModel test. Role names in QDeclarativeListModel are stored in a QHash which doesn't have a stable sort order so the test cannot rely on the properties being returned in a specific order. Task-number: QTBUG-26706 Change-Id: I0f10e75f7940d70f31fa399f91022fe025ef1195 Reviewed-by: Glenn Watson --- .../qdeclarativelistmodel.pro | 2 -- .../tst_qdeclarativelistmodel.cpp | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index 6c8cc051..004b8c62 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -15,5 +15,3 @@ symbian: { } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } - -CONFIG+=insignificant_test # QTBUG-26706 diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 8612e50a..5e7ed714 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -602,11 +602,12 @@ void tst_qdeclarativelistmodel::enumerate() QDeclarativeItem *item = qobject_cast(component.create()); QVERIFY(item != 0); QStringList r = item->property("result").toString().split(":"); - QCOMPARE(r[0],QLatin1String("val1=1Y")); - QCOMPARE(r[1],QLatin1String("val2=2Y")); - QCOMPARE(r[2],QLatin1String("val3=strY")); - QCOMPARE(r[3],QLatin1String("val4=falseN")); - QCOMPARE(r[4],QLatin1String("val5=trueY")); + r.sort(); + QCOMPARE(r[1],QLatin1String("val1=1Y")); + QCOMPARE(r[2],QLatin1String("val2=2Y")); + QCOMPARE(r[3],QLatin1String("val3=strY")); + QCOMPARE(r[4],QLatin1String("val4=falseN")); + QCOMPARE(r[5],QLatin1String("val5=trueY")); delete item; } @@ -1133,9 +1134,14 @@ void tst_qdeclarativelistmodel::clear() model.clear(); QCOMPARE(model.count(), 0); QCOMPARE(model.roles(), roles); - QCOMPARE(model.toString(roles[0]), QString("propertyA")); - QCOMPARE(model.toString(roles[1]), QString("propertyB")); - QCOMPARE(model.toString(roles[2]), QString("propertyC")); + QStringList roleNames = QStringList() + << model.toString(roles[0]) + << model.toString(roles[1]) + << model.toString(roles[2]); + roleNames.sort(); + QCOMPARE(roleNames[0], QString("propertyA")); + QCOMPARE(roleNames[1], QString("propertyB")); + QCOMPARE(roleNames[2], QString("propertyC")); } QTEST_MAIN(tst_qdeclarativelistmodel) -- cgit v1.2.3