OSDN Git Service

QuickDesigner: Fix core test
authorKai Koehne <kai.koehne@nokia.com>
Thu, 3 Jun 2010 10:53:53 +0000 (12:53 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Fri, 4 Jun 2010 07:53:33 +0000 (09:53 +0200)
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

index e0ffeb8..89429e2 100644 (file)
@@ -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