Added ListView filter by text pattern test cases.

diff --git a/tests/ui/friendlistitem/testfriendlistitem.cpp b/tests/ui/friendlistitem/testfriendlistitem.cpp
index 048c1f6..9167ed5 100644 (file)
--- a/tests/ui/friendlistitem/testfriendlistitem.cpp
+++ b/tests/ui/friendlistitem/testfriendlistitem.cpp
@@ -78,7 +78,6 @@ void TestFriendListItem::initTestCase()
 void TestFriendListItem::setUserData()
 {
     friendListItem->setUserData(user1);
-    QCOMPARE(friendListItem->id(), QString("id1"));
     QCOMPARE(friendListItem->coordinates().latitude(), GeoCoordinate(12.22, 23.33).latitude());
     QCOMPARE(friendListItem->coordinates().longitude(), GeoCoordinate(12.22, 23.33).longitude());
 
@@ -87,14 +86,12 @@ void TestFriendListItem::setUserData()
     QCOMPARE(profileImage, QPixmap(":/res/images/profile_pic_border.png"));
 
     friendListItem->setUserData(user2);
-    QCOMPARE(friendListItem->id(), QString("id2"));
     QCOMPARE(friendListItem->coordinates().latitude(), GeoCoordinate(12.1, 44.33).latitude());
     QCOMPARE(friendListItem->coordinates().longitude(), GeoCoordinate(12.1, 44.33).longitude());
 }
 
 void TestFriendListItem::toggleSelection()
 {
-    QCOMPARE(friendListItem->id(), QString("id2"));
     QCOMPARE(friendListItem->data(ITEM_SIZE_HINT_INDEX).toSize(), QSize(368, 142));
 
     QList<ExtendedListItemStore *> *subItems = (QList<ExtendedListItemStore *> *)

diff --git a/tests/ui/listview/testlistview.cpp b/tests/ui/listview/testlistview.cpp
index a96dfdc..fb22d35 100644 (file)
--- a/tests/ui/listview/testlistview.cpp
+++ b/tests/ui/listview/testlistview.cpp
@@ -24,6 +24,7 @@
 
 #include "../../../src/ui/friendlistitem.h"
 #include "../../../src/ui/friendlistview.h"
+#include "../../../src/user/user.h"
 
 class TestListView: public QObject
 {
@@ -35,10 +36,14 @@ private slots:
     void addListItem();
     void addItemToView();
     void clearUnused();
-    void filterList();
+    void filterListByID();
+    void filterListByName();
     void takeListItemFromView();
 
 private:
+    int hiddenItemCount();
+
+private:
     FriendListView *friendListView;
     User *user1;
     User *user2;
@@ -61,25 +66,25 @@ void TestListView::initTestCase()
     QVERIFY(friendListView != 0);
 
     user1 = new User(QString("Address address address address address"),
-                           GeoCoordinate(12.22, 23.33), QString("Name na msfdsa dsfadsaf sdaf"),
+                           GeoCoordinate(12.22, 23.33), QString("John Doe"),
                            QString("Note note note note note note note note"),
                            QUrl("http://image.url"), QString("Timestamp timestamp timestamp tim"),
                            true, QString("key1"), QString("km"), 44.12);
     user1->setProfileImage(QPixmap(":/res/images/profile_pic_border.png"));
     user2 = new User(QString("Address address"),
-                           GeoCoordinate(12.1, 44.33), QString("Name na msfdsa dsfadsaf sdaf"),
+                           GeoCoordinate(12.1, 44.33), QString("Jane Doe"),
                            QString("Note note note note note note note note"),
                            QUrl("http://image.url"), QString("Timestamp timestamp timestamp tim"),
                            true, QString("key2"), QString("km"), 144.12);
     user2->setProfileImage(QPixmap(":/res/images/profile_pic_border.png"));
     user3 = new User(QString("Address address address address address"),
-                           GeoCoordinate(12.22, 23.33), QString("Name na msfdsa dsfadsaf sdaf"),
+                           GeoCoordinate(12.22, 23.33), QString("Kate Nameless"),
                            QString("Note note note note note note note note"),
                            QUrl("http://image.url"), QString("Timestamp timestamp timestamp tim"),
                            true, QString("key3"), QString("km"), 44.12);
     user3->setProfileImage(QPixmap(":/res/images/profile_pic_border.png"));
     user4 = new User(QString("Address address"),
-                           GeoCoordinate(12.1, 44.33), QString("Name na msfdsa dsfadsaf sdaf"),
+                           GeoCoordinate(12.1, 44.33), QString("Jay Nameless"),
                            QString("Note note note note note note note note"),
                            QUrl("http://image.url"), QString("Timestamp timestamp timestamp tim"),
                            true, QString("key4"), QString("km"), 144.12);
@@ -134,7 +139,7 @@ void TestListView::clearUnused()
     QVERIFY(friendListView->listItem("key4") == 0);
 }
 
-void TestListView::filterList()
+void TestListView::filterListByID()
 {
     friendListView->clearList();
     QCOMPARE(friendListView->count(), 0);
@@ -149,48 +154,59 @@ void TestListView::filterList()
     item3->setUserData(user3);
     item4->setUserData(user4);
 
-    friendListView->addListItem(item1->id(), item1);
-    friendListView->addListItem(item2->id(), item2);
-    friendListView->addListItem(item3->id(), item3);
-    friendListView->addListItem(item4->id(), item4);
+    friendListView->addListItem("key1", item1);
+    friendListView->addListItem("key2", item2);
+    friendListView->addListItem("key3", item3);
+    friendListView->addListItem("key4", item4);
     QCOMPARE(friendListView->count(), 4);
 
     QList<QString> userIDs;
-    userIDs.append(item1->id());
+    userIDs.append("key1");
     friendListView->filter(userIDs);
     QCOMPARE(friendListView->count(), 4);
+    QCOMPARE(hiddenItemCount(), 3);
 
-    int hiddenCounter = 0;
+    userIDs.append("key2");
+    friendListView->filter(userIDs);
+    QCOMPARE(friendListView->count(), 4);
+    QCOMPARE(hiddenItemCount(), 2);
 
-    for (int i = 0; i < friendListView->count(); ++i) {
-        if (friendListView->item(i)->isHidden())
-            hiddenCounter++;
-    }
+    friendListView->clearFilter();
+    QCOMPARE(hiddenItemCount(), 0);
+}
 
-    QCOMPARE(hiddenCounter, 3);
+void TestListView::filterListByName()
+{
+    friendListView->clearList();
+    QCOMPARE(friendListView->count(), 0);
 
-    userIDs.append(item2->id());
-    friendListView->filter(userIDs);
-    QCOMPARE(friendListView->count(), 4);
-    hiddenCounter = 0;
+    FriendListItem *item1 = new FriendListItem();
+    FriendListItem *item2 = new FriendListItem();
+    FriendListItem *item3 = new FriendListItem();;
+    FriendListItem *item4 = new FriendListItem();
 
-    for (int i = 0; i < friendListView->count(); ++i) {
-        if (friendListView->item(i)->isHidden())
-            hiddenCounter++;
-    }
+    item1->setUserData(user1);
+    item2->setUserData(user2);
+    item3->setUserData(user3);
+    item4->setUserData(user4);
 
-    QCOMPARE(hiddenCounter, 2);
+    friendListView->addListItem("key1", item1);
+    friendListView->addListItem("key2", item2);
+    friendListView->addListItem("key3", item3);
+    friendListView->addListItem("key4", item4);
+    QCOMPARE(friendListView->count(), 4);
 
-    friendListView->clearFilter();
+    friendListView->filter("doe");
+    QCOMPARE(hiddenItemCount(), 2);
 
-    hiddenCounter = 0;
+    friendListView->filter("j");
+    QCOMPARE(hiddenItemCount(), 1);
 
-    for (int i = 0; i < friendListView->count(); ++i) {
-        if (friendListView->item(i)->isHidden())
-            hiddenCounter++;
-    }
+    friendListView->filter("john");
+    QCOMPARE(hiddenItemCount(), 3);
 
-    QCOMPARE(hiddenCounter, 0);
+    friendListView->clearFilter();
+    QCOMPARE(hiddenItemCount(), 0);
 }
 
 void TestListView::takeListItemFromView()
@@ -200,11 +216,22 @@ void TestListView::takeListItemFromView()
     ListItem *item = friendListView->takeListItemFromView("key3");
     QVERIFY(item != 0);
     QCOMPARE(friendListView->count(), 3);
-    QCOMPARE(item->id(), QString("key3"));
 
     friendListView->addListItemToView(item);
     QCOMPARE(friendListView->count(), 4);
 }
 
+int TestListView::hiddenItemCount()
+{
+    int hiddenCounter = 0;
+
+    for (int i = 0; i < friendListView->count(); ++i) {
+        if (friendListView->item(i)->isHidden())
+            hiddenCounter++;
+    }
+
+    return hiddenCounter;
+}
+
 QTEST_MAIN(TestListView)
 #include "testlistview.moc"