From b17cd1fd853b7ffe17edb50e08fabdff199b777f Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 3 Jun 2010 12:53:53 +0200
Subject: [PATCH] QuickDesigner: Fix core test
Since fa640f66db we're always switching to the base state when going
from state A to state B. Fix autotests accordingly.
---
tests/auto/qml/qmldesigner/coretests/testcore.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.cpp b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
index e0ffeb88cf0..89429e2a92c 100644
--- a/tests/auto/qml/qmldesigner/coretests/testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
@@ -1106,8 +1106,10 @@ void TestCore::testBasicStates()
// state2 -> state1
view->setCurrentState(state1);
QCOMPARE(view->currentState(), state1);
- QCOMPARE(view->methodCalls().size(), ++expectedViewMethodCount);
- QCOMPARE(view->methodCalls().last(), TestView::MethodCall("stateChanged", QStringList() << "state1" << "state2"));
+ expectedViewMethodCount += 2; // Since commit fa640f66db we're always going through the base state
+ QCOMPARE(view->methodCalls().size(), expectedViewMethodCount);
+ QCOMPARE(view->methodCalls().at(view->methodCalls().size()-2), TestView::MethodCall("stateChanged", QStringList() << QString() << "state2"));
+ QCOMPARE(view->methodCalls().at(view->methodCalls().size()-1), TestView::MethodCall("stateChanged", QStringList() << "state1" << QString()));
QCOMPARE(rect2Instance.property("x").toInt(), 0);
// state1 -> baseState
--
GitLab