Fixed unit test for mainWindow. Added object names to map and list views

Reviewed by:

diff --git a/src/ui/listviewscreen.cpp b/src/ui/listviewscreen.cpp
index 04f8886..74456cc 100644 (file)
--- a/src/ui/listviewscreen.cpp
+++ b/src/ui/listviewscreen.cpp
@@ -95,6 +95,8 @@ ListViewScreen::ListViewScreen(QWidget *parent)
     m_vbox->addWidget(view);
     m_vbox->setMargin(0);
 
+    setObjectName("List view");
+
     //connect(m_personalInfo,SIGNAL(launchMessageUpdate()),this,SLOT(updateMessage()));
 }
 

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index b0f28e7..ff0a93f 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -69,7 +69,6 @@ public slots:
     * @brief Public slot, which initiates toListViewAct action to switch view
     */
     void toListView();
-
     /**
     * @brief Public slot, which initiates toMapViewAct action to switch view
     */
@@ -133,7 +132,6 @@ signals:
  ******************************************************************************/
 
 private:
-
     ListViewScreen *m_listViewScreen;
     UpdateLocationDialog *m_locationDialog; ///< Message dialog
     MapViewScreen *m_mapViewScreen;

diff --git a/src/ui/mapviewscreen.cpp b/src/ui/mapviewscreen.cpp
index cc7b7da..3b9f4e0 100644 (file)
--- a/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@ -64,6 +64,8 @@ MapViewScreen::MapViewScreen(QWidget *parent)
     mapViewLayout->setMargin(0);
 
     mapEngine->init();
+
+    setObjectName("Map view");
 }
 
 void MapViewScreen::searchMap()

diff --git a/tests/ui/mainwindow/mainwindow_test.pro b/tests/ui/mainwindow/mainwindow_test.pro
index 2801d54..6791c07 100644 (file)
--- a/tests/ui/mainwindow/mainwindow_test.pro
+++ b/tests/ui/mainwindow/mainwindow_test.pro
@@ -12,7 +12,11 @@ SOURCES += mainwindow_test.cpp \
     ../../../src/map/mapengine.cpp \
     ../../../src/ui/mapviewscreen.cpp \
     ../../../src/ui/mainwindow.cpp \
-    ../../../src/ui/listviewscreen.cpp
+    ../../../src/ui/listviewscreen.cpp \
+    ../../../src/ui/pixmap.cpp \
+    ../../../src/ui/infotab.cpp \
+    ../../../src/ui/updatelocation/updatelocationdialog.cpp \
+    ../../../src/ui/updatelocation/texteditautoresizer.cpp
 HEADERS += ../../../src/map/mapview.h \
     ../../../src/map/maptile.h \
     ../../../src/map/mapscene.h \
@@ -20,7 +24,11 @@ HEADERS += ../../../src/map/mapview.h \
     ../../../src/map/mapengine.h \
     ../../../src/ui/mapviewscreen.h \
     ../../../src/ui/mainwindow.h \
-    ../../../src/ui/listviewscreen.h
-
+    ../../../src/ui/listviewscreen.h \
+    ../../../src/ui/pixmap.h \
+    ../../../src/ui/infotab.h \
+    ../../../src/ui/updatelocation/updatelocationdialog.h \
+    ../../../src/ui/updatelocation/texteditautoresizer.h
 QT += webkit \
     network
+!maemo5:QT += opengl