From: Jussi Laitinen <jussi.laitinen@ixonos.com>
Date: Sat, 17 Dec 2011 16:40:09 +0000 (+0200)
Subject: Removed temp code and modified tests
X-Git-Url: https://vcs.maemo.org/git/?p=situare;a=commitdiff_plain;h=refs%2Fheads%2Fsituare_interact

Removed temp code and modified tests
---

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 924e70b..267dbe1 100644
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -29,7 +29,7 @@
 #include <QSettings>
 #include <QStringList>
 #include <QVariantMap>
-#include <QWebView>
+#include <QtWebKit/QWebView>
 
 #ifdef Q_WS_MAEMO_5
 #include <QMaemo5InformationBox>
diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 0c0c986..81bd8a6 100644
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -29,7 +29,6 @@
 #include <QtAlgorithms>
 #include <QtGlobal>
 
-#include "database.h"
 #include "../error.h"
 #include "network/networkaccessmanager.h"
 #include "situarecommon.h"
@@ -55,13 +54,6 @@ SituareService::SituareService(NetworkAccessManager *networkManager, ImageFetche
             this, SLOT(imageReceived(QString,QPixmap)));
     connect(m_imageFetcher, SIGNAL(error(int, int)),
             this, SIGNAL(error(int, int)));
-
-    m_database = new Database(this);
-    m_database->openDatabase();
-    m_database->createNotificationTable();
-    m_database->createUserTable();
-    m_database->createTagTable();
-    m_database->createUserTagTable();
 }
 
 SituareService::~SituareService()
diff --git a/src/situareservice/situareservice.h b/src/situareservice/situareservice.h
index 26aafc3..2a149e8 100644
--- a/src/situareservice/situareservice.h
+++ b/src/situareservice/situareservice.h
@@ -31,7 +31,6 @@
 #include "imagefetcher.h"
 #include "message.h"
 
-class Database;
 class NetworkAccessManager;
 class QNetworkReply;
 class QNetworkRequest;
@@ -135,7 +134,6 @@ public slots:
     /**
     * @brief Adds tags to the Situare server
     *
-    * CURRENTLY TAGS ARE UPDATED TO THE LOCAL DATABASE, NOT SITUARE SERVER
     * @param tags list of user's tags
     */
     void addTags(const QStringList &tags);
@@ -154,7 +152,6 @@ public slots:
     /**
     * @brief Retrieves popular tags.
     *
-    * Tags are fetch from local database instead of Situare server.
     */
     void fetchPopularTags();
 
@@ -400,7 +397,6 @@ private:
 
     QString m_session;                          ///< Session data
 
-    Database *m_database;                       ///< Instance of the database
     ImageFetcher *m_imageFetcher;               ///< Instance of the image fetcher    
     NetworkAccessManager *m_networkManager;     ///< Pointer to QNetworkAccessManager
     User *m_user;                               ///< Pointer to User
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 71ad6bc..cdbd696 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -25,7 +25,7 @@
 */
 
 #include <QtAlgorithms>
-#include <QtWebKit>
+#include <QtWebKit/QtWebKit>
 
 #include <QAction>
 #include <QApplication>
diff --git a/tests/situareservice/situareservice b/tests/situareservice/situareservice
deleted file mode 100755
index caffdce..0000000
Binary files a/tests/situareservice/situareservice and /dev/null differ
diff --git a/tests/situareservice/situareservice.pro b/tests/situareservice/situareservice.pro
index 5886fd6..1d1ac42 100644
--- a/tests/situareservice/situareservice.pro
+++ b/tests/situareservice/situareservice.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += testlib network sql
+QT       += testlib network sql webkit
 
 CONFIG   += console
 CONFIG   -= app_bundle
@@ -19,9 +19,6 @@ SOURCES += testsituareservice.cpp \
     ../../src/situareservice/situareservice.cpp \
     ../../src/user/user.cpp \
     ../../tests/stubs/stubbase.cpp \
