Merge pull request #10 from martyone/fix-tests

Fix tests, fix one bug, fix doc build
sailfishos · Jul 30, 2014 · 7e47dcb · 7e47dcb
2 parents d4d46e9 + 08058e4
commit 7e47dcb
Show file tree

Hide file tree

Showing 160 changed files with 515 additions and 592 deletions.
diff --git a/Doxyfile → doc/Doxyfile b/Doxyfile → doc/Doxyfile
@@ -4,9 +4,9 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = Libmeegosyncml
+PROJECT_NAME           = buteo-syncml
 PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = doc/
+OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -94,7 +94,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = src/
+INPUT                  = ../src/
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -277,7 +277,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references   
 #---------------------------------------------------------------------------
 TAGFILES               = 
-GENERATE_TAGFILE       = meegosyncml.tag
+GENERATE_TAGFILE       = buteo-syncml.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl

diff --git a/doc/coverage/build_documentation.sh b/doc/coverage/build_documentation.sh
@@ -32,6 +32,6 @@
 #* 
 #*/
 ./coverage.sh
-cd ../..
+cd ..
 doxygen Doxyfile
 
diff --git a/doc/doc.pri b/doc/doc.pri
@@ -0,0 +1,12 @@
+DOXYGEN_BIN = $$system(command -v doxygen)
+isEmpty(DOXYGEN_BIN):error("Unable to detect doxygen in PATH")
+
+doc.CONFIG = phony
+doc.commands = cd $${PWD} && $${DOXYGEN_BIN} Doxyfile
+QMAKE_EXTRA_TARGETS += doc
+QMAKE_CLEAN += $${PWD}/html/* $${PWD}/buteo-syncml.tag
+
+# Install rules
+htmldocs.files = $${PWD}/html/
+htmldocs.path = /usr/share/doc/buteo-syncml-doc/
+INSTALLS += htmldocs
diff --git a/doc/doc.pro b/doc/doc.pro
diff --git a/libbuteosyncml.pro b/libbuteosyncml.pro
@@ -1,4 +1,4 @@
-include(doc/doc.pro)
+include(doc/doc.pri)
 
 CONFIG += ordered \
 	qt \

diff --git a/rpm/buteo-syncml-qt5.spec b/rpm/buteo-syncml-qt5.spec
@@ -52,10 +52,7 @@ Requires: %{name} = %{version}-%{release}
 
 %files tests
 %defattr(-,root,root,-)
-/opt/tests/buteo-syncml/test-definition/tests.xml
-/opt/tests/buteo-syncml/libbuteosyncml-tests
-/opt/tests/buteo-syncml/runstarget.sh
-/opt/tests/buteo-syncml/data/
+/opt/tests/%{name}/*
 
 
 %prep

diff --git a/rpm/buteo-syncml.spec b/rpm/buteo-syncml.spec
@@ -48,10 +48,7 @@ Requires: %{name} = %{version}-%{release}
 
 %files tests
 %defattr(-,root,root,-)
-/opt/tests/buteo-syncml/test-definition/tests.xml
-/opt/tests/buteo-syncml/libbuteosyncml-tests
-/opt/tests/buteo-syncml/runstarget.sh
-/opt/tests/buteo-syncml/data/
+/opt/tests/buteo-syncml/*
 
 
 %prep

diff --git a/src/NonceStorage.cpp b/src/NonceStorage.cpp
@@ -106,7 +106,7 @@ void NonceStorage::setNonce( const QByteArray& aNonce )
 
     clearNonce();
 
-    const QString insertQuery( "INSERT INTO nonces(local_device, remote_device, nonce) values(:local_device, :remove_device, :nonce)" );
+    const QString insertQuery( "INSERT INTO nonces(local_device, remote_device, nonce) values(:local_device, :remote_device, :nonce)" );
 
     QSqlQuery query( iDbHandle );
 

diff --git a/tests_meego/AlertPackageTest.cpp b/tests_meego/AlertPackageTest.cpp
@@ -34,7 +34,6 @@
 #include "AlertPackageTest.h"
 #include "AlertPackage.h"
 #include "SyncMLMessage.h"
-#include "TestLoader.h"
 #include "Mock.h"
 #include "QtEncoder.h"
 
@@ -108,4 +107,4 @@ void AlertPackageTest::testWrite()
     QVERIFY(result_xml.indexOf(SYNCML_ELEMENT_ALERT) != -1);
 }
 
-TESTLOADER_ADD_TEST(AlertPackageTest);
+QTEST_MAIN(AlertPackageTest)
diff --git a/tests_meego/AlertPackageTest.pro b/tests_meego/AlertPackageTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/AuthHelperTest.cpp b/tests_meego/AuthHelperTest.cpp
@@ -33,7 +33,6 @@
 
 #include "AuthHelperTest.h"
 #include "AuthHelper.h"
-#include "TestLoader.h"
 
 using namespace DataSync;
 
@@ -65,5 +64,5 @@ void AuthHelperTest::testAuthEncodeMD5()
 
 
 
-TESTLOADER_ADD_TEST(AuthHelperTest);
+QTEST_MAIN(DataSync::AuthHelperTest)
 
diff --git a/tests_meego/AuthHelperTest.pro b/tests_meego/AuthHelperTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/AuthenticationPackageTest.cpp b/tests_meego/AuthenticationPackageTest.cpp
@@ -36,7 +36,6 @@
 #include "AuthenticationPackage.h"
 #include "SyncMLMessage.h"
 #include "QtEncoder.h"
-#include "TestLoader.h"
 #include "Fragments.h"
 #include "datatypes.h"
 
@@ -103,4 +102,4 @@ void AuthenticationPackageTest::testWrite2()
 
 }
 
-TESTLOADER_ADD_TEST(AuthenticationPackageTest);
+QTEST_MAIN(AuthenticationPackageTest)
diff --git a/tests_meego/AuthenticationPackageTest.pro b/tests_meego/AuthenticationPackageTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/ChangeLogHandlerTest.cpp b/tests_meego/ChangeLogHandlerTest.cpp
@@ -36,7 +36,6 @@
 #include "ChangeLogHandler.h"
 #include "DatabaseHandler.h"
 #include "datatypes.h"
-#include "TestLoader.h"
 using namespace DataSync;
 
 #include <QTest>
@@ -89,4 +88,4 @@ void ChangeLogHandlerTest::testCreateChangeLogTable()
 
 }
 
-TESTLOADER_ADD_TEST(ChangeLogHandlerTest);
+QTEST_MAIN(ChangeLogHandlerTest)
diff --git a/tests_meego/ChangeLogHandlerTest.pro b/tests_meego/ChangeLogHandlerTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/ChangeLogTest.cpp b/tests_meego/ChangeLogTest.cpp
@@ -36,7 +36,6 @@
 
 #include "DatabaseHandler.h"
 #include "SyncMode.h"
-#include "TestLoader.h"
 
 #include "LogMacros.h"
 
@@ -252,4 +251,4 @@ void ChangeLogTest::testOwnedGetSetMaps()
 
 }
 
-TESTLOADER_ADD_TEST(ChangeLogTest);
+QTEST_MAIN(ChangeLogTest)
diff --git a/tests_meego/ChangeLogTest.pro b/tests_meego/ChangeLogTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/CommandHandlerTest.cpp b/tests_meego/CommandHandlerTest.cpp
@@ -46,7 +46,6 @@
 #include "TestUtils.h"
 #include "LogMacros.h"
 
-#include "TestLoader.h"
 
 using namespace DataSync;
 
@@ -658,4 +657,4 @@ void CommandHandlerTest::testHandleMap()
     QCOMPARE(target.getUIDMappings().at(1).iLocalUID, trg2);
 }
 
-TESTLOADER_ADD_TEST(CommandHandlerTest);
+QTEST_MAIN(DataSync::CommandHandlerTest)
diff --git a/tests_meego/CommandHandlerTest.pro b/tests_meego/CommandHandlerTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/ConflictResolverTest.cpp b/tests_meego/ConflictResolverTest.cpp
@@ -34,9 +34,8 @@
 
 #include "ConflictResolverTest.h"
 
-#include "TestLoader.h"
 
 using namespace DataSync;
 
 
-TESTLOADER_ADD_TEST(ConflictResolverTest);
+QTEST_MAIN(DataSync::ConflictResolverTest)
diff --git a/tests_meego/ConflictResolverTest.pro b/tests_meego/ConflictResolverTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/DevInfHandlerTest.cpp b/tests_meego/DevInfHandlerTest.cpp
@@ -36,7 +36,6 @@
 #include "DevInfHandler.h"
 #include "ResponseGenerator.h"
 #include "DevInfPackage.h"
-#include "TestLoader.h"
 
 #include "LogMacros.h"
 
@@ -202,5 +201,5 @@ void DevInfHandlerTest::testHandleResults()
     QCOMPARE( response, SUCCESS );
 }
 
-TESTLOADER_ADD_TEST(DevInfHandlerTest);
+QTEST_MAIN(DevInfHandlerTest)
 
diff --git a/tests_meego/DevInfHandlerTest.pro b/tests_meego/DevInfHandlerTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/DevInfPackageTest.cpp b/tests_meego/DevInfPackageTest.cpp
@@ -35,7 +35,6 @@
 
 #include "DevInfPackage.h"
 #include "SyncMLMessage.h"
-#include "TestLoader.h"
 #include "Mock.h"
 #include "QtEncoder.h"
 #include "DeviceInfo.h"
@@ -198,4 +197,4 @@ void DevInfPackageTest::verifyGet( const QByteArray& aData )
     QVERIFY( aData.contains( "./devinf12") );
 }
 
-TESTLOADER_ADD_TEST(DevInfPackageTest);
+QTEST_MAIN(DevInfPackageTest)
diff --git a/tests_meego/DevInfPackageTest.pro b/tests_meego/DevInfPackageTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/FinalPackageTest.cpp b/tests_meego/FinalPackageTest.cpp
@@ -37,7 +37,6 @@
 #include "SyncMLMessage.h"
 #include "Fragments.h"
 #include "QtEncoder.h"
-#include "TestLoader.h"
 
 using namespace DataSync;
 
@@ -58,4 +57,4 @@ void FinalPackageTest::testPackage()
     QVERIFY(result_xml.indexOf(SYNCML_ELEMENT_FINAL) != -1);
 }
 
-TESTLOADER_ADD_TEST(FinalPackageTest);
+QTEST_MAIN(FinalPackageTest)
diff --git a/tests_meego/FinalPackageTest.pro b/tests_meego/FinalPackageTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/LocalChangesPackageTest.cpp b/tests_meego/LocalChangesPackageTest.cpp
@@ -41,7 +41,6 @@
 #include "Mock.h"
 #include "Fragments.h"
 
-#include "TestLoader.h"
 
 
 LocalChangesPackageStorage::LocalChangesPackageStorage( const QString& aSourceURI )
@@ -384,4 +383,4 @@ void LocalChangesPackageTest::testLargeObjects()
     QVERIFY( !result_xml2.contains( "MoreData" ) );
 
 }
-TESTLOADER_ADD_TEST(LocalChangesPackageTest);
+QTEST_MAIN(LocalChangesPackageTest)
diff --git a/tests_meego/LocalChangesPackageTest.pro b/tests_meego/LocalChangesPackageTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/LocalMappingsPackageTest.cpp b/tests_meego/LocalMappingsPackageTest.cpp
@@ -39,7 +39,6 @@
 #include "QtEncoder.h"
 #include "Fragments.h"
 
-#include "TestLoader.h"
 
 using namespace DataSync;
 
@@ -88,4 +87,4 @@ void LocalMappingsPackageTest::testPackage()
 
 
 
-TESTLOADER_ADD_TEST(LocalMappingsPackageTest);
+QTEST_MAIN(LocalMappingsPackageTest)
diff --git a/tests_meego/LocalMappingsPackageTest.pro b/tests_meego/LocalMappingsPackageTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/NonceStorageTest.cpp b/tests_meego/NonceStorageTest.cpp
@@ -36,7 +36,6 @@
 #include "DatabaseHandler.h"
 #include "NonceStorage.h"
 
-#include "TestLoader.h"
 
 const QString DB( "/tmp/noncestoragetest.db" );
 const QString LOCALDEVICE( "localDevice" );
@@ -73,5 +72,5 @@ void NonceStorageTest::testClearNonce()
     QVERIFY( nonces.nonce().isEmpty() );
 }
 
-TESTLOADER_ADD_TEST(NonceStorageTest);
+QTEST_MAIN(DataSync::NonceStorageTest)
 
diff --git a/tests_meego/NonceStorageTest.pro b/tests_meego/NonceStorageTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/ResponseGeneratorTest.cpp b/tests_meego/ResponseGeneratorTest.cpp
@@ -41,7 +41,6 @@
 #include "QtEncoder.h"
 #include "SyncMLMessage.h"
 
-#include "TestLoader.h"
 
 using namespace DataSync;
 
@@ -699,5 +698,5 @@ void ResponseGeneratorTest::test208762()
 
 }
 
-TESTLOADER_ADD_TEST(ResponseGeneratorTest);
+QTEST_MAIN(DataSync::ResponseGeneratorTest)
 
diff --git a/tests_meego/ResponseGeneratorTest.pro b/tests_meego/ResponseGeneratorTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/SANTest.cpp b/tests_meego/SANTest.cpp
@@ -36,7 +36,6 @@
 #include <QDebug>
 
 #include "TestUtils.h"
-#include "TestLoader.h"
 #include "ServerAlertedNotification.h"
 
 using namespace DataSync;
@@ -132,4 +131,4 @@ void SANTest::testGenerator01()
 
 }
 
-TESTLOADER_ADD_TEST( SANTest );
+QTEST_MAIN(DataSync::SANTest)
diff --git a/tests_meego/SANTest.pro b/tests_meego/SANTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/SessionHandlerTest.cpp b/tests_meego/SessionHandlerTest.cpp
@@ -45,7 +45,6 @@
 #include "SyncAgentConfigProperties.h"
 #include "SyncCommonDefs.h"
 
-#include "TestLoader.h"
 
 using namespace DataSync;
 
@@ -84,16 +83,12 @@ void SessionHandlerTest::releaseStorage( StoragePlugin* aStorage )
 
 void SessionHandlerTest::init()
 {
-    // See DataSync::DatabaseHandler::DatabaseHandler()
-    QString effectivePath = Sync::syncCacheDir() + QDir::separator() + DBFILE;
-    QFile::remove( effectivePath );
+    QFile::remove( DBFILE );
 }
 
 void SessionHandlerTest::cleanup()
 {
-    // See DataSync::DatabaseHandler::DatabaseHandler()
-    QString effectivePath = Sync::syncCacheDir() + QDir::separator() + DBFILE;
-    QFile::remove( effectivePath );
+    QFile::remove( DBFILE );
 }
 
 void SessionHandlerTest::testClientWithClientInitiated()
@@ -1400,4 +1395,4 @@ void SessionHandlerTest::regression_NB153701_04()
 
 }
 
-TESTLOADER_ADD_TEST(SessionHandlerTest);
+QTEST_MAIN(SessionHandlerTest)
diff --git a/tests_meego/SessionHandlerTest.pro b/tests_meego/SessionHandlerTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)
diff --git a/tests_meego/StorageHandlerTest.cpp b/tests_meego/StorageHandlerTest.cpp
@@ -36,7 +36,6 @@
 #include "ConflictResolver.h"
 #include "LogMacros.h"
 
-#include "TestLoader.h"
 
 using namespace DataSync;
 
@@ -365,4 +364,4 @@ void StorageHandlerTest::regression_NB203771_05()
     QVERIFY( changes.removed.size() == 1 ); 
 }
 
-TESTLOADER_ADD_TEST(StorageHandlerTest);
+QTEST_MAIN(DataSync::StorageHandlerTest)
diff --git a/tests_meego/StorageHandlerTest.pro b/tests_meego/StorageHandlerTest.pro
@@ -0,0 +1 @@
+include(testapplication.pri)