Added INSTALL file to project root.

diff --git a/INSTALL b/INSTALL
new file mode 100644 (file)
index 0000000..a387912
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,3 @@
+To install debian package type:
+
+dpkg-buildpackage -rfakeroot -b

diff --git a/reports/tests_summary.txt b/reports/tests_summary.txt
new file mode 100644 (file)
index 0000000..5e402d3
--- /dev/null
+++ b/reports/tests_summary.txt
@@ -0,0 +1,24 @@
+############# testGPS/testGPS ################
+Totals: 3 passed, 0 failed, 0 skipped
+############# testMap/testMapEngine ################
+Totals: 3 passed, 0 failed, 0 skipped
+############# testMap/testMapScene ################
+Totals: 2 passed, 1 failed, 0 skipped
+############# testMap/testMapTile ################
+Totals: 4 passed, 0 failed, 0 skipped
+############# testMap/testMapView ################
+Totals: 3 passed, 0 failed, 0 skipped
+############# testPHP/testPHP ################
+Totals: 3 passed, 0 failed, 0 skipped
+############# testUI/testUI ################
+Totals: 2 passed, 1 failed, 0 skipped
+############# testMap/testMapEngine ################
+Totals: 3 passed, 0 failed, 0 skipped
+############# testMap/testMapScene ################
+Totals: 2 passed, 1 failed, 0 skipped
+############# testMap/testMapTile ################
+Totals: 4 passed, 0 failed, 0 skipped
+############# testMap/testMapView ################
+Totals: 3 passed, 0 failed, 0 skipped
+############# testUI/testUI ################
+Totals: 2 passed, 1 failed, 0 skipped

diff --git a/scripts/master_test_script.sh b/scripts/master_test_script.sh
index 781cfe0..2f03ebb 100755 (executable)
--- a/scripts/master_test_script.sh
+++ b/scripts/master_test_script.sh
@@ -12,9 +12,9 @@ echo "As a final step, it creates summary report from all tests executed."
 ##########################################################
 #Store all directory names to a list
 MODULES=(`ls ../tests/`)
-#Modify this path to point to correct path
+#Modify these paths to point to correct path
 location=$HOME/situare/repository/situare/tests/
-FILE=$HOME/situare/repository/situare/scripts/tests_summary.txt
+FILE=$HOME/situare/repository/situare/reports/tests_summary.txt
 if [ ! -e $FILE ]; then
     touch tests_summary.txt
     echo "##########################################" >> tests_summary.txt

diff --git a/scripts/tests_summary.txt b/scripts/tests_summary.txt
new file mode 100644 (file)
index 0000000..82c1bbc
--- /dev/null
+++ b/scripts/tests_summary.txt
@@ -0,0 +1,5 @@
+##########################################
+# Summary of unit tests executed         #
+# Date: Wed Mar 31 12:50:55 EEST 2010    #
+# User: juksa                            #
+##########################################

diff --git a/tests/testGPS/testGPS/testGPS.pro b/tests/testGPS/testGPS/testGPS.pro
deleted file mode 100644 (file)
index cd149c3..0000000
--- a/tests/testGPS/testGPS/testGPS.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Mon Mar 29 14:23:01 2010
-######################################################################
-
-CONFIG+=qtestlib
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += ../../../src/ui/mainwindow.h
-SOURCES += testgps.cpp ../../../src/ui/mainwindow.cpp

diff --git a/tests/testGPS/testGPS/testgps.cpp b/tests/testGPS/testGPS/testgps.cpp
deleted file mode 100755 (executable)
index 7b431c5..0000000
--- a/tests/testGPS/testGPS/testgps.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Situare - A location system for Facebook
-    Copyright (C) 2010  Ixonos Plc. Authors:
-
-       Henri Lampela - henri.lampela@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 <QtGui>
-#include <QtTest/QtTest>
-#include "../../../src/ui/mainwindow.h"
-
-class TestGps: public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testGps();
-
-
-};
-
-void TestGps::testGps()
-{
-    QLineEdit lineEdit;
-
-    QTest::keyClicks(&lineEdit, "UI test");
-
-    QCOMPARE(lineEdit.text(), QString("UI test"));
-}
-
-
-QTEST_MAIN(TestGps)
-#include "testgps.moc"

diff --git a/tests/testMap/testMapEngine/testMapEngine b/tests/testMap/testMapEngine/testMapEngine
deleted file mode 100755 (executable)
index 6e76cc0..0000000
Binary files a/tests/testMap/testMapEngine/testMapEngine and /dev/null differ

diff --git a/tests/testMap/testMapEngine/testreport_testMap.txt b/tests/testMap/testMapEngine/testreport_testMap.txt
new file mode 100644 (file)
index 0000000..9d0e788
--- /dev/null
+++ b/tests/testMap/testMapEngine/testreport_testMap.txt
@@ -0,0 +1,7 @@
+********* Start testing of TestMapEngine *********
+Config: Using QTest library 4.6.2, Qt 4.6.2
+PASS   : TestMapEngine::initTestCase()
+PASS   : TestMapEngine::convertTileNumberToSceneCoordinate()
+PASS   : TestMapEngine::cleanupTestCase()
+Totals: 3 passed, 0 failed, 0 skipped
+********* Finished testing of TestMapEngine *********

diff --git a/tests/testMap/testMapScene/testMapScene b/tests/testMap/testMapScene/testMapScene
deleted file mode 100755 (executable)
index ee4b55f..0000000
Binary files a/tests/testMap/testMapScene/testMapScene and /dev/null differ

