From c996c22d3b24a56ab93f9f1f6fdf5347b16c0b40 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 22 Dec 2017 13:21:28 +0100 Subject: tst_customization: comment out Tumbler for now Due to unclear auto test failurs, Tumbler does not yet have deferred execution enabled for its content item. Because of this, the test is getting full of skips and expect fail's for Tumbler. Just leave it out for now and restore later when Tumbler is fixed. Change-Id: Iab9465e002572d15e5bda6dbd53b71594f593703 Reviewed-by: Mitch Curtis --- tests/auto/customization/tst_customization.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp index 8dd50f65..24635a61 100644 --- a/tests/auto/customization/tst_customization.cpp +++ b/tests/auto/customization/tst_customization.cpp @@ -101,7 +101,7 @@ static const ControlInfo ControlInfos[] = { { "ToolButton", QStringList() << "background" << "contentItem" }, { "ToolSeparator", QStringList() << "background" << "contentItem" }, { "ToolTip", QStringList() << "background" << "contentItem" }, - { "Tumbler", QStringList() << "background" << "contentItem" } + // { "Tumbler", QStringList() << "background" << "contentItem" } ### TODO: fix and enable deferred execution }; class tst_customization : public QQmlDataTest @@ -291,9 +291,6 @@ void tst_customization::creation() QFETCH(QString, type); QFETCH(QStringList, delegates); - if (!qstrcmp(QTest::currentDataTag(), "empty:Tumbler")) - QSKIP("TODO: fix crash with contentItem-less Tumbler"); - QQuickStyle::setStyle(testFile("styles/" + style)); QString error; @@ -329,7 +326,6 @@ void tst_customization::creation() } QEXPECT_FAIL("identified:ComboBox", "ComboBox::popup with an ID is created at construction time", Continue); - QEXPECT_FAIL("override:Tumbler", "TODO", Abort); QVERIFY2(qt_createdQObjects()->isEmpty(), qPrintable("unexpectedly created: " + qt_createdQObjects->join(", "))); QVERIFY2(qt_destroyedQObjects()->isEmpty(), qPrintable("unexpectedly destroyed: " + qt_destroyedQObjects->join(", ") + " were unexpectedly destroyed")); @@ -396,10 +392,8 @@ void tst_customization::override() // delegates, no item should get un-parented during the creation process. An item being // unparented means that a delegate got destroyed, so there must be an internal ID in one // of the delegates in the tested style. - if (!identify && nonDeferred.isEmpty()) { - QEXPECT_FAIL("Default:Tumbler", "TODO: remove internal ID", Continue); + if (!identify && nonDeferred.isEmpty()) QCOMPARE(qt_unparentedItemCount, 0); - } // -