Merge branch 'master' of git@scm.dev.nokia.troll.no:research/itemviews-ng

Conflicts:
	src/qtablecontroller.cpp

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/qtreeselectionmanager/tst_qtreeselectionmanager.cpp b/tests/qtreeselectionmanager/tst_qtreeselectionmanager.cpp
index a7ef296..bb33291 100644
--- a/tests/qtreeselectionmanager/tst_qtreeselectionmanager.cpp
+++ b/tests/qtreeselectionmanager/tst_qtreeselectionmanager.cpp
@@ -83,10 +83,14 @@ void tst_QtTreeSelectionManager::cleanupTestCase()
 
 void tst_QtTreeSelectionManager::init()
 {
+    manager = new QtTreeSelectionManager();
+    model = new QtTreeDefaultModel();
 }
 
 void tst_QtTreeSelectionManager::cleanup()
 {
+    delete manager;
+    delete model;
 }
 
 void tst_QtTreeSelectionManager::getSetCheck()
@@ -95,11 +99,42 @@ void tst_QtTreeSelectionManager::getSetCheck()
 
 void tst_QtTreeSelectionManager::currentItem_data()
 {
+    QTest::addColumn<QStringList>("items");
+    QTest::addColumn<QString>("initialCurrent");
+    QTest::addColumn<QString>("expectedCurrent");
+    QTest::addColumn<QString>("newCurrent");
+    QTest::addColumn<int>("insertAt");
+    QTest::addColumn<int>("insertCount");
+    QTest::addColumn<int>("removeAt");
+    QTest::addColumn<int>("removeCount");
+    // ### move
+    QTest::addColumn<int>("signalCount");
+
+    QTest::newRow("empty")
+            << QStringList()
+            << QString()
+            << QString()
+            << QString()
+            << 0 << 0
+            << 0 << 0
+            << 0;
 }
 
 void tst_QtTreeSelectionManager::currentItem()
 {
+    QFETCH(QStringList, items);
+    QFETCH(QString, initialCurrent);
+    QFETCH(QString, expectedCurrent);
+    QFETCH(QString, newCurrent);
+    QFETCH(int, insertAt);
+    QFETCH(int, insertCount);
+    QFETCH(int, removeAt);
+    QFETCH(int, removeCount);
+    QFETCH(int, signalCount);
+
+    QSignalSpy currentChanged(manager, SIGNAL(currentChanged(const QtTreeModelBase::iterator_base&, const QtTreeModelBase::iterator_base&)));
 }
+
 void tst_QtTreeSelectionManager::anchorItem_data()
 {
 }