Improve test coverage for AnchorChanges.

Change-Id: If6d62febed093a07d75a6125a920aac628c35e54
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index c18118c..bf78bad 100644 (file)
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -573,7 +573,6 @@ void QQuickAnchorSet::resetTop()
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors &= ~QQuickAnchors::TopAnchor;
-    d->topScript = QDeclarativeScriptString();
     d->resetAnchors |= QQuickAnchors::TopAnchor;
 }
 
@@ -596,7 +595,6 @@ void QQuickAnchorSet::resetBottom()
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors &= ~QQuickAnchors::BottomAnchor;
-    d->bottomScript = QDeclarativeScriptString();
     d->resetAnchors |= QQuickAnchors::BottomAnchor;
 }
 
@@ -619,7 +617,6 @@ void QQuickAnchorSet::resetVerticalCenter()
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors &= ~QQuickAnchors::VCenterAnchor;
-    d->vCenterScript = QDeclarativeScriptString();
     d->resetAnchors |= QQuickAnchors::VCenterAnchor;
 }
 
@@ -642,7 +639,6 @@ void QQuickAnchorSet::resetBaseline()
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors &= ~QQuickAnchors::BaselineAnchor;
-    d->baselineScript = QDeclarativeScriptString();
     d->resetAnchors |= QQuickAnchors::BaselineAnchor;
 }
 
@@ -665,7 +661,6 @@ void QQuickAnchorSet::resetLeft()
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors &= ~QQuickAnchors::LeftAnchor;
-    d->leftScript = QDeclarativeScriptString();
     d->resetAnchors |= QQuickAnchors::LeftAnchor;
 }
 
@@ -688,7 +683,6 @@ void QQuickAnchorSet::resetRight()
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors &= ~QQuickAnchors::RightAnchor;
-    d->rightScript = QDeclarativeScriptString();
     d->resetAnchors |= QQuickAnchors::RightAnchor;
 }
 
@@ -711,7 +705,6 @@ void QQuickAnchorSet::resetHorizontalCenter()
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors &= ~QQuickAnchors::HCenterAnchor;
-    d->hCenterScript = QDeclarativeScriptString();
     d->resetAnchors |= QQuickAnchors::HCenterAnchor;
 }
 

diff --git a/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp
index 008d802..391a4f7 100644 (file)
--- a/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -679,6 +679,9 @@ void tst_qdeclarativestates::anchorChanges()
     QQuickAnchorChanges *aChanges = qobject_cast<QQuickAnchorChanges*>(state->operationAt(0));
     QVERIFY(aChanges != 0);
 
+    QCOMPARE(aChanges->anchors()->left().script(), QLatin1String("undefined"));
+    QCOMPARE(aChanges->anchors()->right().script(), QLatin1String("container.right"));
+
     rectPrivate->setState("right");
     QCOMPARE(innerRect->x(), qreal(150));
     QCOMPARE(aChanges->object(), qobject_cast<QQuickItem*>(innerRect));
@@ -739,6 +742,9 @@ void tst_qdeclarativestates::anchorChanges3()
     QQuickAnchorChanges *aChanges = qobject_cast<QQuickAnchorChanges*>(state->operationAt(0));
     QVERIFY(aChanges != 0);
 
+    QCOMPARE(aChanges->anchors()->top().script(), QLatin1String("container.top"));
+    QCOMPARE(aChanges->anchors()->bottom().script(), QLatin1String("bottomGuideline.bottom"));
+
     rectPrivate->setState("reanchored");
     QCOMPARE(aChanges->object(), qobject_cast<QQuickItem*>(innerRect));
     QCOMPARE(QQuickItemPrivate::get(aChanges->object())->anchors()->left().item, QQuickItemPrivate::get(leftGuideline)->left().item);
@@ -789,6 +795,9 @@ void tst_qdeclarativestates::anchorChanges4()
     QQuickAnchorChanges *aChanges = qobject_cast<QQuickAnchorChanges*>(state->operationAt(0));
     QVERIFY(aChanges != 0);
 
+    QCOMPARE(aChanges->anchors()->horizontalCenter().script(), QLatin1String("bottomGuideline.horizontalCenter"));
+    QCOMPARE(aChanges->anchors()->verticalCenter().script(), QLatin1String("leftGuideline.verticalCenter"));
+
     QQuickItemPrivate::get(rect)->setState("reanchored");
     QCOMPARE(aChanges->object(), qobject_cast<QQuickItem*>(innerRect));
     QCOMPARE(QQuickItemPrivate::get(aChanges->object())->anchors()->horizontalCenter().item, QQuickItemPrivate::get(bottomGuideline)->horizontalCenter().item);
@@ -824,12 +833,14 @@ void tst_qdeclarativestates::anchorChanges5()
     QQuickAnchorChanges *aChanges = qobject_cast<QQuickAnchorChanges*>(state->operationAt(0));
     QVERIFY(aChanges != 0);
 
+    QCOMPARE(aChanges->anchors()->baseline().script(), QLatin1String("leftGuideline.baseline"));
+
     QQuickItemPrivate::get(rect)->setState("reanchored");
     QCOMPARE(aChanges->object(), qobject_cast<QQuickItem*>(innerRect));
-    //QCOMPARE(aChanges->anchors()->horizontalCenter().item, bottomGuideline->horizontalCenter().item);
-    //QCOMPARE(aChanges->anchors()->horizontalCenter().anchorLine, bottomGuideline->horizontalCenter().anchorLine);
-    //QCOMPARE(aChanges->anchors()->baseline().item, leftGuideline->baseline().item);
-    //QCOMPARE(aChanges->anchors()->baseline().anchorLine, leftGuideline->baseline().anchorLine);
+    QCOMPARE(QQuickItemPrivate::get(aChanges->object())->anchors()->horizontalCenter().item, QQuickItemPrivate::get(bottomGuideline)->horizontalCenter().item);
+    QCOMPARE(QQuickItemPrivate::get(aChanges->object())->anchors()->horizontalCenter().anchorLine, QQuickItemPrivate::get(bottomGuideline)->horizontalCenter().anchorLine);
+    QCOMPARE(QQuickItemPrivate::get(aChanges->object())->anchors()->baseline().item, QQuickItemPrivate::get(leftGuideline)->baseline().item);
+    QCOMPARE(QQuickItemPrivate::get(aChanges->object())->anchors()->baseline().anchorLine, QQuickItemPrivate::get(leftGuideline)->baseline().anchorLine);
 
     delete rect;
 }