diff --git a/tests/testMap/testMapScene/testreport_testMap.txt b/tests/testMap/testMapScene/testreport_testMap.txt
new file mode 100644 (file)
index 0000000..bfa8946
--- /dev/null
+++ b/tests/testMap/testMapScene/testreport_testMap.txt
@@ -0,0 +1,8 @@
+********* Start testing of TestMapScene *********
+Config: Using QTest library 4.6.2, Qt 4.6.2
+PASS   : TestMapScene::initTestCase()
+FAIL!  : TestMapScene::addMapTile() 'mapTile.zoomLevel() == 13' returned FALSE. ()
+   Loc: [testmapscene.cpp(23)]
+PASS   : TestMapScene::cleanupTestCase()
+Totals: 2 passed, 1 failed, 0 skipped
+********* Finished testing of TestMapScene *********

diff --git a/tests/testMap/testMapTile/testMapTile b/tests/testMap/testMapTile/testMapTile
deleted file mode 100755 (executable)
index 92a172a..0000000
Binary files a/tests/testMap/testMapTile/testMapTile and /dev/null differ

diff --git a/tests/testMap/testMapTile/testreport_testMap.txt b/tests/testMap/testMapTile/testreport_testMap.txt
new file mode 100644 (file)
index 0000000..cf6ba89
--- /dev/null
+++ b/tests/testMap/testMapTile/testreport_testMap.txt
@@ -0,0 +1,8 @@
+********* Start testing of TestMapTile *********
+Config: Using QTest library 4.6.2, Qt 4.6.2
+PASS   : TestMapTile::initTestCase()
+PASS   : TestMapTile::zoomLevel()
+PASS   : TestMapTile::tileNumber()
+PASS   : TestMapTile::cleanupTestCase()
+Totals: 4 passed, 0 failed, 0 skipped
+********* Finished testing of TestMapTile *********

diff --git a/tests/testMap/testMapView/testMapView b/tests/testMap/testMapView/testMapView
deleted file mode 100755 (executable)
index a1d221c..0000000
Binary files a/tests/testMap/testMapView/testMapView and /dev/null differ

diff --git a/tests/testMap/testMapView/testreport_testMap.txt b/tests/testMap/testMapView/testreport_testMap.txt
new file mode 100644 (file)
index 0000000..442e8f3
--- /dev/null
+++ b/tests/testMap/testMapView/testreport_testMap.txt
@@ -0,0 +1,7 @@
+********* Start testing of TestMapView *********
+Config: Using QTest library 4.6.2, Qt 4.6.2
+PASS   : TestMapView::initTestCase()
+PASS   : TestMapView::dummyTestCase()
+PASS   : TestMapView::cleanupTestCase()
+Totals: 3 passed, 0 failed, 0 skipped
+********* Finished testing of TestMapView *********

diff --git a/tests/testPHP/testPHP/testPHP.pro b/tests/testPHP/testPHP/testPHP.pro
deleted file mode 100644 (file)
index 915da3a..0000000
--- a/tests/testPHP/testPHP/testPHP.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Mon Mar 29 14:23:19 2010
-######################################################################
-
-CONFIG+=qtestlib
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += ../../../src/ui/mainwindow.h
-SOURCES += testphp.cpp ../../../src/ui/mainwindow.cpp

diff --git a/tests/testPHP/testPHP/testphp.cpp b/tests/testPHP/testPHP/testphp.cpp
deleted file mode 100755 (executable)
index 84af3b0..0000000
--- a/tests/testPHP/testPHP/testphp.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Situare - A location system for Facebook
-    Copyright (C) 2010  Ixonos Plc. Authors:
-
-       Henri Lampela - henri.lampela@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 <QtGui>
-#include <QtTest/QtTest>
-#include "../../../src/ui/mainwindow.h"
-
-class TestPhp: public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testPhp();
-
-
-};
-
-void TestPhp::testPhp()
-{
-    QLineEdit lineEdit;
-
-    QTest::keyClicks(&lineEdit, "UI test");
-
-    QCOMPARE(lineEdit.text(), QString("UI test"));
-}
-
-
-QTEST_MAIN(TestPhp)
-#include "testphp.moc"

diff --git a/tests/testUI/testUI/testUI.pro b/tests/testUI/testUI/testUI.pro
index c516a6b..889d921 100644 (file)
--- a/tests/testUI/testUI/testUI.pro
+++ b/tests/testUI/testUI/testUI.pro
@@ -1,5 +1,5 @@
 ######################################################################
-# Automatically generated by qmake (2.01a) Mon Mar 29 14:23:24 2010
+# Automatically generated by qmake (2.01a) Wed Mar 31 12:52:38 2010
 ######################################################################
 
 CONFIG+=qtestlib

diff --git a/tests/testUI/testUI/testreport_testUI.txt b/tests/testUI/testUI/testreport_testUI.txt
new file mode 100644 (file)
index 0000000..4511f1a
--- /dev/null
+++ b/tests/testUI/testUI/testreport_testUI.txt
@@ -0,0 +1,10 @@
+********* Start testing of TestUi *********
+Config: Using QTest library 4.6.2, Qt 4.6.2
+PASS   : TestUi::initTestCase()
+FAIL!  : TestUi::testUi() Compared values are not the same
+   Actual (lineEdit.text()): UI tests
+   Expected (QString("UI test")): UI test
+   Loc: [testui.cpp(42)]
+PASS   : TestUi::cleanupTestCase()
+Totals: 2 passed, 1 failed, 0 skipped
+********* Finished testing of TestUi *********