-    ../../src/facebookservice/facebookauthentication.cpp \
-    ../../src/facebookservice/facebookcredentials.cpp \
-    ../../src/situareservice/database.cpp \
     ../../src/coordinates/geocoordinate.cpp \
     ../../src/coordinates/scenecoordinate.cpp \
     ../../src/ui/avatarimage.cpp \
@@ -41,9 +38,6 @@ HEADERS += \
     ../../src/network/networkaccessmanager.h \
     ../../src/situareservice/imagefetcher.h \
     ../../tests/stubs/stubbase.h \
-    ../../src/facebookservice/facebookauthentication.h \
-    ../../src/facebookservice/facebookcredentials.h \
-    ../../src/situareservice/database.h \
     ../../src/coordinates/geocoordinate.h \
     ../../src/coordinates/scenecoordinate.h \
     ../../src/ui/avatarimage.h \
diff --git a/tests/stubs/imagefetcherstub.h b/tests/stubs/imagefetcherstub.h
index 2c09c62..948c463 100644
--- a/tests/stubs/imagefetcherstub.h
+++ b/tests/stubs/imagefetcherstub.h
@@ -45,7 +45,7 @@ void ImageFetcherStub::fetchImage(const QString &id, const QUrl &url)
     QList<ParameterBase *> params;
     params.append(new Parameter<const QString &>(id));
     params.append(new Parameter<const QUrl &>(url));
-    stubMethodEntered("fetchImage");
+    stubMethodEntered("fetchImage", params);
 }
 
 void ImageFetcherStub::downloadFinished(QNetworkReply *reply)
diff --git a/tests/stubs/messagelistitemstub.h b/tests/stubs/messagelistitemstub.h
index e835cef..1ccf6ae 100644
--- a/tests/stubs/messagelistitemstub.h
+++ b/tests/stubs/messagelistitemstub.h
@@ -32,9 +32,9 @@ class MessageListItemStub : public StubBase
 {
 public:
     virtual void MessageListItemConstructor();
-    virtual GeoCoordinate &coordinates() const;
-    virtual QString &id() const;
-    virtual QString &newMessageReceiverId() const;
+    virtual GeoCoordinate coordinates() const;
+    virtual QString id() const;
+    virtual QString newMessageReceiverId() const;
     virtual void setNewMessageReceiverId(const QString &newMessageReceiverId);
     virtual void setMessageData(const Message &message);
 };
@@ -44,17 +44,17 @@ void MessageListItemStub::MessageListItemConstructor()
 
 }
 
-GeoCoordinate &MessageListItemStub::coordinates() const
+GeoCoordinate MessageListItemStub::coordinates() const
 {
     return stubReturnValue<GeoCoordinate>("coordinates");
 }
 
-QString &MessageListItemStub::id() const
+QString MessageListItemStub::id() const
 {
     return stubReturnValue<QString>("id");
 }
 
-QString &MessageListItemStub::newMessageReceiverId() const
+QString MessageListItemStub::newMessageReceiverId() const
 {
     return stubReturnValue<QString>("newMessageReceiverId");
 }
@@ -88,17 +88,17 @@ MessageListItem::~MessageListItem()
 
 }
 
-GeoCoordinate &MessageListItem::coordinates() const
+GeoCoordinate MessageListItem::coordinates() const
 {
     return messageListItemStub->coordinates();
 }
 
-QString &MessageListItem::id() const
+QString MessageListItem::id() const
 {
     return messageListItemStub->id();
 }
 
-QString &MessageListItem::newMessageReceiverId() const
+QString MessageListItem::newMessageReceiverId() const
 {
     return messageListItemStub->newMessageReceiverId();
 }
diff --git a/tests/tests.pro b/tests/tests.pro
index e77d782..1e31abc 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -12,9 +12,14 @@ SUBDIRS = coordinates/geocoordinate \
           map/maprouteitem \
           ui/friendlistview \
           ui/friendlistitem \
-          ui/tabbedpanel \
           ui/avatarimage \
           user \
           routing/route \
           routing/routesegment \
