From 00dbc026d3b7f079920c9eeb8f2773d6c5d83fa3 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 23 Sep 2009 13:45:42 +1000 Subject: Failing autotest for Repeater bug --- tests/auto/declarative/repeater/data/repeater.qml | 6 +++++ tests/auto/declarative/repeater/repeater.pro | 1 + tests/auto/declarative/repeater/tst_repeater.cpp | 30 +++++++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/tests/auto/declarative/repeater/data/repeater.qml b/tests/auto/declarative/repeater/data/repeater.qml index 57ba9dc..7d83230 100644 --- a/tests/auto/declarative/repeater/data/repeater.qml +++ b/tests/auto/declarative/repeater/data/repeater.qml @@ -6,6 +6,9 @@ Rectangle { width: 240 height: 320 color: "white" + Text { + text: "Zero" + } Repeater { id: repeater objectName: "repeater" @@ -19,4 +22,7 @@ Rectangle { } } } + Text { + text: "Last" + } } diff --git a/tests/auto/declarative/repeater/repeater.pro b/tests/auto/declarative/repeater/repeater.pro index 0ecd7ee..1d30b7b 100644 --- a/tests/auto/declarative/repeater/repeater.pro +++ b/tests/auto/declarative/repeater/repeater.pro @@ -1,6 +1,7 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative SOURCES += tst_repeater.cpp +macx:CONFIG -= app_bundle # Define SRCDIR equal to test's source directory DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/repeater/tst_repeater.cpp b/tests/auto/declarative/repeater/tst_repeater.cpp index 5fce70e..1bb746b 100644 --- a/tests/auto/declarative/repeater/tst_repeater.cpp +++ b/tests/auto/declarative/repeater/tst_repeater.cpp @@ -24,6 +24,11 @@ tst_QFxRepeater::tst_QFxRepeater() { } +/* +The Repeater element creates children at its own position in its parent's +stacking order. In this test we insert a repeater between two other Text +elements to test this. +*/ void tst_QFxRepeater::stringList() { QmlView *canvas = createView(SRCDIR "/data/repeater.qml"); @@ -46,12 +51,27 @@ void tst_QFxRepeater::stringList() QFxItem *container = findItem(canvas->root(), "container"); QVERIFY(container != 0); - QCOMPARE(container->childItems().count(), data.count() + 1); + QCOMPARE(container->childItems().count(), data.count() + 3); + + for (int i = 0; i < container->childItems().count(); ++i) { + + if (i == 0) { + QFxText *name = qobject_cast(container->childItems().at(i)); + QVERIFY(name != 0); + QCOMPARE(name->text(), QLatin1String("Zero")); + } else if (i == 1) { + // The repeater itself + continue; + } else if (i == container->childItems().count() - 1) { + QFxText *name = qobject_cast(container->childItems().at(i)); + QVERIFY(name != 0); + QCOMPARE(name->text(), QLatin1String("Last")); + } else { + QFxText *name = qobject_cast(container->childItems().at(i)); + QVERIFY(name != 0); + QCOMPARE(name->text(), data.at(i-2)); + } - for (int i = 1; i < container->childItems().count(); ++i) { - QFxText *name = qobject_cast(container->childItems().at(i)); - QVERIFY(name != 0); - QCOMPARE(name->text(), data.at(i-1)); } delete canvas; -- cgit v0.12 From 9d605890a9e25623926c2dfff6a287093ff93778 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 23 Sep 2009 14:17:24 +1000 Subject: Add some failing autotests --- .../data/ConstantsOverrideBindings.qml | 6 ++ .../data/constantsOverrideBindings.1.qml | 8 +++ .../data/constantsOverrideBindings.2.qml | 11 +++ .../data/constantsOverrideBindings.3.qml | 7 ++ .../data/outerBindingOverridesInnerBinding.qml | 14 ++++ .../qmlecmascript/tst_qmlecmascript.cpp | 80 ++++++++++++++++++++++ 6 files changed, 126 insertions(+) create mode 100644 tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml create mode 100644 tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml create mode 100644 tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml create mode 100644 tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml create mode 100644 tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml diff --git a/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml b/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml new file mode 100644 index 0000000..b4a702b --- /dev/null +++ b/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml @@ -0,0 +1,6 @@ +import Qt.test 1.0 + +MyQmlObject { + property int c1: 0 + property int c2: c1 +} diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml new file mode 100644 index 0000000..13c5ae5 --- /dev/null +++ b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml @@ -0,0 +1,8 @@ +import Qt.test 1.0 + +MyQmlObject { + property int c1: 0 + property int c2: c1 + + onBasicSignal: c2 = 13 +} diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml new file mode 100644 index 0000000..d205526 --- /dev/null +++ b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml @@ -0,0 +1,11 @@ +import Qt.test 1.0 + +MyQmlObject { + property alias c1: MyConstants.c1 + property alias c2: MyConstants.c2 + + objectProperty: ConstantsOverrideBindings { + id: MyConstants + c2: 10 + } +} diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml new file mode 100644 index 0000000..ca9d1d8 --- /dev/null +++ b/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml @@ -0,0 +1,7 @@ +import Qt.test 1.0 + +MyQmlObject { + property int c1: 0 + property int c2: c1 +} + diff --git a/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml new file mode 100644 index 0000000..49ada1f --- /dev/null +++ b/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml @@ -0,0 +1,14 @@ +import Qt.test 1.0 + +MyQmlObject { + property alias c1: MyConstants.c1 + property alias c2: MyConstants.c2 + property int c3: 0 + + objectProperty: ConstantsOverrideBindings { + id: MyConstants + c2: c3 + } + +} + diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp index 40e4fff..f01e9d4 100644 --- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp +++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp @@ -46,6 +46,8 @@ private slots: void extensionObjects(); void enums(); void valueTypeFunctions(); + void constantsOverrideBindings(); + void outerBindingOverridesInnerBinding(); private: QmlEngine engine; @@ -401,6 +403,84 @@ void tst_qmlecmascript::valueTypeFunctions() QCOMPARE(obj->rectFProperty(), QRectF(0,0.5,100,99.5)); } +/* +Tests that writing a constant to a property with a binding on it disables the +binding. +*/ +void tst_qmlecmascript::constantsOverrideBindings() +{ + // From ECMAScript + { + QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.1.qml")); + MyQmlObject *object = qobject_cast(component.create()); + QVERIFY(object != 0); + + QCOMPARE(object->property("c2").toInt(), 0); + object->setProperty("c1", QVariant(9)); + QCOMPARE(object->property("c2").toInt(), 9); + + emit object->basicSignal(); + + QCOMPARE(object->property("c2").toInt(), 13); + object->setProperty("c1", QVariant(8)); + QCOMPARE(object->property("c2").toInt(), 13); + } + + // During construction + { + QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.2.qml")); + MyQmlObject *object = qobject_cast(component.create()); + QVERIFY(object != 0); + + QCOMPARE(object->property("c1").toInt(), 0); + QCOMPARE(object->property("c2").toInt(), 10); + object->setProperty("c1", QVariant(9)); + QCOMPARE(object->property("c1").toInt(), 9); + QCOMPARE(object->property("c2").toInt(), 10); + } + + // From C++ + { + QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.3.qml")); + MyQmlObject *object = qobject_cast(component.create()); + QVERIFY(object != 0); + + QCOMPARE(object->property("c2").toInt(), 0); + object->setProperty("c1", QVariant(9)); + QCOMPARE(object->property("c2").toInt(), 9); + + object->setProperty("c2", QVariant(13)); + QCOMPARE(object->property("c2").toInt(), 13); + object->setProperty("c1", QVariant(7)); + QCOMPARE(object->property("c1").toInt(), 7); + QCOMPARE(object->property("c2").toInt(), 13); + } +} + +/* +Tests that assigning a binding to a property that already has a binding causes +the original binding to be disabled. +*/ +void tst_qmlecmascript::outerBindingOverridesInnerBinding() +{ + QmlComponent component(&engine, TEST_FILE("outerBindingOverridesInnerBinding.qml")); + MyQmlObject *object = qobject_cast(component.create()); + QVERIFY(object != 0); + + QCOMPARE(object->property("c1").toInt(), 0); + QCOMPARE(object->property("c2").toInt(), 0); + QCOMPARE(object->property("c3").toInt(), 0); + + object->setProperty("c1", QVariant(9)); + QCOMPARE(object->property("c1").toInt(), 9); + QCOMPARE(object->property("c2").toInt(), 0); + QCOMPARE(object->property("c3").toInt(), 0); + + object->setProperty("c3", QVariant(8)); + QCOMPARE(object->property("c1").toInt(), 9); + QCOMPARE(object->property("c2").toInt(), 8); + QCOMPARE(object->property("c3").toInt(), 8); +} QTEST_MAIN(tst_qmlecmascript) -- cgit v0.12 From 8302f03e137a73543ab52ff451781617ce8a8760 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 23 Sep 2009 14:45:47 +1000 Subject: Repeater is more consistent with its docs Task-number: QT-2030 Reviewed-by: Yann Bodson --- src/declarative/fx/qfxrepeater.cpp | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index 84804ce..5ef7b10 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -282,14 +282,26 @@ void QFxRepeater::regenerate() if (!d->model || !d->model->count() || !d->model->isValid() || !parentItem() || !isComponentComplete()) return; - if (d->model) { - for (int ii = 0; ii < count(); ++ii) { - QFxItem *item = d->model->item(ii); - if (item) { - item->setParent(parentItem()); - d->deletables << item; - } + //In order to do the insertion like the examples, we have to be at the + //same point in the childItems() list. Temporary measure until we think of something better + int pos = parentItem()->childItems().indexOf(this); + Q_ASSERT(pos != -1); + QList otherChildren; + for (int ii = pos+1; ii < parentItem()->childItems().count(); ii++){ + QGraphicsItem* otherChild = parentItem()->childItems()[ii]; + otherChildren << otherChild; + otherChild->setParentItem(0); + } + + for (int ii = 0; ii < count(); ++ii) { + QFxItem *item = d->model->item(ii); + if (item) { + item->setParent(parentItem()); + d->deletables << item; } } + + foreach(QGraphicsItem* other, otherChildren) + other->setParentItem(parentItem()); } QT_END_NAMESPACE -- cgit v0.12