Merge lp:~online-accounts/libaccounts-qt/packaging into lp:libaccounts-qt

[Alberto Mardegan]

Remove debug messages

Since this library is just a thin wrapper around libaccounts-glib, it
makes little sense to have debug messages in here: debugging can be
activated on libaccounts-glib, if needed.

Also, modernize test suite and project structure

Remove debug messages

Since this library is just a thin wrapper around libaccounts-glib, it
makes little sense to have debug messages in here: debugging can be
activated on libaccounts-glib, if needed.

Also, modernize test suite and project structure

[lp:~online-accounts/libaccounts-qt/packaging]

147. By Alberto Mardegan on 2015-11-06

Remove debug messages

Since this library is just a thin wrapper around libaccounts-glib, it
makes little sense to have debug messages in here: debugging can be
activated on libaccounts-glib, if needed.

Also, modernize test suite and project structure

=== added file '.qmake.conf'
--- .qmake.conf	1970-01-01 00:00:00 +0000
+++ .qmake.conf	2015-11-06 13:54:21 +0000
@@ -0,0 +1,2 @@
+TOP_SRC_DIR = $$PWD
+TOP_BUILD_DIR = $$shadowed($$PWD)

=== modified file 'Accounts/Accounts.pro'
--- Accounts/Accounts.pro	2014-03-14 08:21:02 +0000
+++ Accounts/Accounts.pro	2015-11-06 13:54:21 +0000
@@ -3,6 +3,7 @@
 include( ../common-vars.pri )
 
 TEMPLATE = lib
+TARGET = accounts-qt5
 
 # Input
 public_headers = \
@@ -42,13 +43,9 @@
 QT += core xml
 QT -= gui
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    TARGET = accounts-qt5
-    CMAKE_BASENAME = AccountsQt5
-} else {
-    TARGET = accounts-qt
-    CMAKE_BASENAME = AccountsQt
-}
+INCLUDEPATH += $${TOP_SRC_DIR}
+
+CMAKE_BASENAME = AccountsQt5
 
 PKGCONFIG += \
 	glib-2.0 \