-          situareservice
+          situareservice \
+          ui/meetpeoplepanel \
+          ui/messagedialog \
+          ui/messagelistitem \
+          ui/messagelistview \
+          ui/messagepanel \
+          ui/tagsdialog
diff --git a/tests/ui/meetpeoplepanel/meetpeoplepanel.pro b/tests/ui/meetpeoplepanel/meetpeoplepanel.pro
index def41ea..0d1c862 100644
--- a/tests/ui/meetpeoplepanel/meetpeoplepanel.pro
+++ b/tests/ui/meetpeoplepanel/meetpeoplepanel.pro
@@ -11,6 +11,7 @@ HEADERS += \
     ../../stubs/listitemstub.h \
     ../../stubs/extendedlistitemstub.h \
     ../../../src/ui/extendedlistitemdelegate.h \
+../../../src/ui/friendlistitemdelegate.h \
     ../../../src/ui/headerlistitemdelegate.h \
     ../../../src/ui/listitemdelegate.h \
     ../../../src/ui/meetpeoplepanel.h \
@@ -39,4 +40,5 @@ SOURCES += \
     ../../../src/coordinates/geocoordinate.cpp \
     ../../../src/coordinates/scenecoordinate.cpp \
     ../../../src/ui/extendedlistitemstore.cpp \
+    ../../../src/ui/friendlistitemdelegate.cpp \
     testmeetpeoplepanel.cpp
diff --git a/tests/ui/messagepanel/testmessagepanel.cpp b/tests/ui/messagepanel/testmessagepanel.cpp
index cfb489d..f1892b5 100644
--- a/tests/ui/messagepanel/testmessagepanel.cpp
+++ b/tests/ui/messagepanel/testmessagepanel.cpp
@@ -72,16 +72,16 @@ QList<Message> TestMessagePanel::getMessages()
     return messages;
 }
 
+typedef QPair<QString, QString> ReceiverPair;
+Q_DECLARE_METATYPE(ReceiverPair);
+qRegisterMetaType< QPair<QString, QString> >("QPair<QString,QString>");
+
 void TestMessagePanel::messageButtonPressed()
 {
     MessageListItem messageItem;
     messageItem.setMessageData(getMessages().at(0));
     messageListItemStub->stubSetReturnValue("newMessageReceiverId", QString("1"));
 
-    typedef QPair<QString, QString> ReceiverPair;
-    Q_DECLARE_METATYPE(ReceiverPair);
-    qRegisterMetaType< QPair<QString, QString> >("QPair<QString,QString>");
-
     QSignalSpy requestMessageDialogSpy(m_messagePanel,
                                        SIGNAL(requestMessageDialog(QPair<QString,QString>)));
     QVERIFY(requestMessageDialogSpy.isValid());
diff --git a/tests/ui/tabbedpanel/tabbedpanel.pro b/tests/ui/tabbedpanel/tabbedpanel.pro
index ba0807d..112e8d9 100644
--- a/tests/ui/tabbedpanel/tabbedpanel.pro
+++ b/tests/ui/tabbedpanel/tabbedpanel.pro
@@ -1,3 +1,4 @@
+QT += network
 CONFIG += qtestlib
 TEMPLATE = app
 INCLUDEPATH += "../../../src"
@@ -10,7 +11,8 @@ SOURCES += \
     ../../../src/ui/panelcontextbuttonbar.cpp \
     ../../../src/ui/paneltab.cpp \
     ../../../src/ui/paneltabbar.cpp \
-    ../../../src/ui/listitemcontextbuttonbar.cpp
+    ../../../src/ui/listitemcontextbuttonbar.cpp \
+    ../../../src/ui/mainwindow.cpp
 HEADERS += \
     ../../../src/ui/tabbedpanel.h \
     ../../../src/ui/panelbar.h \
@@ -20,6 +22,7 @@ HEADERS += \
     ../../../src/ui/paneltab.h \
     ../../../src/ui/paneltabbar.h \
     ../../../src/ui/panelcommon.h \
-    ../../../src/ui/listitemcontextbuttonbar.h
+    ../../../src/ui/listitemcontextbuttonbar.h \
+../../../src/ui/mainwindow.h
 RESOURCES += ../../../images.qrc
 DEFINES += QT_NO_DEBUG_OUTPUT