Created a test case to test switching between views

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index b67ba1d..92a0fb6 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -1,24 +1,24 @@
 /*
-    Situare - A location system for Facebook
-    Copyright (C) 2010  Ixonos Plc. Authors:
+   Situare - A location system for Facebook
+   Copyright (C) 2010  Ixonos Plc. Authors:
 
-       Henri Lampela - henri.lampela@ixonos.com
-       Kaj Wallin - kaj.wallin@ixonos.com
+      Henri Lampela - henri.lampela@ixonos.com
+      Kaj Wallin - kaj.wallin@ixonos.com
 
-    Situare is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    version 2 as published by the Free Software Foundation.
+   Situare is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   version 2 as published by the Free Software Foundation.
 
-    Situare is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   Situare is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with Situare; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
-    USA.
- */
+   You should have received a copy of the GNU General Public License
+   along with Situare; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+   USA.
+*/
 
 #include <QtGui>
 #include "mainwindow.h"

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index f249c24..30e272a 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -1,24 +1,24 @@
 /*
-    Situare - A location system for Facebook
-    Copyright (C) 2010  Ixonos Plc. Authors:
-
-       Henri Lampela - henri.lampela@ixonos.com
-       Kaj Wallin - kaj.wallin@ixonos.com
-
-    Situare is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    version 2 as published by the Free Software Foundation.
-
-    Situare is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Situare; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
-    USA.
- */
+   Situare - A location system for Facebook
+   Copyright (C) 2010  Ixonos Plc. Authors:
+
+      Henri Lampela - henri.lampela@ixonos.com
+      Kaj Wallin - kaj.wallin@ixonos.com
+
+   Situare is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   version 2 as published by the Free Software Foundation.
+
+   Situare is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Situare; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+   USA.
+*/
 
 
 #ifndef MAINWINDOW_H

diff --git a/tests/testUI/testTabs/testTabs b/tests/testUI/testTabs/testTabs
new file mode 100755 (executable)
index 0000000..e0f4b1e
Binary files /dev/null and b/tests/testUI/testTabs/testTabs differ

diff --git a/tests/testUI/testTabs/testTabs.pro b/tests/testUI/testTabs/testTabs.pro
new file mode 100644 (file)
index 0000000..2871166
--- /dev/null
+++ b/tests/testUI/testTabs/testTabs.pro
@@ -0,0 +1,17 @@
+# #####################################################################
+# Automatically generated by qmake (2.01a) Wed Mar 31 09:43:35 2010
+# #####################################################################
+CONFIG += qtestlib
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += testtabs.cpp \
+    ../../../src/ui/mapviewtab.cpp \
+    ../../../src/ui/mainwindow.cpp \
+    ../../../src/ui/listviewtab.cpp
+HEADERS += ../../../src/ui/mapviewtab.h \
+    ../../../src/ui/mainwindow.h \
+    ../../../src/ui/listviewtab.h

diff --git a/tests/testUI/testTabs/testtabs.cpp b/tests/testUI/testTabs/testtabs.cpp
new file mode 100644 (file)
index 0000000..875af9c
--- /dev/null
+++ b/tests/testUI/testTabs/testtabs.cpp
@@ -0,0 +1,51 @@
+ /*
+    Situare - A location system for Facebook
+    Copyright (C) 2010  Ixonos Plc. Authors:
+
+        Kaj Wallin - kaj.wallin@ixonos.com
+
+    Situare is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    version 2 as published by the Free Software Foundation.
+
+    Situare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Situare; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+    USA.
+ */
+
+#include <QtTest/QtTest>
+#include <QtCore>
+#include <QtGui>
+
+#include "../../../src/ui/mapviewtab.h"
+#include "../../../src/ui/listviewtab.h"
+#include "../../../src/ui/mainwindow.h"
+
+class testTabs : public QObject
+{
+    Q_OBJECT
+private slots:
+    void testTabChanges();
+};
+
+void testTabs::testTabChanges()
+{
+    MainWindow mainwindow;
+    mainwindow.toListView();
+    QCOMPARE(mainwindow.situareViews->currentIndex(), 0);
+    mainwindow.toMapView();
+    QCOMPARE(mainwindow.situareViews->currentIndex(), 1);
+    mainwindow.toMapView();
+    QCOMPARE(mainwindow.situareViews->currentIndex(), 1);
+    mainwindow.toListView();
+    QCOMPARE(mainwindow.situareViews->currentIndex(), 0);
+}
+
+QTEST_MAIN(testTabs)
+#include "testtabs.moc"

diff --git a/tests/testUI/testui.cpp b/tests/testUI/testui.cpp
index 606309b..5c9f08d 100755 (executable)
--- a/tests/testUI/testui.cpp
+++ b/tests/testUI/testui.cpp
@@ -3,7 +3,6 @@
     Copyright (C) 2010  Ixonos Plc. Authors:
 
        Henri Lampela - henri.lampela@ixonos.com
-       Kaj Wallin - kaj.wallin@ixonos.com
 
     Situare is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@ -30,7 +29,6 @@ class TestUi: public QObject
 
 private slots:
     void testUi();
-    void testViews();
 };
 
 void TestUi::testUi()
@@ -42,11 +40,6 @@ void TestUi::testUi()
     QCOMPARE(lineEdit.text(), QString("UI test"));
 }
 
-void TestUi::testViews()
-{
-
-}
-
 
 QTEST_MAIN(TestUi)
 #include "testui.moc"