=== modified file 'Accounts/AccountsQt5ConfigVersion.cmake.in'
--- Accounts/AccountsQt5ConfigVersion.cmake.in	2014-03-05 15:49:56 +0000
+++ Accounts/AccountsQt5ConfigVersion.cmake.in	2015-11-06 13:54:21 +0000
@@ -1,10 +1,10 @@
 set(PACKAGE_VERSION $${PROJECT_VERSION})
 
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+if(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+else(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
    set(PACKAGE_VERSION_COMPATIBLE TRUE)
-   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+   if( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\")
       set(PACKAGE_VERSION_EXACT TRUE)
-   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
\ No newline at end of file
+   endif( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\")
+endif(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )

=== removed file 'Accounts/AccountsQtConfig.cmake.in'
--- Accounts/AccountsQtConfig.cmake.in	2014-02-13 14:10:53 +0000
+++ Accounts/AccountsQtConfig.cmake.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
-#  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-
-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
\ No newline at end of file

=== removed file 'Accounts/AccountsQtConfigVersion.cmake.in'
--- Accounts/AccountsQtConfigVersion.cmake.in	2014-02-13 14:10:53 +0000
+++ Accounts/AccountsQtConfigVersion.cmake.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-set(PACKAGE_VERSION $${PROJECT_VERSION})
-
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-   set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-   set(PACKAGE_VERSION_COMPATIBLE TRUE)
-   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-      set(PACKAGE_VERSION_EXACT TRUE)
-   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
\ No newline at end of file

=== modified file 'Accounts/account-service.cpp'
--- Accounts/account-service.cpp	2015-09-30 08:17:50 +0000
+++ Accounts/account-service.cpp	2015-11-06 13:54:21 +0000
@@ -159,15 +159,11 @@
 void AccountServicePrivate::onEnabled(AccountService *accountService,
                                       gboolean isEnabled)
 {
-    TRACE();
-
     Q_EMIT accountService->enabled(isEnabled);
 }
 
 void AccountServicePrivate::onChanged(AccountService *accountService)
 {
-    TRACE();
-
     Q_EMIT accountService->changed();
 }
 

=== modified file 'Accounts/account.cpp'
--- Accounts/account.cpp	2015-09-30 08:17:50 +0000
+++ Accounts/account.cpp	2015-11-06 13:54:21 +0000
@@ -181,8 +181,6 @@
 
 void Account::Private::on_deleted(Account *self)
 {
-    TRACE();
-
     Q_EMIT self->removed();
 }
 
@@ -623,14 +621,11 @@
                                         GAsyncResult *res,
                                         Account *self)
 {
-    TRACE() << "Saved accunt ID:" << account->id;
-
     GError *error = NULL;
     ag_account_store_finish(account, res, &error);
     if (error) {
         if (error->domain == G_IO_ERROR &&
             error->code == G_IO_ERROR_CANCELLED) {
-            TRACE() << "Account destroyed, operation cancelled";
         } else {
             Q_EMIT self->error(Error(error));
         }

=== removed file 'Accounts/accounts-qt.pc.in'
--- Accounts/accounts-qt.pc.in	2013-01-18 10:49:27 +0000
+++ Accounts/accounts-qt.pc.in	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-prefix=$$INSTALL_PREFIX
-exec_prefix=${prefix}
-libdir=$$INSTALL_LIBDIR
-includedir=${prefix}/include/accounts-qt
-servicefilesdir=${prefix}/share/accounts/services
-servicetypefilesdir=${prefix}/share/accounts/service-types
-providerfilesdir=${prefix}/share/accounts/providers
-
-Name: libaccounts-qt
-Description: Accounts Library
-Version: $$PROJECT_VERSION
-Libs: -L${libdir} -laccounts-qt
-Requires: QtCore QtXml
-Cflags:  -I${includedir}
-

=== modified file 'Accounts/accountscommon.h'
--- Accounts/accountscommon.h	2015-05-22 12:04:52 +0000
+++ Accounts/accountscommon.h	2015-11-06 13:54:21 +0000
@@ -29,16 +29,8 @@
 
 #ifdef BUILDING_ACCOUNTS_QT
 
-// Debug macros
-
-#ifdef TRACE
-    #undef TRACE
-#endif
-
 #include <QDebug>
 
-#define TRACE() qDebug() << __FILE__ ":" << __LINE__ << __func__
-
 // String conversion
 
 #ifdef ASCII

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2014-03-14 08:21:02 +0000
+++ common-project-config.pri	2015-11-06 13:54:21 +0000
@@ -11,20 +11,15 @@
 UI_HEADERS_DIR  = ui/include
 UI_SOURCES_DIR  = ui/src
 
-TOP_SRC_DIR     = $$PWD
-TOP_BUILD_DIR   = $${TOP_SRC_DIR}/$${BUILD_DIR}
-QMAKE_LIBDIR   += $${TOP_BUILD_DIR}/Accounts
-INCLUDEPATH    += $${TOP_SRC_DIR}
+!defined(TOP_SRC_DIR, var) {
+    TOP_SRC_DIR = $$PWD
+    TOP_BUILD_DIR = $${TOP_SRC_DIR}/$(BUILD_DIR)
+}
 
 # we don't like warnings...
 #QMAKE_CXXFLAGS *= -Werror
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    # Qt5: use C++11. This is used to avoid the source incompatibility
-    # with the QSKIP macro, as described in:
-    # http://www.kdab.com/porting-from-qt-4-to-qt-5/
-    QMAKE_CXXFLAGS += -std=c++11
-}
+CONFIG += c++11
 
 #-----------------------------------------------------------------------------
 # setup the installation prefix
@@ -42,12 +37,7 @@
     message("==== install prefix set to `$${INSTALL_PREFIX}'")
 }
 
-ARCH = $$system(uname -m)
-contains( ARCH, x86_64 ) {
-    INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
-} else {
-    INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
-}
+INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
 
 # default library directory can be overriden by defining LIBDIR when
 # running qmake

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-02 09:12:29 +0000
+++ debian/changelog	2015-11-06 13:54:21 +0000
@@ -1,3 +1,11 @@
+libaccounts-qt (1.14+16.04.20151102-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge from upstream:
+    - Modernize the project structure
+    - Remove debug messages (LP: #1404267)
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 04 Nov 2015 10:17:23 +0300
+
 libaccounts-qt (1.14+16.04.20151102-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]

=== removed directory 'rpm'
=== removed file 'rpm/libaccounts-qt.changes'
--- rpm/libaccounts-qt.changes	2010-06-28 08:44:55 +0000
+++ rpm/libaccounts-qt.changes	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-* Min Jun 28 2010 Alberto Mardegan <[e-mail]> - 0.29
-- Add ServiceType class
-
-* Mon Jun 14 2010 Bernd Wachter <[e-mail]> - 0.28
-- Update to latest version
-
-* Wed Apr 21 2010 Bernd Wachter <[e-mail]> - 0.24+0m6-1
-- First RPM version

=== removed file 'rpm/libaccounts-qt.spec'
--- rpm/libaccounts-qt.spec	2010-06-28 08:44:55 +0000
+++ rpm/libaccounts-qt.spec	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-Name: libaccounts-qt
-Version: 0.29
-Release: 1%{?dist}
-Summary: Accounts framework
-Group: System Environment/Libraries
-License: LGPLv2.1
-URL: http://gitorious.org/accounts-sso/accounts-qt
-Source0: accounts-qt-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt-devel, doxygen, graphviz
-BuildRequires: libaccounts-glib-devel >= 0.42
-BuildRequires: glib2-devel
-BuildRequires: fdupes
-
-%description
-Framework to provide accounts
-
-%files
-%defattr(-,root,root,-)
-%doc README COPYING
-%{_libdir}/lib*.so.*
-%{_bindir}/account-tool
-
-
-%package devel
-Summary: Development files for accounts-qt
-Group: Development/Libraries
-Provides: accounts-qt-dev
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Headers and static libraries for the accounts.
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_includedir}/*
-%{_libdir}/pkgconfig/*
-%{_libdir}/qt4/*
-
-
-%package tests
-Summary: Tests for accounts-qt
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description tests
-Tests for accounts-qt.
-
-%files tests
-%defattr(-,root,root,-)
-%{_datadir}/%{name}-tests/*
-%{_bindir}/accountstest
-
-%package doc
-Summary: Documentation for accounts-qt
-Group: Documentation
-
-%description doc
-Doxygen-generated HTML documentation for the accounts.
-
-%files doc
-%defattr(-,root,root,-)
-%{_datadir}/doc/*
-
-
-%prep
-%setup -q -n accounts-qt-%{version}
-
-%build
-qmake \
-    QMF_INSTALL_ROOT=%{_prefix} \
-    CONFIG+=release \
-    accounts-qt.pro
-
-make %{?_smp_mflags}
-
-
-%install
-rm -Rf %{buildroot}
-make INSTALL_ROOT=%{buildroot} install
-rm %{buildroot}/%{_datadir}/doc/accounts-qt/html/installdox
-%fdupes %{buildroot}/%{_includedir}
-%fdupes %{buildroot}/%{_docdir}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%clean
-rm -Rf %{buildroot}

=== removed file 'tests/accountstest.cpp'
--- tests/accountstest.cpp	2014-08-14 14:50:11 +0000
+++ tests/accountstest.cpp	1970-01-01 00:00:00 +0000
@@ -1,1476 +0,0 @@
-/* vi: set et sw=4 ts=4 cino=t0,(0: */
-/*
- * This file is part of libaccounts-qt
- *
- * Copyright (C) 2009-2011 Nokia Corporation.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#include <QtTest/QtTest>
-#include <QSignalSpy>
-
-#include "Accounts/Application"
-#include "Accounts/Manager"
-#include "Accounts/AccountService"
-
-using namespace Accounts;
-#include "accountstest.h"
-
-#define PROVIDER QString("dummyprovider")
-#define SERVICE QString("dummyservice")
-#define MYSERVICE QLatin1String("MyService")
-#define OTHERSERVICE QLatin1String("OtherService")
-#define EMAIL_SERVICE_TYPE QLatin1String("e-mail")
-
-
-void clearDb()
-{
-    QDir dbroot(QString(getenv("ACCOUNTS")));
-    dbroot.remove(QString("accounts.db"));
-}
-
-void AccountsTest::initTestCase()
-{
-    //init
-    setenv ("ACCOUNTS", "/tmp/", false);
-    setenv ("AG_SERVICES", SERVICES_DIR, false);
-    setenv ("AG_SERVICE_TYPES", SERVICE_TYPES_DIR, false);
-    setenv ("AG_PROVIDERS", PROVIDERS_DIR, false);
-    //clear database
-    clearDb();
-}
-
-void AccountsTest::cleanupTestCase()
-{
-}
-
-
-/* manager */
-void AccountsTest::managerTestCase()
-{
-    Manager *mgr = new Manager();
-    QVERIFY(mgr != NULL);
-    QCOMPARE(mgr->serviceType(), QString());
-
-    mgr->setAbortOnTimeout(true);
-    QCOMPARE(mgr->abortOnTimeout(), true);
-
-    mgr->setTimeout(123);
-    QCOMPARE(mgr->timeout(), quint32(123));
-
-    QCOMPARE(mgr->options().testFlag(Manager::DisableNotifications), false);
-
-    delete mgr;
-
-    mgr = new Manager(Manager::DisableNotifications);
-    QCOMPARE(mgr->options().testFlag(Manager::DisableNotifications), true);
-    delete mgr;
-}
-
-void AccountsTest::createAccountTestCase()
-{
-    clearDb();
-
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account!=NULL);
-    QVERIFY(account->manager() == mgr);
-    delete account;
-
-    account = mgr->createAccount(PROVIDER);
-    QVERIFY(account!=NULL);
-    delete account;
-
-    delete mgr;
-}
-
-void AccountsTest::accountTestCase()
-{
-    clearDb();
-
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    //this should not exist
-    Account* account2 = mgr->account(1);
-    QVERIFY(account2==NULL);
-    Error error = mgr->lastError();
-    QCOMPARE(error.type(), Error::AccountNotFound);
-
-    // make sure there is account
-    Account* account = mgr->createAccount(NULL);
-    account->sync();
-
-    //now we get account
-    account2 = mgr->account(1);
-    QVERIFY(account2!=NULL);
-
-    delete account2;
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::objectsLifetimeTestCase()
-{
-    clearDb();
-
-    Manager *manager = new Manager();
-
-    // this should not exist
-    Account *account = Account::fromId(manager, 1);
-    QVERIFY(account == 0);
-    Error error = manager->lastError();
-    QCOMPARE(error.type(), Error::AccountNotFound);
-
-    // create an account
-    account = new Account(manager, PROVIDER);
-    account->setDisplayName("hi!");
-    account->syncAndBlock();
-    AccountId accountId = account->id();
-    delete account;
-
-    // Now load it, in two different ways
-    QPointer<Account> sharedAccount = manager->account(accountId);
-    QVERIFY(sharedAccount != 0);
-    QCOMPARE(sharedAccount->displayName(), QString("hi!"));
-
-    QPointer<Account> ownedAccount = Account::fromId(manager, accountId);
-    QVERIFY(ownedAccount != 0);
-    QCOMPARE(ownedAccount->displayName(), QString("hi!"));
-
-    /* Load it once more from the shared interface, and see that we get the
-     * same object */
-    QCOMPARE(manager->account(accountId), sharedAccount.data());
-
-    /* Delete the manager; the owned account should survive, the shared
-     * shouldn't */
-    delete manager;
-    QVERIFY(sharedAccount == 0);
-    QVERIFY(ownedAccount != 0);
-    QVERIFY(ownedAccount->manager() == 0);
-
-    delete ownedAccount;
-}
-
-void AccountsTest::accountListTestCase()
-{
-    clearDb();
-
-    Manager *mgr = new Manager();
-    QVERIFY(mgr != NULL);
-
-    // make sure there is account
-    Account *account = mgr->createAccount(NULL);
-    account->sync();
-
-    AccountIdList list = mgr->accountList(NULL);
-    QVERIFY(!list.isEmpty());
-    QCOMPARE(list.size(), 1);
-
-    list = mgr->accountList("e-mail");
-    QVERIFY(list.isEmpty());
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::providerTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Account *account = mgr->createAccount(PROVIDER);
-    QVERIFY(account!=NULL);
-
-    QString provider_name = account->providerName();
-    QCOMPARE(provider_name, PROVIDER);
-
-    delete account;
-
-    /* Test invalid provider */
-    Provider invalid;
-    QVERIFY(!invalid.isValid());
-
-    /* Check listing and loading of XML files */
-    Provider provider = mgr->provider("MyProvider");
-    QVERIFY(provider.isValid());
-
-    QCOMPARE(provider.displayName(), QString("My Provider"));
-    QCOMPARE(provider.iconName(), QString("general_myprovider"));
-    QCOMPARE(provider.description(), QString("fast & furious"));
-    QCOMPARE(provider.trCatalog(), QString("accounts"));
-    QCOMPARE(provider.pluginName(), QString("generic-oauth"));
-    QCOMPARE(provider.domainsRegExp(), QString(".*example.net"));
-    QCOMPARE(provider.isSingleAccount(), true);
-
-    QDomDocument dom = provider.domDocument();
-    QDomElement root = dom.documentElement();
-    QCOMPARE(root.tagName(), QString("provider"));
-
-    /* Test copy constructor */
-    Provider copy(provider);
-    QCOMPARE(copy.displayName(), QString("My Provider"));
-
-    /* Test assignment */
-    copy = provider;
-    QCOMPARE(copy.displayName(), QString("My Provider"));
-    copy = invalid;
-    QVERIFY(!copy.isValid());
-    copy = provider;
-    QCOMPARE(copy.displayName(), QString("My Provider"));
-
-    ProviderList providers = mgr->providerList();
-    QVERIFY(!providers.isEmpty());
-    QVERIFY(providers.size() == 1);
-    QCOMPARE(providers[0].displayName(), QString("My Provider"));
-
-    delete mgr;
-}
-
-void AccountsTest::serviceTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-    QCOMPARE(service.name(), MYSERVICE);
-    QCOMPARE(service.iconName(), QString("general_myservice"));
-    QCOMPARE(service.trCatalog(), QString("accounts"));
-    QStringList tags;
-    tags << "email" << "e-mail";
-    QCOMPARE(service.tags(), tags.toSet());
-    // Called twice, because the second time it returns a cached result
-    QCOMPARE(service.tags(), tags.toSet());
-    QVERIFY(service.hasTag("email"));
-    QVERIFY(!service.hasTag("chat"));
-
-    service = mgr->service(SERVICE);
-    QVERIFY(!service.isValid());
-
-    delete mgr;
-}
-
-void AccountsTest::serviceListTestCase()
-{
-    Manager *mgr = new Manager();
-    QVERIFY(mgr != NULL);
-
-    ServiceList list = mgr->serviceList();
-    QVERIFY(!list.isEmpty());
-    QCOMPARE(list.count(), 2);
-
-    list = mgr->serviceList("e-mail");
-    QCOMPARE(list.count(), 1);
-
-    list = mgr->serviceList("sharing");
-    QCOMPARE(list.count(), 1);
-
-    delete mgr;
-}
-
-/* service */
-
-void AccountsTest::serviceConstTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-    QCOMPARE(service.name(), MYSERVICE);
-    QCOMPARE(service.displayName(), QString("My Service"));
-    QCOMPARE(service.serviceType(), QString("e-mail"));
-    QCOMPARE(service.provider(), QString("MyProvider"));
-    QVERIFY(service.hasTag(QString("email")));
-
-    delete mgr;
-}
-
-
-/* account */
-
-
-void AccountsTest::accountConstTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Account *account = mgr->createAccount(PROVIDER);
-    QVERIFY(account!=NULL);
-    QVERIFY(account->isWritable());
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::accountProviderTestCase()
-{
-    Manager *manager = new Manager();
-    QVERIFY(manager != 0);
-
-    Account *account = manager->createAccount("MyProvider");
-    QVERIFY(account != 0);
-
-    QCOMPARE(account->providerName(), QString("MyProvider"));
-
-    Provider provider = account->provider();
-    QCOMPARE(provider.name(), QString("MyProvider"));
-
-    delete account;
-    delete manager;
-}
-
-void AccountsTest::accountServiceTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Account *account = mgr->createAccount("MyProvider");
-    QVERIFY(account!=NULL);
-
-    QVERIFY(!account->supportsService(QString("unsupported")));
-    QVERIFY(account->supportsService(QString("e-mail")));
-
-    ServiceList list = account->services();
-    QVERIFY(!list.isEmpty());
-    QCOMPARE(list.count(), 1);
-
-    list = account->services("e-mail");
-    QCOMPARE(list.count(), 1);
-
-    list = account->services("unsupported");
-    QVERIFY(list.isEmpty());
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-
-    /* Test default settings */
-    account->selectService(service);
-    QCOMPARE(account->value("parameters/server").toString(),
-             QString("talk.google.com"));
-    QCOMPARE(account->valueAsInt("parameters/port"), 5223);
-    SettingSource source;
-    QCOMPARE(account->valueAsInt("parameters/port", 0, &source), 5223);
-    QCOMPARE(source, TEMPLATE);
-
-    delete account;
-    delete mgr;
-}
-
-
-void AccountsTest::enabled(const QString & /*serviceName*/, bool enabled)
-{
-    m_enabled = enabled;
-}
-
-
-void AccountsTest::accountEnabledTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Account *account = mgr->createAccount(PROVIDER);
-    QVERIFY(account!=NULL);
-    m_enabled=false;
-    QObject::connect(account, SIGNAL(enabledChanged(const QString&,bool)),
-                      this,  SLOT(enabled(const QString&,bool)));
-
-    account->setEnabled(true);
-    account->sync();
-    QVERIFY(account->enabled());
-    QVERIFY(m_enabled);
-    account->setEnabled(false);
-    account->sync();
-    QVERIFY(!account->enabled());
-    QVERIFY(!m_enabled);
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::display(const QString &displayName)
-{
-    m_enabled = !displayName.isNull();
-}
-
-void AccountsTest::accountDisplayNameTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Account *account = mgr->createAccount(PROVIDER);
-    QVERIFY(account!=NULL);
-    m_enabled=false;
-    QObject::connect(account, SIGNAL(displayNameChanged(const QString&)),
-                      this,  SLOT(display(const QString&)));
-
-    account->setDisplayName(PROVIDER);
-    account->sync();
-    QCOMPARE(account->displayName(),PROVIDER);
-    QVERIFY(m_enabled);
-
-    delete account;
-    delete mgr;
-}
-
-
-
-void AccountsTest::accountValueTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Account *account = mgr->createAccount(PROVIDER);
-    QVERIFY(account!=NULL);
-
-    QObject::connect(account, SIGNAL(synced()),
-                      this,  SLOT(stored()));
-    m_stored = false;
-    account->setValue(QString("test"),QString("value"));
-    int int_value = 666;
-    account->setValue("testint", int_value);
-    QStringList names;
-    names << "Tom" << "Dick" << "Harry";
-    account->setValue("names", names);
-    account->setValue("big distance", quint64(3));
-    account->setValue("big difference", qint64(-300));
-    account->setValue("boolean", false);
-    account->sync();
-
-    QTest::qWait(10);
-    QVERIFY(m_stored);
-
-    /* check that the values we wrote are retrieved successfully */
-    QVariant val = QVariant::String;
-    account->value(QString("test"), val);
-    QCOMPARE(val.toString(), QString("value"));
-
-    SettingSource source;
-    source = account->value(QString("test"), val);
-    QCOMPARE(val.toString(), QString("value"));
-
-    QVariant intval = QVariant::Int;
-    account->value("testint", intval);
-    qDebug("Val: %d", intval.toInt());
-    QVERIFY(intval.toInt() == int_value);
-
-    QVERIFY(source == ACCOUNT);
-
-    QCOMPARE(account->value("names").toStringList(), names);
-    QCOMPARE(account->value("big distance").toULongLong(), quint64(3));
-    QCOMPARE(account->value("big difference").toLongLong(), qint64(-300));
-
-    /* test the convenience methods */
-    QString strval = account->valueAsString("test");
-    QCOMPARE (strval, QString("value"));
-    QCOMPARE(account->valueAsString("test", "Hi", &source), QString("value"));
-    QCOMPARE(source, ACCOUNT);
-
-    QCOMPARE(account->valueAsBool("boolean"), false);
-    QCOMPARE(account->valueAsBool("boolean", true, &source), false);
-    QCOMPARE(source, ACCOUNT);
-
-    QCOMPARE(account->valueAsUInt64("big distance"), quint64(3));
-    QCOMPARE(account->valueAsUInt64("big distance", 10, &source), quint64(3));
-    QCOMPARE(source, ACCOUNT);
-
-    strval = account->valueAsString("test_unexisting", "hello");
-    QCOMPARE (strval, QString("hello"));
-
-    delete account;
-    delete mgr;
-}
-
-
-void AccountsTest::stored()
-{
-    qDebug("%s %d %s:\t", __FILE__, __LINE__, __func__);
-    TRACE();
-    m_stored = true;
-}
-
-void AccountsTest::error(Accounts::Error error)
-{
-    qDebug("%s %d %s:\t", __FILE__, __LINE__, __func__);
-    TRACE() << "error:" << error.type();
-    m_stored = false;
-}
-
-
-void AccountsTest::accountSyncTestCase()
-{
-    Manager * mgr=new Manager();
-    QVERIFY(mgr!=NULL);
-
-    Account *account = mgr->createAccount(PROVIDER);
-    QVERIFY(account!=NULL);
-
-    QString provider = account->providerName();
-    QCOMPARE(provider, PROVIDER);
-
-    m_stored = false;
-    QObject::connect(account, SIGNAL(synced()),
-                      this,  SLOT(stored()));
-
-    account->sync();
-    QTest::qWait(10);
-    QVERIFY(m_stored);
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::created(Accounts::AccountId id)
-{
-    m_created = id;
-}
-
-void AccountsTest::createdTestCase()
-{
-    Manager *mgr = new Manager();
-    QVERIFY(mgr != NULL);
-
-    m_created = 0;
-    QObject::connect(mgr, SIGNAL(accountCreated(Accounts::AccountId)),
-                     this, SLOT(created(Accounts::AccountId)));
-
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-
-    /* store the account: this will emit accountCreated */
-    account->sync();
-    QVERIFY(m_created != 0);
-    QVERIFY(m_created == account->id());
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::removed()
-{
-    m_removed = true;
-}
-
-void AccountsTest::removeTestCase()
-{
-    Manager *mgr = new Manager();
-    QVERIFY(mgr != NULL);
-
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-
-    /* store the account */
-    account->sync();
-    QVERIFY(account->id() != 0);
-
-    m_removed = false;
-    QObject::connect(account, SIGNAL(removed()), this, SLOT(removed()));
-
-    /* mark the account for deletion -- and make sure it's not deleted
-     * immediately */
-    account->remove ();
-    QVERIFY(m_removed == false);
-
-    /* store the changes */
-    account->sync();
-    QVERIFY(m_removed == true);
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::w_server_notify(const char *key)
-{
-    qDebug() << __func__ << ", key = " << key;
-    m_server_notify++;
-}
-
-void AccountsTest::w_port_notify(const char *key)
-{
-    qDebug() << __func__ << ", key = " << key;
-    m_port_notify++;
-}
-
-void AccountsTest::w_parameters_notify(const char *key)
-{
-    qDebug() << __func__ << ", key = " << key;
-    m_parameters_notify++;
-}
-
-void AccountsTest::onAccountServiceEnabled(bool enabled)
-{
-    qDebug() << Q_FUNC_INFO;
-    m_accountServiceEnabledValue = enabled;
-}
-
-void AccountsTest::onAccountServiceChanged()
-{
-    qDebug() << Q_FUNC_INFO;
-    AccountService *accountService = qobject_cast<AccountService*>(sender());
-    m_accountServiceChangedFields = accountService->changedFields();
-}
-
-void AccountsTest::accountServiceTest()
-{
-    Manager *mgr = new Manager();
-    QVERIFY (mgr != NULL);
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-
-    QObject *parent = new QObject();
-    QPointer<AccountService> shortLivedAccountService =
-        new AccountService(account, service, parent);
-    QVERIFY(shortLivedAccountService != 0);
-    delete parent;
-    QVERIFY(shortLivedAccountService == 0);
-
-    AccountService *accountService = new AccountService(account, service);
-    QVERIFY(accountService != NULL);
-
-    QCOMPARE(accountService->account(), account);
-    QCOMPARE(accountService->account()->providerName(),
-             account->providerName());
-    Service copy = accountService->service();
-    QVERIFY(copy.isValid());
-    QCOMPARE(copy.name(), service.name());
-
-    QObject::connect(accountService, SIGNAL(changed()),
-                     this, SLOT(onAccountServiceChanged()));
-    QObject::connect(accountService, SIGNAL(enabled(bool)),
-                     this, SLOT(onAccountServiceEnabled(bool)));
-    QSignalSpy spyChanged(accountService, SIGNAL(changed()));
-    QSignalSpy spyEnabled(accountService, SIGNAL(enabled(bool)));
-
-    accountService->beginGroup("parameters");
-    QVERIFY(accountService->group() == "parameters");
-
-    /* test values from the template */
-    QCOMPARE(accountService->value("server").toString(),
-             UTF8("talk.google.com"));
-    QCOMPARE(accountService->value("port").toInt(), 5223);
-    QCOMPARE(accountService->value("old-ssl").toBool(), true);
-
-    /* now, change some values */
-    accountService->setValue("server", QString("www.example.com"));
-    account->selectService();
-    account->setEnabled(true);
-    account->selectService(service);
-    account->setEnabled(true);
-
-    /* write the data */
-    account->sync();
-
-    /* ensure that the callbacks have been called the correct number of times */
-    QCOMPARE(spyChanged.count(), 1);
-    spyChanged.clear();
-    spyEnabled.clear();
-
-    QStringList expectedChanges;
-    expectedChanges << "parameters/server";
-    expectedChanges << "enabled";
-    QCOMPARE(m_accountServiceChangedFields.toSet(), expectedChanges.toSet());
-
-    QCOMPARE(accountService->value("server").toString(),
-             UTF8("www.example.com"));
-    QCOMPARE(accountService->enabled(), true);
-
-    /* check the enabled status */
-    account->selectService();
-    account->setEnabled(false);
-    account->sync();
-    QCOMPARE(spyChanged.count(), 0);
-    QCOMPARE(spyEnabled.count(), 1);
-    QCOMPARE(accountService->enabled(), false);
-    QCOMPARE(m_accountServiceEnabledValue, accountService->enabled());
-    spyEnabled.clear();
-
-    /* enable the account, but disable the service */
-    account->selectService();
-    account->setEnabled(true);
-    account->selectService(service);
-    account->setEnabled(false);
-    account->sync();
-    QCOMPARE(spyEnabled.count(), 0);
-    QCOMPARE(accountService->enabled(), false);
-
-    /* re-enable the service */
-    account->selectService(service);
-    account->setEnabled(true);
-    account->sync();
-    QCOMPARE(spyEnabled.count(), 1);
-    QCOMPARE(accountService->enabled(), true);
-    QCOMPARE(m_accountServiceEnabledValue, accountService->enabled());
-    spyEnabled.clear();
-    spyChanged.clear();
-
-
-    /* test some more APIs */
-    QStringList expectedList;
-    expectedList << "server" << "fallback-conference-server" <<
-        "port" << "old-ssl";
-    QCOMPARE(accountService->childKeys().toSet(), expectedList.toSet());
-    QCOMPARE(accountService->childGroups().toSet(), QSet<QString>());
-    QCOMPARE(accountService->contains("port"), true);
-    accountService->endGroup();
-
-    expectedList.clear();
-    expectedList << "parameters";
-    QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet());
-
-    /* Remove one key */
-    accountService->remove("parameters/port");
-    account->sync();
-    QCOMPARE(spyChanged.count(), 1);
-    QCOMPARE(m_accountServiceChangedFields, QStringList("parameters/port"));
-    spyChanged.clear();
-
-    /* remove all keys */
-    accountService->clear();
-    account->sync();
-    QCOMPARE(spyChanged.count(), 1);
-    QVERIFY(m_accountServiceChangedFields.contains("parameters/server"));
-    QVERIFY(m_accountServiceChangedFields.contains("parameters/old-ssl"));
-    spyChanged.clear();
-
-    delete accountService;
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::watchesTest()
-{
-    Manager *mgr = new Manager();
-    QVERIFY (mgr != NULL);
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-
-    /* create an account and some watches */
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-
-    account->selectService(service);
-
-    Watch *w_server = account->watchKey("parameters/server");
-    QObject::connect(w_server, SIGNAL(notify(const char *)),
-                     this, SLOT(w_server_notify(const char *)));
-
-    /* test also beginGroup() */
-    account->beginGroup("parameters");
-    QVERIFY(account->group() == "parameters");
-
-    Watch *w_parameters = account->watchKey(); /* watch the whole group */
-    QObject::connect(w_parameters, SIGNAL(notify(const char *)),
-                     this, SLOT(w_parameters_notify(const char *)));
-
-    Watch *w_port = account->watchKey("port");
-    QObject::connect(w_port, SIGNAL(notify(const char *)),
-                     this, SLOT(w_port_notify(const char *)));
-
-    /* now, change some values */
-    account->setValue("server", QString("xxx.nokia.com"));
-
-    /* reset the counters */
-    m_server_notify = 0;
-    m_port_notify = 0;
-    m_parameters_notify = 0;
-
-    /* write the data */
-    account->sync();
-
-    /* ensure that the callbacks have been called the correct number of times */
-    QVERIFY(m_server_notify == 1);
-    QVERIFY(m_parameters_notify == 1);
-    QVERIFY(m_port_notify == 0);
-
-    /* now change the port and another parameter not being watched */
-    account->setValue("port", 45);
-    account->endGroup(); /* exit from the "parameters/" prefix */
-    account->setValue("username", QString("[e-mail]"));
-
-    /* reset the counters */
-    m_server_notify = 0;
-    m_port_notify = 0;
-    m_parameters_notify = 0;
-
-    /* write the data */
-    account->sync();
-
-    /* ensure that the callbacks have been called the correct number of times */
-    QVERIFY(m_server_notify == 0);
-    QVERIFY(m_parameters_notify == 1);
-    QVERIFY(m_port_notify == 1);
-
-    /* change port and server, but delete the w_port watch */
-    delete w_port;
-
-    account->beginGroup("parameters");
-    account->setValue("port", 56);
-    account->setValue("server", QString("warez.nokia.com"));
-
-    /* reset the counters */
-    m_server_notify = 0;
-    m_port_notify = 0;
-    m_parameters_notify = 0;
-
-    /* write the data */
-    account->sync();
-
-    /* ensure that the callbacks have been called the correct number of times */
-    QVERIFY(m_server_notify == 1);
-    QVERIFY(m_parameters_notify == 1);
-    QVERIFY(m_port_notify == 0);
-
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::serviceDataTest()
-{
-    Manager *mgr = new Manager();
-    QVERIFY (mgr != NULL);
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-
-    QDomDocument doc = service.domDocument();
-    QVERIFY(!doc.isNull());
-
-    delete mgr;
-}
-
-void AccountsTest::settingsTest()
-{
-    Manager *mgr = new Manager();
-    QVERIFY (mgr != NULL);
-
-    /* create an account and some watches */
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-
-    /* create a few keys/groups */
-    account->setValue("username", QString("fool"));
-    account->setValue("email", QString("[e-mail]"));
-
-    account->beginGroup("parameters");
-    account->setValue("server", QString("xxx.nokia.com"));
-    account->setValue("port", 80);
-
-    account->beginGroup("proxy"); /* this is a subgroup of "parameters" */
-    account->setValue("use", true);
-    account->setValue("address", QString("proxy.nokia.com"));
-    QCOMPARE(account->group(), QString("parameters/proxy"));
-    account->endGroup();
-
-    QCOMPARE(account->group(), QString("parameters"));
-    account->endGroup();
-
-    /* write another top-level key */
-    account->setValue("verified", false);
-
-    /* re-enter a group */
-    account->beginGroup("preferences");
-    account->setValue("maximized", true);
-    account->setValue("initial_directory", QString("xxx"));
-    QCOMPARE(account->group(), QString("preferences"));
-    account->endGroup();
-
-    /* write the data */
-    account->sync();
-
-    /* now check if the groups and keys are layed out as expected */
-    QStringList expected;
-    QStringList result;
-
-    /* check allKeys() */
-    expected << "username" << "email" << "verified" <<
-        "parameters/server" << "parameters/port" <<
-        "parameters/proxy/use" << "parameters/proxy/address" <<
-        "preferences/maximized" << "preferences/initial_directory";
-    result = account->allKeys();
-
-    expected.sort();
-    result.sort();
-    QCOMPARE(result, expected);
-
-    /* check childGroups() */
-    expected.clear();
-    expected << "parameters" << "preferences";
-    result = account->childGroups();
-
-    expected.sort();
-    result.sort();
-    QCOMPARE(result, expected);
-
-    /* check childKeys() */
-    expected.clear();
-    expected << "username" << "email" << "verified";
-    result = account->childKeys();
-
-    expected.sort();
-    result.sort();
-    QCOMPARE(result, expected);
-
-
-    /* now enter a group and test the same methods as above */
-    account->beginGroup("parameters");
-
-    /* allKeys */
-    expected.clear();
-    expected << "server" << "port" << "proxy/use" << "proxy/address";
-    result = account->allKeys();
-
-    expected.sort();
-    result.sort();
-    QCOMPARE(result, expected);
-
-    /* childGroups */
-    expected.clear();
-    expected << "proxy";
-    result = account->childGroups();
-
-    expected.sort();
-    result.sort();
-    QCOMPARE(result, expected);
-
-    /* childKeys() */
-    expected.clear();
-    expected << "server" << "port";
-    result = account->childKeys();
-
-    expected.sort();
-    result.sort();
-    QCOMPARE(result, expected);
-
-    /* contains() */
-    QVERIFY(account->contains("server") == true);
-    QVERIFY(account->contains("unexisting") == false);
-
-    /* test remove() */
-    account->remove(""); /* remove all the parameters/ group */
-    account->endGroup();
-    account->remove("verified");
-
-    /* we need to sync, for the changes to take effect */
-    account->sync();
-
-    expected.clear();
-    expected << "username" << "email" <<
-        "preferences/maximized" << "preferences/initial_directory";
-    result = account->allKeys();
-
-    expected.sort();
-    result.sort();
-    QCOMPARE(result, expected);
-
-    /* Test clear(): call it from inside the preferences/ group */
-    account->beginGroup("preferences");
-    account->clear();
-    account->sync();
-
-    expected.clear(); /* all keys should have been deleted */
-    result = account->allKeys();
-
-    expected.sort();
-    result.sort();
-    QCOMPARE(result, expected);
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::keySignVerifyTest()
-{
-#ifndef HAVE_AEGISCRYPTO
-    QSKIP("aegis-crypto not detected.", SkipSingle);
-#endif
-
-    const QString key = "key";
-    const char *token;
-    QList<const char*> listOfTokens;
-    listOfTokens << "libaccounts-glib0::accounts-glib-access"
-                 << "libaccounts-glib0::dummy"
-                 << "libaccounts-glib0::idiotic";
-    bool ok;
-
-    Manager *mgr = new Manager();
-    QVERIFY (mgr != NULL);
-
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-
-    account->setValue(key, QString("the key value"));
-    account->syncAndBlock();
-
-    account->sign(key, listOfTokens.at(0));
-    account->syncAndBlock();
-
-    ok = account->verify(key, &token);
-    QVERIFY(ok == true);
-
-    ok = account->verifyWithTokens(key, listOfTokens);
-    QVERIFY(ok == true);
-
-    delete mgr;
-}
-
-void AccountsTest::incrementalAccountIdsTest()
-{
-    clearDb();
-
-    Manager * mgr = new Manager;
-    QVERIFY(mgr != NULL);
-
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-    QVERIFY(account->manager() == mgr);
-    account->syncAndBlock();
-    AccountId lastId = account->id();
-
-    account->remove();
-    account->syncAndBlock();
-    delete account;
-
-    account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-    QVERIFY(account->manager() == mgr);
-    account->syncAndBlock();
-
-    QCOMPARE(account->id(), lastId + 1);
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::selectGlobalAccountSettingsTest()
-{
-    Manager *mgr = new Manager;
-    QVERIFY(mgr != NULL);
-
-    Account *account = mgr->createAccount("MyProvider");
-    QVERIFY(account != NULL);
-    QVERIFY(account->manager() == mgr);
-
-    account->syncAndBlock();
-    QVERIFY(account->id() > 0);
-
-    account->selectService();
-    Service selectedService = account->selectedService();
-    QVERIFY(!selectedService.isValid());
-
-    delete mgr;
-}
-
-void AccountsTest::credentialsIdTest()
-{
-    Manager *mgr = new Manager;
-    QVERIFY(mgr != NULL);
-
-    Account *account = mgr->createAccount("MyProvider");
-    QVERIFY(account != NULL);
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-
-    uint globalId = 69, myServiceId = 0xDEAD;
-
-    account->setCredentialsId(globalId);
-
-    account->selectService(service);
-    account->setCredentialsId(myServiceId);
-
-    account->syncAndBlock();
-    QVERIFY(account->id() != 0);
-
-    QCOMPARE(account->credentialsId(), myServiceId);
-
-    /* select a service with no credentials: we should get the global
-     * credentials ID, but the selected service shouldn't change */
-    service = mgr->service(OTHERSERVICE);
-    QVERIFY(service.isValid());
-
-    account->selectService(service);
-    QCOMPARE(account->credentialsId(), globalId);
-    QCOMPARE(account->selectedService(), service);
-
-    /* now make sure that we can get the ID from the global accounts settings */
-    account->selectService();
-    QCOMPARE(account->credentialsId(), globalId);
-
-    delete mgr;
-}
-
-void AccountsTest::authDataTest()
-{
-    Manager *manager = new Manager;
-    QVERIFY(manager != NULL);
-
-    Account *account = manager->createAccount("MyProvider");
-    QVERIFY(account != NULL);
-
-    Service service = manager->service(MYSERVICE);
-    QVERIFY(service.isValid());
-
-    const uint credentialsId = 69;
-    const QString method = "mymethod";
-    const QString mechanism = "mymechanism";
-    QString prefix =
-        QString::fromLatin1("auth/%1/%2/").arg(method).arg(mechanism);
-
-    QVariantMap globalParameters;
-    globalParameters["server"] = UTF8("myserver.com");
-    globalParameters["port"] = 8080;
-    globalParameters["other"] = UTF8("overriden parameter");
-    globalParameters["scopes"] = QStringList() << "read" << "write" << "edit";
-
-    QVariantMap serviceParameters;
-    serviceParameters["other"] = UTF8("better parameter");
-    serviceParameters["boolean"] = true;
-
-    account->setCredentialsId(credentialsId);
-    account->setValue("auth/method", method);
-    account->setValue("auth/mechanism", UTF8("overriden mechanism"));
-    QMapIterator<QString,QVariant> i(globalParameters);
-    while (i.hasNext()) {
-        i.next();
-        account->setValue(prefix + i.key(), i.value());
-    }
-
-    account->selectService(service);
-    account->setValue("auth/mechanism", mechanism);
-    i = QMapIterator<QString,QVariant>(serviceParameters);
-    while (i.hasNext()) {
-        i.next();
-        account->setValue(prefix + i.key(), i.value());
-    }
-
-    account->syncAndBlock();
-    QVERIFY(account->id() != 0);
-
-    AccountService *accountService = new AccountService(account, service);
-    QVERIFY(accountService != 0);
-
-    AuthData authData = accountService->authData();
-    QCOMPARE(authData.method(), method);
-    QCOMPARE(authData.mechanism(), mechanism);
-    QCOMPARE(authData.credentialsId(), credentialsId);
-
-    QVariantMap expectedParameters = globalParameters;
-    i = QMapIterator<QString,QVariant>(serviceParameters);
-    while (i.hasNext()) {
-        i.next();
-        expectedParameters.insert(i.key(), i.value());
-    }
-
-    QCOMPARE(authData.parameters(), expectedParameters);
-
-    /* Test copy constructor */
-    AuthData copy(authData);
-    QCOMPARE(copy.parameters(), expectedParameters);
-
-    /* And delete destructor */
-    AuthData *copy2 = new AuthData(authData);
-    QCOMPARE(copy2->parameters(), expectedParameters);
-    delete copy2;
-
-    delete accountService;
-    delete account;
-    delete manager;
-    QVERIFY(service.isValid());
-}
-
-void AccountsTest::globalAuthDataTest()
-{
-    Manager *manager = new Manager;
-    QVERIFY(manager != NULL);
-
-    Account *account = manager->createAccount("MyProvider");
-    QVERIFY(account != NULL);
-
-    Service service; // global account
-    QVERIFY(!service.isValid());
-
-    AccountService *accountService = new AccountService(account, service);
-    QVERIFY(accountService != 0);
-
-    AuthData authData = accountService->authData();
-    QCOMPARE(authData.method(), QString("oauth2"));
-    QCOMPARE(authData.mechanism(), QString("user_agent"));
-    QCOMPARE(authData.credentialsId(), uint(0));
-
-    QVariantMap expectedParameters;
-    expectedParameters.insert("Host", QString("myserver.example"));
-
-    QCOMPARE(authData.parameters(), expectedParameters);
-
-    delete accountService;
-    delete account;
-    delete manager;
-}
-
-void AccountsTest::listEnabledServices()
-{
-    clearDb();
-
-    Manager *mgr = new Manager();
-    QVERIFY(mgr != NULL);
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-
-    Account* account = mgr->createAccount("MyProvider");
-    QVERIFY(account != NULL);
-    account->selectService(service);
-    account->setEnabled(true);
-    account->sync();
-
-    ServiceList list = account->enabledServices();
-    QVERIFY(!list.isEmpty());
-    QCOMPARE(list.size(), 1);
-
-    account->selectService(service);
-    account->setEnabled(false);
-    account->sync();
-
-    list = account->enabledServices();
-    QVERIFY(list.isEmpty());
-
-    delete account;
-    delete mgr;
-}
-
-
-void AccountsTest::listEnabledByServiceType()
-{
-    clearDb();
-
-    Manager *mgr = new Manager("e-mail");
-    QVERIFY(mgr != NULL);
-    QCOMPARE(mgr->serviceType(), QString("e-mail"));
-
-    Account *account = mgr->createAccount("MyProvider");
-    QVERIFY(account != NULL);
-    account->setEnabled(true);
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-    account->selectService(service);
-    account->setEnabled(true);
-    account->sync();
-
-    AccountIdList list = mgr->accountListEnabled("e-mail");
-    QVERIFY(!list.isEmpty());
-    QCOMPARE(list.size(), 1);
-
-    list = mgr->accountListEnabled();
-    QCOMPARE(list.count(), 1);
-
-    account->setEnabled(false);
-    account->sync();
-
-    list = mgr->accountListEnabled("e-mail");
-    QVERIFY(list.isEmpty());
-
-    delete account;
-    delete mgr;
-}
-
-void AccountsTest::enabledEvent(Accounts::AccountId id)
-{
-    m_enabledEvent = id;
-}
-
-void AccountsTest::enabledEvent()
-{
-    Manager *mgr = new Manager("e-mail");
-    QVERIFY(mgr != NULL);
-
-    m_enabledEvent = 0;
-    QObject::connect(mgr, SIGNAL(enabledEvent(Accounts::AccountId)),
-                     this, SLOT(enabledEvent(Accounts::AccountId)));
-
-    Account *account = mgr->createAccount(NULL);
-    QVERIFY(account != NULL);
-    account->setEnabled(true);
-    account->sync();
-
-    QVERIFY(m_enabledEvent != 0);
-    QVERIFY(m_enabledEvent == account->id());
-
-    //if we create manager without service type the signal shoudl not be emitted
-    Manager *mgr2 = new Manager();
-    QVERIFY(mgr2 != NULL);
-
-    m_enabledEvent = 0;
-    QObject::connect(mgr2, SIGNAL(enabledEvent(Accounts::AccountId)),
-                     this, SLOT(enabledEvent(Accounts::AccountId)));
-
-    Account *account2 = mgr2->createAccount(NULL);
-    QVERIFY(account2 != NULL);
-    account2->setEnabled(true);
-    account2->sync();
-
-    QVERIFY(m_enabledEvent == 0);
-    QVERIFY(m_enabledEvent != account2->id());
-
-    delete account;
-    delete account2;
-    delete mgr;
-    delete mgr2;
-}
-
-void AccountsTest::serviceTypeTestCase()
-{
-    Manager *mgr = new Manager();
-    QVERIFY(mgr != NULL);
-
-    ServiceType serviceType;
-
-    serviceType = mgr->serviceType("unexisting-type");
-    QVERIFY(!serviceType.isValid());
-
-    serviceType = mgr->serviceType(EMAIL_SERVICE_TYPE);
-    QVERIFY(serviceType.isValid());
-
-    QCOMPARE(serviceType.name(), EMAIL_SERVICE_TYPE);
-    QCOMPARE(serviceType.displayName(), QLatin1String("Electronic mail"));
-    QCOMPARE(serviceType.trCatalog(), QLatin1String("translation_file"));
-    QCOMPARE(serviceType.iconName(), QLatin1String("email_icon"));
-    QVERIFY(serviceType.tags().contains(QString("email")));
-    // called twice, because the second time it returns a cached result
-    QVERIFY(serviceType.tags().contains(QString("email")));
-    QVERIFY(serviceType.hasTag(QString("email")));
-    QVERIFY(!serviceType.hasTag(QString("fake-email")));
-
-    QDomDocument dom = serviceType.domDocument();
-    QDomElement root = dom.documentElement();
-    QCOMPARE(root.tagName(), QString("service-type"));
-
-    ServiceType copy(serviceType);
-    QCOMPARE(copy.displayName(), QLatin1String("Electronic mail"));
-
-    delete mgr;
-}
-
-void AccountsTest::updateAccountTestCase()
-{
-    clearDb();
-
-    Manager *mgr = new Manager("e-mail");
-    QVERIFY(mgr != NULL);
-
-    m_updateEvent = 0;
-    QObject::connect(mgr, SIGNAL(accountUpdated(Accounts::AccountId)),
-                     this, SLOT(updateAccount(Accounts::AccountId)));
-
-    Account *account = mgr->createAccount("MyProvider");
-    QVERIFY(account != NULL);
-    account->syncAndBlock();
-
-    Service service = mgr->service(MYSERVICE);
-    QVERIFY(service.isValid());
-    account->selectService(service);
-
-    account->setValue("key", QVariant("value"));
-    account->syncAndBlock();
-
-    QVERIFY(m_updateEvent != 0);
-    QVERIFY(m_updateEvent == account->id());
-
-    //if we create manager without service type the signal shoudl not be emitted
-    Manager *mgr2 = new Manager();
-    QVERIFY(mgr2 != NULL);
-
-    m_updateEvent = 0;
-    QObject::connect(mgr2, SIGNAL(accountUpdated(Accounts::AccountId)),
-                     this, SLOT(updateAccount(Accounts::AccountId)));
-
-    Account *account2 = mgr2->createAccount(NULL);
-    QVERIFY(account2 != NULL);
-
-    account2->setValue("key", QVariant("value"));
-    account2->syncAndBlock();
-
-    QVERIFY(m_updateEvent == 0);
-    QVERIFY(m_updateEvent != account2->id());
-
-    delete account;
-    delete account2;
-    delete mgr;
-    delete mgr2;
-}
-
-void AccountsTest::updateAccount(Accounts::AccountId id)
-{
-    m_updateEvent = id;
-}
-
-void AccountsTest::applicationTest()
-{
-    Manager *manager = new Manager();
-    QVERIFY(manager != 0);
-
-    Application application = manager->application("Mailer");
-    QVERIFY(application.isValid());
-
-    Service email = manager->service("MyService");
-    QVERIFY(email.isValid());
-
-    Service sharing = manager->service("OtherService");
-    QVERIFY(sharing.isValid());
-
-    QCOMPARE(application.name(), UTF8("Mailer"));
-    QCOMPARE(application.displayName(), UTF8("Easy Mailer"));
-    QCOMPARE(application.description(), UTF8("Mailer application"));
-    QCOMPARE(application.trCatalog(), UTF8("mailer-catalog"));
-    QCOMPARE(application.iconName(), UTF8("mailer-icon"));
-    QCOMPARE(application.desktopFilePath(),
-             UTF8(qgetenv("AG_APPLICATIONS") + "/applications/mailer.desktop"));
-    QCOMPARE(application.serviceUsage(email),
-             UTF8("Mailer can retrieve your e-mails"));
-
-    ApplicationList apps = manager->applicationList(email);
-    QCOMPARE(apps.count(), 1);
-    QCOMPARE(apps[0].name(), UTF8("Mailer"));
-
-    apps = manager->applicationList(sharing);
-    QCOMPARE(apps.count(), 1);
-    application = apps[0];
-    QCOMPARE(application.name(), UTF8("Gallery"));
-    QCOMPARE(application.description(), UTF8("Image gallery"));
-    QCOMPARE(application.serviceUsage(sharing),
-             UTF8("Publish images on OtherService"));
-
-    /* Test an invalid application */
-    Application app2;
-    QVERIFY(!app2.isValid());
-    Application app3(app2);
-    QVERIFY(!app3.isValid());
-
-    delete manager;
-}
-
-QTEST_MAIN(AccountsTest)
-// #include "testqstring.moc"

=== removed file 'tests/accountstest.h'
--- tests/accountstest.h	2013-04-26 06:31:51 +0000
+++ tests/accountstest.h	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-/*
- * This file is part of libaccounts-qt
- *
- * Copyright (C) 2009-2011 Nokia Corporation.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#ifndef ACCOUNTSTEST_H
-#define ACCOUNTSTEST_H
-
-#include <QObject>
-
-#include "Accounts/Account"
-
-using namespace Accounts;
-
-class AccountsTest : public QObject
-{
-    Q_OBJECT
-
-public:
-
-public slots:
-    void stored();
-    void error(Accounts::Error error);
-    void enabled(const QString &serviceName, bool enabled);
-    void enabledEvent(Accounts::AccountId id);
-    void display(const QString &serviceName);
-    void created(Accounts::AccountId id);
-    void removed();
-    void w_server_notify(const char *);
-    void w_port_notify(const char *);
-    void w_parameters_notify(const char *);
-    void updateAccount(Accounts::AccountId id);
-    void onAccountServiceEnabled(bool enabled);
-    void onAccountServiceChanged();
-
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-
-    void managerTestCase();
-    void createAccountTestCase();
-    void accountTestCase();
-    void objectsLifetimeTestCase();
-    void accountListTestCase();
-
-    void providerTestCase();
-    void serviceTestCase();
-    void serviceListTestCase();
-
-    void serviceConstTestCase();
-
-    void accountConstTestCase();
-
-    void accountProviderTestCase();
-    void accountServiceTestCase();
-    void accountEnabledTestCase();
-    void accountDisplayNameTestCase();
-
-    void accountValueTestCase();
-
-    void accountSyncTestCase();
-
-    void createdTestCase();
-
-    void removeTestCase();
-
-    void accountServiceTest();
-
-    void watchesTest();
-
-    void serviceDataTest();
-
-    void settingsTest();
-
-    void keySignVerifyTest();
-
-    void incrementalAccountIdsTest();
-
-    void selectGlobalAccountSettingsTest();
-
-    void credentialsIdTest();
-
-    void authDataTest();
-    void globalAuthDataTest();
-
-    void listEnabledServices();
-
-    void listEnabledByServiceType();
-
-    void enabledEvent();
-
-    void serviceTypeTestCase();
-
-    void updateAccountTestCase();
-
-    void applicationTest();
-
-private:
-    bool m_stored;
-    bool m_enabled;
-    AccountId m_created;
-    AccountId m_enabledEvent;
-    bool m_removed;
-    int m_rowsInserted;
-    int m_rowsRemoved;
-    int m_server_notify;
-    int m_port_notify;
-    int m_parameters_notify;
-    AccountId m_updateEvent;
-    bool m_accountServiceEnabledValue;
-    QStringList m_accountServiceChangedFields;
-};
-
-#endif

=== removed file 'tests/accountstest.pro'
--- tests/accountstest.pro	2013-01-17 17:43:02 +0000
+++ tests/accountstest.pro	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-include( ../common-project-config.pri )
-include( ../common-vars.pri )
-
-TARGET = accountstest
-SOURCES += \
-    accountstest.cpp
-HEADERS += \
-    accountstest.h
-QT = \
-    core \
-    testlib \
-    xml
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-    LIBS += -laccounts-qt5
-} else {
-    LIBS += -laccounts-qt
-}
-
-QMAKE_RPATHDIR = $${QMAKE_LIBDIR}
-
-#Check for the existence of aegis-crypto
-system(pkg-config --exists aegis-crypto) :HAVE_AEGISCRYPTO=YES
-contains(HAVE_AEGISCRYPTO, YES) {
-    message("aegis-crypto detected...")
-    DEFINES += HAVE_AEGISCRYPTO
-}
-
-include( ../common-installs-config.pri )
-
-DATA_PATH = $${INSTALL_PREFIX}/share/libaccounts-qt-tests/
-
-DEFINES += \
-    SERVICES_DIR=\\\"$$DATA_PATH\\\" \
-    SERVICE_TYPES_DIR=\\\"$$DATA_PATH\\\" \
-    PROVIDERS_DIR=\\\"$$DATA_PATH\\\"
-
-service.path = $$DATA_PATH
-service.files += $${TOP_SRC_DIR}/tests/*.service
-INSTALLS     += service
-
-service-type.path = $$DATA_PATH
-service-type.files += $${TOP_SRC_DIR}/tests/*.service-type
-INSTALLS += service-type
-
-provider.path = $$DATA_PATH
-provider.files += $${TOP_SRC_DIR}/tests/*.provider
-INSTALLS     += provider
-
-testsuite.files = $${TOP_SRC_DIR}/tests/tests.xml
-testsuite.path = $$DATA_PATH
-INSTALLS += testsuite
-
-QMAKE_EXTRA_TARGETS += check
-check.depends = accountstest
-check.commands = "TESTDIR=$${TOP_SRC_DIR}/tests $${TOP_SRC_DIR}/tests/accountstest.sh"

=== modified file 'tests/accountstest.sh'
--- tests/accountstest.sh	2015-09-30 08:58:04 +0000
+++ tests/accountstest.sh	2015-11-06 13:54:21 +0000
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-export AG_APPLICATIONS=$TESTDIR
-export AG_SERVICES=$TESTDIR
-export AG_SERVICE_TYPES=$TESTDIR
-export AG_PROVIDERS=$TESTDIR
-export ACCOUNTS=/tmp/ 
-export XDG_DATA_HOME=$TESTDIR
-
 # If dbus-test-runner exists, use it to run the tests in a separate D-Bus
 # session
 if command -v dbus-test-runner > /dev/null ; then

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2012-03-08 14:05:28 +0000
+++ tests/tests.pro	2015-11-06 13:54:21 +0000
@@ -2,4 +2,4 @@
 include( ../common-vars.pri )
 
 TEMPLATE = subdirs
-SUBDIRS = accountstest.pro
+SUBDIRS = tst_libaccounts.pro

=== removed file 'tests/tests.xml'
--- tests/tests.xml	2010-03-11 10:07:21 +0000
+++ tests/tests.xml	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-<testdefinition version="0.1">
-  <suite name="libaccounts-qt-tests">
-    <set description="libaccounts-qt-tests:accountstest" name="/usr/bin/accountstest">
-      <case description="libaccounts-qt-tests:accountstest:managerTestCase" name="accountstest-managerTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest managerTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:createAccountTestCase" name="accountstest-createAccountTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest createAccountTestCase</step></case>
-      <case description="libaccounts-qt-tests:accountstest:accountTestCase" name="accountstest-accountTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest accountTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:accountListTestCase" name="accountstest-accountListTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest accountListTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:providerTestCase" name="accountstest-providerTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest providerTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:serviceTestCase" name="accountstest-serviceTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest serviceTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:serviceListTestCase" name="accountstest-serviceListTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest serviceListTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:serviceConstTestCase" name="accountstest-serviceConstTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest serviceConstTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:accountConstTestCase" name="accountstest-accountConstTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest accountConstTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:accountServiceTestCase" name="accountstest-accountServiceTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest accountServiceTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:accountEnabledTestCase" name="accountstest-accountEnabledTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest accountEnabledTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:accountDisplayNameTestCase" name="accountstest-accountDisplayNameTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest accountDisplayNameTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:accountValueTestCase" name="accountstest-accountValueTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest accountValueTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:accountSyncTestCase" name="accountstest-accountSyncTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest accountSyncTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:createdTestCase" name="accountstest-createdTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest createdTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:removeTestCase" name="accountstest-removeTestCase" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest removeTestCase</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:watchesTest" name="accountstest-watchesTest" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest watchesTest</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:serviceDataTest" name="accountstest-serviceDataTest" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest serviceDataTest</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:settingsTest" name="accountstest-settingsTest" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest settingsTest</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:incrementalAccountIdsTest" name="accountstest-incrementalAccountIdsTest" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest incrementalAccountIdsTest</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:selectGlobalAccountSettingsTest" name="accountstest-selectGlobalAccountSettingsTest" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest selectGlobalAccountSettingsTest</step>
-      </case>
-      <case description="libaccounts-qt-tests:accountstest:credentialsIdTest" name="accountstest-credentialsIdTest" level="Feature" type="Functional">
-        <step>/usr/bin/accountstest credentialsIdTest</step>
-      </case>
-      <environments>
-        <scratchbox>true</scratchbox>
-        <hardware>true</hardware>
-      </environments>
-    </set>
-  </suite>
-</testdefinition>

=== added file 'tests/tst_libaccounts.cpp'
--- tests/tst_libaccounts.cpp	1970-01-01 00:00:00 +0000
+++ tests/tst_libaccounts.cpp	2015-11-06 13:54:21 +0000
@@ -0,0 +1,1446 @@
+/* vi: set et sw=4 ts=4 cino=t0,(0: */
+/*
+ * This file is part of libaccounts-qt
+ *
+ * Copyright (C) 2009-2011 Nokia Corporation.
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#include <QtTest/QtTest>
+#include <QSignalSpy>
+
+#include "Accounts/Account"
+#include "Accounts/Application"
+#include "Accounts/Manager"
+#include "Accounts/AccountService"
+
+using namespace Accounts;
+
+#define PROVIDER QStringLiteral("dummyprovider")
+#define SERVICE QStringLiteral("dummyservice")
+#define MYSERVICE QStringLiteral("MyService")
+#define OTHERSERVICE QStringLiteral("OtherService")
+#define EMAIL_SERVICE_TYPE QStringLiteral("e-mail")
+
+Q_DECLARE_METATYPE(Accounts::AccountId)
+Q_DECLARE_METATYPE(const char *)
+
+class AccountsTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    AccountsTest() {
+        qRegisterMetaType<AccountId>("Accounts::AccountId");
+        qRegisterMetaType<const char *>("const char *");
+    }
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void testManager();
+    void testCreateAccount();
+    void testAccount();
+    void testObjectsLifetime();
+    void testAccountList();
+
+    void testProvider();
+    void testService();
+    void testServiceList();
+    void testServiceConst();
+    void testAccountConst();
+
+    void testAccountProvider();
+    void testAccountServices();
+    void testAccountEnabled();
+    void testAccountDisplayName();
+    void testAccountValue();
+    void testAccountSync();
+
+    void testCreated();
+    void testRemove();
+
+    void testAccountService();
+
+    void testWatches();
+
+    void testServiceData();
+    void testSettings();
+
+    void testKeySignVerify();
+
+    void testIncrementalAccountIds();
+
+    void testSelectGlobalAccountSettings();
+
+    void testCredentialsId();
+    void testAuthData();
+    void testGlobalAuthData();
+
+    void testListEnabledServices();
+    void testListEnabledByServiceType();
+    void testEnabledEvent();
+    void testServiceType();
+    void testUpdateAccount();
+    void testApplication();
+
+public Q_SLOTS:
+    void onAccountServiceChanged();
+
+private:
+    QStringList m_accountServiceChangedFields;
+};
+
+void clearDb()
+{
+    QDir dbroot(QString(getenv("ACCOUNTS")));
+    dbroot.remove(QString("accounts.db"));
+}
+
+void AccountsTest::initTestCase()
+{
+    //init
+    setenv("ACCOUNTS", "/tmp/", false);
+    setenv("AG_APPLICATIONS", DATA_PATH, false);
+    setenv("AG_SERVICES", DATA_PATH, false);
+    setenv("AG_SERVICE_TYPES", DATA_PATH, false);
+    setenv("AG_PROVIDERS", DATA_PATH, false);
+    setenv("XDG_DATA_HOME", DATA_PATH, false);
+    //clear database
+    clearDb();
+}
+
+void AccountsTest::cleanupTestCase()
+{
+}
+
+void AccountsTest::testManager()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+    QCOMPARE(mgr->serviceType(), QString());
+
+    mgr->setAbortOnTimeout(true);
+    QCOMPARE(mgr->abortOnTimeout(), true);
+
+    mgr->setTimeout(123);
+    QCOMPARE(mgr->timeout(), quint32(123));
+
+    QCOMPARE(mgr->options().testFlag(Manager::DisableNotifications), false);
+
+    delete mgr;
+
+    mgr = new Manager(Manager::DisableNotifications);
+    QCOMPARE(mgr->options().testFlag(Manager::DisableNotifications), true);
+    delete mgr;
+}
+
+void AccountsTest::testCreateAccount()
+{
+    clearDb();
+
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+    QVERIFY(account->manager() == mgr);
+    delete account;
+
+    account = mgr->createAccount(PROVIDER);
+    QVERIFY(account != 0);
+    delete account;
+
+    delete mgr;
+}
+
+void AccountsTest::testAccount()
+{
+    clearDb();
+
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    //this should not exist
+    Account *account2 = mgr->account(1);
+    QVERIFY(!account2);
+    Error error = mgr->lastError();
+    QCOMPARE(error.type(), Error::AccountNotFound);
+
+    // make sure there is account
+    Account *account = mgr->createAccount(NULL);
+    account->sync();
+
+    //now we get account
+    account2 = mgr->account(1);
+    QVERIFY(account2 != 0);
+
+    delete account2;
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testObjectsLifetime()
+{
+    clearDb();
+
+    Manager *manager = new Manager();
+
+    // this should not exist
+    Account *account = Account::fromId(manager, 1);
+    QVERIFY(account == 0);
+    Error error = manager->lastError();
+    QCOMPARE(error.type(), Error::AccountNotFound);
+
+    // create an account
+    account = new Account(manager, PROVIDER);
+    account->setDisplayName("hi!");
+    account->syncAndBlock();
+    AccountId accountId = account->id();
+    delete account;
+
+    // Now load it, in two different ways
+    QPointer<Account> sharedAccount = manager->account(accountId);
+    QVERIFY(sharedAccount != 0);
+    QCOMPARE(sharedAccount->displayName(), QString("hi!"));
+
+    QPointer<Account> ownedAccount = Account::fromId(manager, accountId);
+    QVERIFY(ownedAccount != 0);
+    QCOMPARE(ownedAccount->displayName(), QString("hi!"));
+
+    /* Load it once more from the shared interface, and see that we get the
+     * same object */
+    QCOMPARE(manager->account(accountId), sharedAccount.data());
+
+    /* Delete the manager; the owned account should survive, the shared
+     * shouldn't */
+    delete manager;
+    QVERIFY(sharedAccount == 0);
+    QVERIFY(ownedAccount != 0);
+    QVERIFY(ownedAccount->manager() == 0);
+
+    delete ownedAccount;
+}
+
+void AccountsTest::testAccountList()
+{
+    clearDb();
+
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    // make sure there is account
+    Account *account = mgr->createAccount(NULL);
+    account->sync();
+
+    AccountIdList list = mgr->accountList(NULL);
+    QVERIFY(!list.isEmpty());
+    QCOMPARE(list.size(), 1);
+
+    list = mgr->accountList("e-mail");
+    QVERIFY(list.isEmpty());
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testProvider()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(PROVIDER);
+    QVERIFY(account != 0);
+
+    QString provider_name = account->providerName();
+    QCOMPARE(provider_name, PROVIDER);
+
+    delete account;
+
+    /* Test invalid provider */
+    Provider invalid;
+    QVERIFY(!invalid.isValid());
+
+    /* Check listing and loading of XML files */
+    Provider provider = mgr->provider("MyProvider");
+    QVERIFY(provider.isValid());
+
+    QCOMPARE(provider.displayName(), QString("My Provider"));
+    QCOMPARE(provider.iconName(), QString("general_myprovider"));
+    QCOMPARE(provider.description(), QString("fast & furious"));
+    QCOMPARE(provider.trCatalog(), QString("accounts"));
+    QCOMPARE(provider.pluginName(), QString("generic-oauth"));
+    QCOMPARE(provider.domainsRegExp(), QString(".*example.net"));
+    QCOMPARE(provider.isSingleAccount(), true);
+
+    QDomDocument dom = provider.domDocument();
+    QDomElement root = dom.documentElement();
+    QCOMPARE(root.tagName(), QString("provider"));
+
+    /* Test copy constructor */
+    Provider copy(provider);
+    QCOMPARE(copy.displayName(), QString("My Provider"));
+
+    /* Test assignment */
+    copy = provider;
+    QCOMPARE(copy.displayName(), QString("My Provider"));
+    copy = invalid;
+    QVERIFY(!copy.isValid());
+    copy = provider;
+    QCOMPARE(copy.displayName(), QString("My Provider"));
+
+    ProviderList providers = mgr->providerList();
+    QVERIFY(!providers.isEmpty());
+    QVERIFY(providers.size() == 1);
+    QCOMPARE(providers[0].displayName(), QString("My Provider"));
+
+    delete mgr;
+}
+
+void AccountsTest::testService()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+    QCOMPARE(service.name(), MYSERVICE);
+    QCOMPARE(service.iconName(), QString("general_myservice"));
+    QCOMPARE(service.trCatalog(), QString("accounts"));
+    QStringList tags;
+    tags << "email" << "e-mail";
+    QCOMPARE(service.tags(), tags.toSet());
+    // Called twice, because the second time it returns a cached result
+    QCOMPARE(service.tags(), tags.toSet());
+    QVERIFY(service.hasTag("email"));
+    QVERIFY(!service.hasTag("chat"));
+
+    service = mgr->service(SERVICE);
+    QVERIFY(!service.isValid());
+
+    delete mgr;
+}
+
+void AccountsTest::testServiceList()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    ServiceList list = mgr->serviceList();
+    QVERIFY(!list.isEmpty());
+    QCOMPARE(list.count(), 2);
+
+    list = mgr->serviceList("e-mail");
+    QCOMPARE(list.count(), 1);
+
+    list = mgr->serviceList("sharing");
+    QCOMPARE(list.count(), 1);
+
+    delete mgr;
+}
+
+void AccountsTest::testServiceConst()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+    QCOMPARE(service.name(), MYSERVICE);
+    QCOMPARE(service.displayName(), QString("My Service"));
+    QCOMPARE(service.serviceType(), QString("e-mail"));
+    QCOMPARE(service.provider(), QString("MyProvider"));
+    QVERIFY(service.hasTag(QString("email")));
+
+    delete mgr;
+}
+
+
+/* account */
+
+
+void AccountsTest::testAccountConst()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(PROVIDER);
+    QVERIFY(account != 0);
+    QVERIFY(account->isWritable());
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testAccountProvider()
+{
+    Manager *manager = new Manager();
+    QVERIFY(manager != 0);
+
+    Account *account = manager->createAccount("MyProvider");
+    QVERIFY(account != 0);
+
+    QCOMPARE(account->providerName(), QString("MyProvider"));
+
+    Provider provider = account->provider();
+    QCOMPARE(provider.name(), QString("MyProvider"));
+
+    delete account;
+    delete manager;
+}
+
+void AccountsTest::testAccountServices()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount("MyProvider");
+    QVERIFY(account != 0);
+
+    QVERIFY(!account->supportsService(QString("unsupported")));
+    QVERIFY(account->supportsService(QString("e-mail")));
+
+    ServiceList list = account->services();
+    QVERIFY(!list.isEmpty());
+    QCOMPARE(list.count(), 1);
+
+    list = account->services("e-mail");
+    QCOMPARE(list.count(), 1);
+
+    list = account->services("unsupported");
+    QVERIFY(list.isEmpty());
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+
+    /* Test default settings */
+    account->selectService(service);
+    QCOMPARE(account->value("parameters/server").toString(),
+             QString("talk.google.com"));
+    QCOMPARE(account->valueAsInt("parameters/port"), 5223);
+    SettingSource source;
+    QCOMPARE(account->valueAsInt("parameters/port", 0, &source), 5223);
+    QCOMPARE(source, TEMPLATE);
+
+    delete account;
+    delete mgr;
+}
+
+
+void AccountsTest::testAccountEnabled()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(PROVIDER);
+    QVERIFY(account != 0);
+    QSignalSpy enabled(account, SIGNAL(enabledChanged(const QString&,bool)));
+
+    account->setEnabled(true);
+    account->sync();
+    QVERIFY(account->enabled());
+    QTRY_COMPARE(enabled.count(), 1);
+    QCOMPARE(enabled.at(0).at(1).toBool(), true);
+    enabled.clear();
+    account->setEnabled(false);
+    account->sync();
+    QVERIFY(!account->enabled());
+    QTRY_COMPARE(enabled.count(), 1);
+    QCOMPARE(enabled.at(0).at(1).toBool(), false);
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testAccountDisplayName()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(PROVIDER);
+    QVERIFY(account != 0);
+    QSignalSpy displayNameChanged(account,
+                                  SIGNAL(displayNameChanged(const QString&)));
+
+    account->setDisplayName(PROVIDER);
+    account->sync();
+    QCOMPARE(account->displayName(),PROVIDER);
+    QTRY_COMPARE(displayNameChanged.count(), 1);
+    QCOMPARE(displayNameChanged.at(0).at(0).toString(), PROVIDER);
+
+    delete account;
+    delete mgr;
+}
+
+
+
+void AccountsTest::testAccountValue()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(PROVIDER);
+    QVERIFY(account != 0);
+
+    QSignalSpy synced(account, SIGNAL(synced()));
+    account->setValue(QString("test"),QString("value"));
+    int int_value = 666;
+    account->setValue("testint", int_value);
+    QStringList names;
+    names << "Tom" << "Dick" << "Harry";
+    account->setValue("names", names);
+    account->setValue("big distance", quint64(3));
+    account->setValue("big difference", qint64(-300));
+    account->setValue("boolean", false);
+    account->sync();
+
+    QTRY_COMPARE(synced.count(), 1);
+
+    /* check that the values we wrote are retrieved successfully */
+    QVariant val = QVariant::String;
+    account->value(QString("test"), val);
+    QCOMPARE(val.toString(), QString("value"));
+
+    SettingSource source;
+    source = account->value(QString("test"), val);
+    QCOMPARE(val.toString(), QString("value"));
+
+    QVariant intval = QVariant::Int;
+    account->value("testint", intval);
+    qDebug("Val: %d", intval.toInt());
+    QVERIFY(intval.toInt() == int_value);
+
+    QVERIFY(source == ACCOUNT);
+
+    QCOMPARE(account->value("names").toStringList(), names);
+    QCOMPARE(account->value("big distance").toULongLong(), quint64(3));
+    QCOMPARE(account->value("big difference").toLongLong(), qint64(-300));
+
+    /* test the convenience methods */
+    QString strval = account->valueAsString("test");
+    QCOMPARE (strval, QString("value"));
+    QCOMPARE(account->valueAsString("test", "Hi", &source), QString("value"));
+    QCOMPARE(source, ACCOUNT);
+
+    QCOMPARE(account->valueAsBool("boolean"), false);
+    QCOMPARE(account->valueAsBool("boolean", true, &source), false);
+    QCOMPARE(source, ACCOUNT);
+
+    QCOMPARE(account->valueAsUInt64("big distance"), quint64(3));
+    QCOMPARE(account->valueAsUInt64("big distance", 10, &source), quint64(3));
+    QCOMPARE(source, ACCOUNT);
+
+    strval = account->valueAsString("test_unexisting", "hello");
+    QCOMPARE (strval, QString("hello"));
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testAccountSync()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(PROVIDER);
+    QVERIFY(account != 0);
+
+    QString provider = account->providerName();
+    QCOMPARE(provider, PROVIDER);
+
+    QSignalSpy synced(account, SIGNAL(synced()));
+
+    account->sync();
+    QTRY_COMPARE(synced.count(), 1);
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testCreated()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    QSignalSpy created(mgr, SIGNAL(accountCreated(Accounts::AccountId)));
+
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+
+    /* store the account: this will emit accountCreated */
+    account->sync();
+    QTRY_COMPARE(created.count(), 1);
+    uint accountId = created.at(0).at(0).toUInt();
+    QVERIFY(accountId != 0);
+    QCOMPARE(accountId, account->id());
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testRemove()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+
+    /* store the account */
+    account->sync();
+    QVERIFY(account->id() != 0);
+
+    QSignalSpy removed(account, SIGNAL(removed()));
+
+    /* mark the account for deletion -- and make sure it's not deleted
+     * immediately */
+    account->remove ();
+    QCOMPARE(removed.count(), 0);
+
+    /* store the changes */
+    account->sync();
+    QCOMPARE(removed.count(), 1);
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::onAccountServiceChanged()
+{
+    AccountService *accountService = qobject_cast<AccountService*>(sender());
+    m_accountServiceChangedFields = accountService->changedFields();
+}
+
+void AccountsTest::testAccountService()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+
+    QObject *parent = new QObject();
+    QPointer<AccountService> shortLivedAccountService =
+        new AccountService(account, service, parent);
+    QVERIFY(shortLivedAccountService != 0);
+    delete parent;
+    QVERIFY(shortLivedAccountService == 0);
+
+    AccountService *accountService = new AccountService(account, service);
+    QVERIFY(accountService != 0);
+
+    QCOMPARE(accountService->account(), account);
+    QCOMPARE(accountService->account()->providerName(),
+             account->providerName());
+    Service copy = accountService->service();
+    QVERIFY(copy.isValid());
+    QCOMPARE(copy.name(), service.name());
+
+    QObject::connect(accountService, SIGNAL(changed()),
+                     this, SLOT(onAccountServiceChanged()));
+    QSignalSpy spyChanged(accountService, SIGNAL(changed()));
+    QSignalSpy spyEnabled(accountService, SIGNAL(enabled(bool)));
+
+    accountService->beginGroup("parameters");
+    QVERIFY(accountService->group() == "parameters");
+
+    /* test values from the template */
+    QCOMPARE(accountService->value("server").toString(),
+             UTF8("talk.google.com"));
+    QCOMPARE(accountService->value("port").toInt(), 5223);
+    QCOMPARE(accountService->value("old-ssl").toBool(), true);
+
+    /* now, change some values */
+    accountService->setValue("server", QString("www.example.com"));
+    account->selectService();
+    account->setEnabled(true);
+    account->selectService(service);
+    account->setEnabled(true);
+
+    /* write the data */
+    account->sync();
+
+    /* ensure that the callbacks have been called the correct number of times */
+    QCOMPARE(spyChanged.count(), 1);
+    spyChanged.clear();
+    spyEnabled.clear();
+
+    QStringList expectedChanges;
+    expectedChanges << "parameters/server";
+    expectedChanges << "enabled";
+    QCOMPARE(m_accountServiceChangedFields.toSet(), expectedChanges.toSet());
+
+    QCOMPARE(accountService->value("server").toString(),
+             UTF8("www.example.com"));
+    QCOMPARE(accountService->enabled(), true);
+
+    /* check the enabled status */
+    account->selectService();
+    account->setEnabled(false);
+    account->sync();
+    QCOMPARE(spyChanged.count(), 0);
+    QCOMPARE(spyEnabled.count(), 1);
+    QCOMPARE(accountService->enabled(), false);
+    QCOMPARE(spyEnabled.at(0).at(0).toBool(), accountService->enabled());
+    spyEnabled.clear();
+
+    /* enable the account, but disable the service */
+    account->selectService();
+    account->setEnabled(true);
+    account->selectService(service);
+    account->setEnabled(false);
+    account->sync();
+    QCOMPARE(spyEnabled.count(), 0);
+    QCOMPARE(accountService->enabled(), false);
+
+    /* re-enable the service */
+    account->selectService(service);
+    account->setEnabled(true);
+    account->sync();
+    QCOMPARE(spyEnabled.count(), 1);
+    QCOMPARE(accountService->enabled(), true);
+    QCOMPARE(spyEnabled.at(0).at(0).toBool(), accountService->enabled());
+    spyEnabled.clear();
+    spyChanged.clear();
+
+
+    /* test some more APIs */
+    QStringList expectedList;
+    expectedList << "server" << "fallback-conference-server" <<
+        "port" << "old-ssl";
+    QCOMPARE(accountService->childKeys().toSet(), expectedList.toSet());
+    QCOMPARE(accountService->childGroups().toSet(), QSet<QString>());
+    QCOMPARE(accountService->contains("port"), true);
+    accountService->endGroup();
+
+    expectedList.clear();
+    expectedList << "parameters";
+    QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet());
+
+    /* Remove one key */
+    accountService->remove("parameters/port");
+    account->sync();
+    QCOMPARE(spyChanged.count(), 1);
+    QCOMPARE(m_accountServiceChangedFields, QStringList("parameters/port"));
+    spyChanged.clear();
+
+    /* remove all keys */
+    accountService->clear();
+    account->sync();
+    QCOMPARE(spyChanged.count(), 1);
+    QVERIFY(m_accountServiceChangedFields.contains("parameters/server"));
+    QVERIFY(m_accountServiceChangedFields.contains("parameters/old-ssl"));
+    spyChanged.clear();
+
+    delete accountService;
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testWatches()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+
+    /* create an account and some watches */
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+
+    account->selectService(service);
+
+    Watch *w_server = account->watchKey("parameters/server");
+    QSignalSpy serverNotify(w_server, SIGNAL(notify(const char *)));
+
+    /* test also beginGroup() */
+    account->beginGroup("parameters");
+    QVERIFY(account->group() == "parameters");
+
+    Watch *w_parameters = account->watchKey(); /* watch the whole group */
+    QSignalSpy parametersNotify(w_parameters, SIGNAL(notify(const char *)));
+
+    Watch *w_port = account->watchKey("port");
+    QSignalSpy portNotify(w_port, SIGNAL(notify(const char *)));
+
+    /* now, change some values */
+    account->setValue("server", QString("xxx.nokia.com"));
+
+    /* write the data */
+    account->sync();
+
+    /* ensure that the callbacks have been called the correct number of times */
+    QCOMPARE(serverNotify.count(), 1);
+    QCOMPARE(parametersNotify.count(), 1);
+    QCOMPARE(portNotify.count(), 0);
+
+    /* now change the port and another parameter not being watched */
+    account->setValue("port", 45);
+    account->endGroup(); /* exit from the "parameters/" prefix */
+    account->setValue("username", QString("[e-mail]"));
+
+    /* reset the counters */
+    serverNotify.clear();
+    parametersNotify.clear();
+    portNotify.clear();
+
+    /* write the data */
+    account->sync();
+
+    /* ensure that the callbacks have been called the correct number of times */
+    QCOMPARE(serverNotify.count(), 0);
+    QCOMPARE(parametersNotify.count(), 1);
+    QCOMPARE(portNotify.count(), 1);
+
+    /* change port and server, but delete the w_port watch */
+    delete w_port;
+
+    account->beginGroup("parameters");
+    account->setValue("port", 56);
+    account->setValue("server", QString("warez.nokia.com"));
+
+    /* reset the counters */
+    serverNotify.clear();
+    parametersNotify.clear();
+    portNotify.clear();
+
+    /* write the data */
+    account->sync();
+
+    /* ensure that the callbacks have been called the correct number of times */
+    QCOMPARE(serverNotify.count(), 1);
+    QCOMPARE(parametersNotify.count(), 1);
+    QCOMPARE(portNotify.count(), 0);
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testServiceData()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+
+    QDomDocument doc = service.domDocument();
+    QVERIFY(!doc.isNull());
+
+    delete mgr;
+}
+
+void AccountsTest::testSettings()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    /* create an account and some watches */
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+
+    /* create a few keys/groups */
+    account->setValue("username", QString("fool"));
+    account->setValue("email", QString("[e-mail]"));
+
+    account->beginGroup("parameters");
+    account->setValue("server", QString("xxx.nokia.com"));
+    account->setValue("port", 80);
+
+    account->beginGroup("proxy"); /* this is a subgroup of "parameters" */
+    account->setValue("use", true);
+    account->setValue("address", QString("proxy.nokia.com"));
+    QCOMPARE(account->group(), QString("parameters/proxy"));
+    account->endGroup();
+
+    QCOMPARE(account->group(), QString("parameters"));
+    account->endGroup();
+
+    /* write another top-level key */
+    account->setValue("verified", false);
+
+    /* re-enter a group */
+    account->beginGroup("preferences");
+    account->setValue("maximized", true);
+    account->setValue("initial_directory", QString("xxx"));
+    QCOMPARE(account->group(), QString("preferences"));
+    account->endGroup();
+
+    /* write the data */
+    account->sync();
+
+    /* now check if the groups and keys are layed out as expected */
+    QStringList expected;
+    QStringList result;
+
+    /* check allKeys() */
+    expected << "username" << "email" << "verified" <<
+        "parameters/server" << "parameters/port" <<
+        "parameters/proxy/use" << "parameters/proxy/address" <<
+        "preferences/maximized" << "preferences/initial_directory";
+    result = account->allKeys();
+
+    expected.sort();
+    result.sort();
+    QCOMPARE(result, expected);
+
+    /* check childGroups() */
+    expected.clear();
+    expected << "parameters" << "preferences";
+    result = account->childGroups();
+
+    expected.sort();
+    result.sort();
+    QCOMPARE(result, expected);
+
+    /* check childKeys() */
+    expected.clear();
+    expected << "username" << "email" << "verified";
+    result = account->childKeys();
+
+    expected.sort();
+    result.sort();
+    QCOMPARE(result, expected);
+
+    /* now enter a group and test the same methods as above */
+    account->beginGroup("parameters");
+
+    /* allKeys */
+    expected.clear();
+    expected << "server" << "port" << "proxy/use" << "proxy/address";
+    result = account->allKeys();
+
+    expected.sort();
+    result.sort();
+    QCOMPARE(result, expected);
+
+    /* childGroups */
+    expected.clear();
+    expected << "proxy";
+    result = account->childGroups();
+
+    expected.sort();
+    result.sort();
+    QCOMPARE(result, expected);
+
+    /* childKeys() */
+    expected.clear();
+    expected << "server" << "port";
+    result = account->childKeys();
+
+    expected.sort();
+    result.sort();
+    QCOMPARE(result, expected);
+
+    /* contains() */
+    QVERIFY(account->contains("server") == true);
+    QVERIFY(account->contains("unexisting") == false);
+
+    /* test remove() */
+    account->remove(""); /* remove all the parameters/ group */
+    account->endGroup();
+    account->remove("verified");
+
+    /* we need to sync, for the changes to take effect */
+    account->sync();
+
+    expected.clear();
+    expected << "username" << "email" <<
+        "preferences/maximized" << "preferences/initial_directory";
+    result = account->allKeys();
+
+    expected.sort();
+    result.sort();
+    QCOMPARE(result, expected);
+
+    /* Test clear(): call it from inside the preferences/ group */
+    account->beginGroup("preferences");
+    account->clear();
+    account->sync();
+
+    expected.clear(); /* all keys should have been deleted */
+    result = account->allKeys();
+
+    expected.sort();
+    result.sort();
+    QCOMPARE(result, expected);
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testKeySignVerify()
+{
+#ifndef HAVE_AEGISCRYPTO
+    QSKIP("aegis-crypto not detected.");
+#endif
+
+    const QString key = "key";
+    const char *token;
+    QList<const char*> listOfTokens;
+    listOfTokens << "libaccounts-glib0::accounts-glib-access"
+                 << "libaccounts-glib0::dummy"
+                 << "libaccounts-glib0::idiotic";
+    bool ok;
+
+    Manager *mgr = new Manager();
+    QVERIFY (mgr != 0);
+
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+
+    account->setValue(key, QString("the key value"));
+    account->syncAndBlock();
+
+    account->sign(key, listOfTokens.at(0));
+    account->syncAndBlock();
+
+    ok = account->verify(key, &token);
+    QVERIFY(ok == true);
+
+    ok = account->verifyWithTokens(key, listOfTokens);
+    QVERIFY(ok == true);
+
+    delete mgr;
+}
+
+void AccountsTest::testIncrementalAccountIds()
+{
+    clearDb();
+
+    Manager *mgr = new Manager;
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+    QVERIFY(account->manager() == mgr);
+    account->syncAndBlock();
+    AccountId lastId = account->id();
+
+    account->remove();
+    account->syncAndBlock();
+    delete account;
+
+    account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+    QVERIFY(account->manager() == mgr);
+    account->syncAndBlock();
+
+    QCOMPARE(account->id(), lastId + 1);
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testSelectGlobalAccountSettings()
+{
+    Manager *mgr = new Manager;
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount("MyProvider");
+    QVERIFY(account != 0);
+    QVERIFY(account->manager() == mgr);
+
+    account->syncAndBlock();
+    QVERIFY(account->id() > 0);
+
+    account->selectService();
+    Service selectedService = account->selectedService();
+    QVERIFY(!selectedService.isValid());
+
+    delete mgr;
+}
+
+void AccountsTest::testCredentialsId()
+{
+    Manager *mgr = new Manager;
+    QVERIFY(mgr != 0);
+
+    Account *account = mgr->createAccount("MyProvider");
+    QVERIFY(account != 0);
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+
+    uint globalId = 69, myServiceId = 0xDEAD;
+
+    account->setCredentialsId(globalId);
+
+    account->selectService(service);
+    account->setCredentialsId(myServiceId);
+
+    account->syncAndBlock();
+    QVERIFY(account->id() != 0);
+
+    QCOMPARE(account->credentialsId(), myServiceId);
+
+    /* select a service with no credentials: we should get the global
+     * credentials ID, but the selected service shouldn't change */
+    service = mgr->service(OTHERSERVICE);
+    QVERIFY(service.isValid());
+
+    account->selectService(service);
+    QCOMPARE(account->credentialsId(), globalId);
+    QCOMPARE(account->selectedService(), service);
+
+    /* now make sure that we can get the ID from the global accounts settings */
+    account->selectService();
+    QCOMPARE(account->credentialsId(), globalId);
+
+    delete mgr;
+}
+
+void AccountsTest::testAuthData()
+{
+    Manager *manager = new Manager;
+    QVERIFY(manager != 0);
+
+    Account *account = manager->createAccount("MyProvider");
+    QVERIFY(account != 0);
+
+    Service service = manager->service(MYSERVICE);
+    QVERIFY(service.isValid());
+
+    const uint credentialsId = 69;
+    const QString method = "mymethod";
+    const QString mechanism = "mymechanism";
+    QString prefix =
+        QString::fromLatin1("auth/%1/%2/").arg(method).arg(mechanism);
+
+    QVariantMap globalParameters;
+    globalParameters["server"] = UTF8("myserver.com");
+    globalParameters["port"] = 8080;
+    globalParameters["other"] = UTF8("overriden parameter");
+    globalParameters["scopes"] = QStringList() << "read" << "write" << "edit";
+
+    QVariantMap serviceParameters;
+    serviceParameters["other"] = UTF8("better parameter");
+    serviceParameters["boolean"] = true;
+
+    account->setCredentialsId(credentialsId);
+    account->setValue("auth/method", method);
+    account->setValue("auth/mechanism", UTF8("overriden mechanism"));
+    QMapIterator<QString,QVariant> i(globalParameters);
+    while (i.hasNext()) {
+        i.next();
+        account->setValue(prefix + i.key(), i.value());
+    }
+
+    account->selectService(service);
+    account->setValue("auth/mechanism", mechanism);
+    i = QMapIterator<QString,QVariant>(serviceParameters);
+    while (i.hasNext()) {
+        i.next();
+        account->setValue(prefix + i.key(), i.value());
+    }
+
+    account->syncAndBlock();
+    QVERIFY(account->id() != 0);
+
+    AccountService *accountService = new AccountService(account, service);
+    QVERIFY(accountService != 0);
+
+    AuthData authData = accountService->authData();
+    QCOMPARE(authData.method(), method);
+    QCOMPARE(authData.mechanism(), mechanism);
+    QCOMPARE(authData.credentialsId(), credentialsId);
+
+    QVariantMap expectedParameters = globalParameters;
+    i = QMapIterator<QString,QVariant>(serviceParameters);
+    while (i.hasNext()) {
+        i.next();
+        expectedParameters.insert(i.key(), i.value());
+    }
+
+    QCOMPARE(authData.parameters(), expectedParameters);
+
+    /* Test copy constructor */
+    AuthData copy(authData);
+    QCOMPARE(copy.parameters(), expectedParameters);
+
+    /* And delete destructor */
+    AuthData *copy2 = new AuthData(authData);
+    QCOMPARE(copy2->parameters(), expectedParameters);
+    delete copy2;
+
+    delete accountService;
+    delete account;
+    delete manager;
+    QVERIFY(service.isValid());
+}
+
+void AccountsTest::testGlobalAuthData()
+{
+    Manager *manager = new Manager;
+    QVERIFY(manager != 0);
+
+    Account *account = manager->createAccount("MyProvider");
+    QVERIFY(account != 0);
+
+    Service service; // global account
+    QVERIFY(!service.isValid());
+
+    AccountService *accountService = new AccountService(account, service);
+    QVERIFY(accountService != 0);
+
+    AuthData authData = accountService->authData();
+    QCOMPARE(authData.method(), QString("oauth2"));
+    QCOMPARE(authData.mechanism(), QString("user_agent"));
+    QCOMPARE(authData.credentialsId(), uint(0));
+
+    QVariantMap expectedParameters;
+    expectedParameters.insert("Host", QString("myserver.example"));
+
+    QCOMPARE(authData.parameters(), expectedParameters);
+
+    delete accountService;
+    delete account;
+    delete manager;
+}
+
+void AccountsTest::testListEnabledServices()
+{
+    clearDb();
+
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+
+    Account* account = mgr->createAccount("MyProvider");
+    QVERIFY(account != 0);
+    account->selectService(service);
+    account->setEnabled(true);
+    account->sync();
+
+    ServiceList list = account->enabledServices();
+    QVERIFY(!list.isEmpty());
+    QCOMPARE(list.size(), 1);
+
+    account->selectService(service);
+    account->setEnabled(false);
+    account->sync();
+
+    list = account->enabledServices();
+    QVERIFY(list.isEmpty());
+
+    delete account;
+    delete mgr;
+}
+
+
+void AccountsTest::testListEnabledByServiceType()
+{
+    clearDb();
+
+    Manager *mgr = new Manager("e-mail");
+    QVERIFY(mgr != 0);
+    QCOMPARE(mgr->serviceType(), QString("e-mail"));
+
+    Account *account = mgr->createAccount("MyProvider");
+    QVERIFY(account != 0);
+    account->setEnabled(true);
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+    account->selectService(service);
+    account->setEnabled(true);
+    account->sync();
+
+    AccountIdList list = mgr->accountListEnabled("e-mail");
+    QVERIFY(!list.isEmpty());
+    QCOMPARE(list.size(), 1);
+
+    list = mgr->accountListEnabled();
+    QCOMPARE(list.count(), 1);
+
+    account->setEnabled(false);
+    account->sync();
+
+    list = mgr->accountListEnabled("e-mail");
+    QVERIFY(list.isEmpty());
+
+    delete account;
+    delete mgr;
+}
+
+void AccountsTest::testEnabledEvent()
+{
+    Manager *mgr = new Manager("e-mail");
+    QVERIFY(mgr != 0);
+
+    QSignalSpy enabledEvent1(mgr, SIGNAL(enabledEvent(Accounts::AccountId)));
+
+    Account *account = mgr->createAccount(NULL);
+    QVERIFY(account != 0);
+    account->setEnabled(true);
+    account->sync();
+
+    QTRY_COMPARE(enabledEvent1.count(), 1);
+    QCOMPARE(enabledEvent1.at(0).at(0).toUInt(), account->id());
+
+    //if we create manager without service type the signal should not be emitted
+    Manager *mgr2 = new Manager();
+    QVERIFY(mgr2 != 0);
+
+    QSignalSpy enabledEvent2(mgr2, SIGNAL(enabledEvent(Accounts::AccountId)));
+
+    Account *account2 = mgr2->createAccount(NULL);
+    QVERIFY(account2 != 0);
+    account2->setEnabled(true);
+    account2->sync();
+
+    QCOMPARE(enabledEvent2.count(), 0);
+
+    delete account;
+    delete account2;
+    delete mgr;
+    delete mgr2;
+}
+
+void AccountsTest::testServiceType()
+{
+    Manager *mgr = new Manager();
+    QVERIFY(mgr != 0);
+
+    ServiceType serviceType;
+
+    serviceType = mgr->serviceType("unexisting-type");
+    QVERIFY(!serviceType.isValid());
+
+    serviceType = mgr->serviceType(EMAIL_SERVICE_TYPE);
+    QVERIFY(serviceType.isValid());
+
+    QCOMPARE(serviceType.name(), EMAIL_SERVICE_TYPE);
+    QCOMPARE(serviceType.displayName(), QStringLiteral("Electronic mail"));
+    QCOMPARE(serviceType.trCatalog(), QStringLiteral("translation_file"));
+    QCOMPARE(serviceType.iconName(), QStringLiteral("email_icon"));
+    QVERIFY(serviceType.tags().contains(QString("email")));
+    // called twice, because the second time it returns a cached result
+    QVERIFY(serviceType.tags().contains(QString("email")));
+    QVERIFY(serviceType.hasTag(QString("email")));
+    QVERIFY(!serviceType.hasTag(QString("fake-email")));
+
+    QDomDocument dom = serviceType.domDocument();
+    QDomElement root = dom.documentElement();
+    QCOMPARE(root.tagName(), QString("service-type"));
+
+    ServiceType copy(serviceType);
+    QCOMPARE(copy.displayName(), QStringLiteral("Electronic mail"));
+
+    delete mgr;
+}
+
+void AccountsTest::testUpdateAccount()
+{
+    clearDb();
+
+    Manager *mgr = new Manager("e-mail");
+    QVERIFY(mgr != 0);
+
+    QSignalSpy accountUpdated(mgr,
+                              SIGNAL(accountUpdated(Accounts::AccountId)));
+
+    Account *account = mgr->createAccount("MyProvider");
+    QVERIFY(account != 0);
+    account->syncAndBlock();
+
+    Service service = mgr->service(MYSERVICE);
+    QVERIFY(service.isValid());
+    account->selectService(service);
+
+    account->setValue("key", QVariant("value"));
+    account->syncAndBlock();
+
+    QTRY_COMPARE(accountUpdated.count(), 1);
+    QCOMPARE(accountUpdated.at(0).at(0).toUInt(), account->id());
+
+    //if we create manager without service type the signal shoudl not be emitted
+    Manager *mgr2 = new Manager();
+    QVERIFY(mgr2 != 0);
+
+    QSignalSpy accountUpdated2(mgr2,
+                               SIGNAL(accountUpdated(Accounts::AccountId)));
+
+    Account *account2 = mgr2->createAccount(NULL);
+    QVERIFY(account2 != 0);
+
+    account2->setValue("key", QVariant("value"));
+    account2->syncAndBlock();
+
+    QCOMPARE(accountUpdated2.count(), 0);
+
+    delete account;
+    delete account2;
+    delete mgr;
+    delete mgr2;
+}
+
+void AccountsTest::testApplication()
+{
+    Manager *manager = new Manager();
+    QVERIFY(manager != 0);
+
+    Application application = manager->application("Mailer");
+    QVERIFY(application.isValid());
+
+    Service email = manager->service("MyService");
+    QVERIFY(email.isValid());
+
+    Service sharing = manager->service("OtherService");
+    QVERIFY(sharing.isValid());
+
+    QCOMPARE(application.name(), UTF8("Mailer"));
+    QCOMPARE(application.displayName(), UTF8("Easy Mailer"));
+    QCOMPARE(application.description(), UTF8("Mailer application"));
+    QCOMPARE(application.trCatalog(), UTF8("mailer-catalog"));
+    QCOMPARE(application.iconName(), UTF8("mailer-icon"));
+    QCOMPARE(application.desktopFilePath(),
+             UTF8(qgetenv("AG_APPLICATIONS") + "/applications/mailer.desktop"));
+    QCOMPARE(application.serviceUsage(email),
+             UTF8("Mailer can retrieve your e-mails"));
+
+    ApplicationList apps = manager->applicationList(email);
+    QCOMPARE(apps.count(), 1);
+    QCOMPARE(apps[0].name(), UTF8("Mailer"));
+
+    apps = manager->applicationList(sharing);
+    QCOMPARE(apps.count(), 1);
+    application = apps[0];
+    QCOMPARE(application.name(), UTF8("Gallery"));
+    QCOMPARE(application.description(), UTF8("Image gallery"));
+    QCOMPARE(application.serviceUsage(sharing),
+             UTF8("Publish images on OtherService"));
+
+    /* Test an invalid application */
+    Application app2;
+    QVERIFY(!app2.isValid());
+    Application app3(app2);
+    QVERIFY(!app3.isValid());
+
+    delete manager;
+}
+
+QTEST_GUILESS_MAIN(AccountsTest)
+#include "tst_libaccounts.moc"

=== added file 'tests/tst_libaccounts.pro'
--- tests/tst_libaccounts.pro	1970-01-01 00:00:00 +0000
+++ tests/tst_libaccounts.pro	2015-11-06 13:54:21 +0000
@@ -0,0 +1,35 @@
+include( ../common-project-config.pri )
+include( ../common-vars.pri )
+
+TARGET = accountstest
+SOURCES += \
+    tst_libaccounts.cpp
+QT = \
+    core \
+    testlib \
+    xml
+
+LIBS += -laccounts-qt5
+
+INCLUDEPATH += $${TOP_SRC_DIR}
+QMAKE_LIBDIR += \
+    $${TOP_BUILD_DIR}/Accounts
+QMAKE_RPATHDIR = $${QMAKE_LIBDIR}
+
+#Check for the existence of aegis-crypto
+system(pkg-config --exists aegis-crypto) :HAVE_AEGISCRYPTO=YES
+contains(HAVE_AEGISCRYPTO, YES) {
+    message("aegis-crypto detected...")
+    DEFINES += HAVE_AEGISCRYPTO
+}
+
+include( ../common-installs-config.pri )
+
+DATA_PATH = $${TOP_SRC_DIR}/tests
+
+DEFINES += \
+    DATA_PATH=\\\"$$DATA_PATH\\\"
+
+QMAKE_EXTRA_TARGETS += check
+check.depends = $${TARGET}
+check.commands = "TESTDIR=$${TOP_SRC_DIR}/tests $${TOP_SRC_DIR}/tests/accountstest.sh"