diff --git a/akonadi/tests/collectionjobtest.cpp b/akonadi/tests/collectionjobtest.cpp
index 744154d7d..f6ed2f285 100644
--- a/akonadi/tests/collectionjobtest.cpp
+++ b/akonadi/tests/collectionjobtest.cpp
@@ -1,578 +1,601 @@
 /*
     Copyright (c) 2006 Volker Krause <vkrause@kde.org>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     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 Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include <sys/types.h>
 
 #include "collectionjobtest.h"
 #include <qtest_akonadi.h>
 #include "test_utils.h"
+#include "testattribute.h"
 
 #include "agentmanager.h"
 #include "agentinstance.h"
 #include "cachepolicy.h"
 #include "collection.h"
 #include "collectioncreatejob.h"
 #include "collectiondeletejob.h"
 #include "collectionfetchjob.h"
 #include "collectionmodifyjob.h"
 #include "collectionselectjob_p.h"
 #include "collectionstatistics.h"
 #include "collectionstatisticsjob.h"
 #include "collectionpathresolver_p.h"
 #include "collectionutils_p.h"
 #include "control.h"
 #include "item.h"
 #include "kmime/messageparts.h"
 #include "resourceselectjob_p.h"
 
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 
 
 
 using namespace Akonadi;
 
 QTEST_AKONADIMAIN( CollectionJobTest, NoGUI )
 
 void CollectionJobTest::initTestCase()
 {
   qRegisterMetaType<Akonadi::Collection::List>();
   Control::start();
 
   // switch all resources offline to reduce interference from them
   foreach ( Akonadi::AgentInstance agent, Akonadi::AgentManager::self()->instances() )
     agent.setIsOnline( false );
 }
 
 static Collection findCol( const Collection::List &list, const QString &name ) {
   foreach ( const Collection &col, list )
     if ( col.name() == name )
       return col;
   return Collection();
 }
 
 // list compare which ignores the order
 template <class T> static void compareLists( const QList<T> &l1, const QList<T> &l2 )
 {
   QCOMPARE( l1.count(), l2.count() );
   foreach ( const T entry, l1 ) {
     QVERIFY( l2.contains( entry ) );
   }
 }
 
 template <typename T> static T* extractAttribute( QList<Attribute*> attrs )
 {
   T dummy;
   foreach ( Attribute* attr, attrs ) {
     if ( attr->type() == dummy.type() )
       return dynamic_cast<T*>( attr );
   }
   return 0;
 }
 
 static Collection::Id res1ColId = 6; // -1;
 static Collection::Id res2ColId = 7; //-1;
 static Collection::Id res3ColId = -1;
 static Collection::Id searchColId = -1;
 
 void CollectionJobTest::testTopLevelList( )
 {
   // non-recursive top-level list
   CollectionFetchJob *job = new CollectionFetchJob( Collection::root(), CollectionFetchJob::FirstLevel );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   // check if everything is there and has the correct types and attributes
   QCOMPARE( list.count(), 4 );
   Collection col;
 
   col = findCol( list, "res1" );
   QVERIFY( col.isValid() );
   res1ColId = col.id(); // for the next test
   QVERIFY( res1ColId > 0 );
   QVERIFY( CollectionUtils::isResource( col ) );
   QCOMPARE( col.parent(), Collection::root().id() );
   QCOMPARE( col.resource(), QLatin1String("akonadi_knut_resource_0") );
 
   QVERIFY( findCol( list, "res2" ).isValid() );
   res2ColId = findCol( list, "res2" ).id();
   QVERIFY( res2ColId > 0 );
   QVERIFY( findCol( list, "res3" ).isValid() );
   res3ColId = findCol( list, "res3" ).id();
   QVERIFY( res3ColId > 0 );
 
   col = findCol( list, "Search" );
   searchColId = col.id();
   QVERIFY( col.isValid() );
   QVERIFY( CollectionUtils::isVirtualParent( col ) );
   QCOMPARE( col.resource(), QLatin1String("akonadi_search_resource") );
 }
 
 void CollectionJobTest::testFolderList( )
 {
   // recursive list of physical folders
   CollectionFetchJob *job = new CollectionFetchJob( Collection( res1ColId ), CollectionFetchJob::Recursive );
   QSignalSpy spy( job, SIGNAL(collectionsReceived(Akonadi::Collection::List)) );
   QVERIFY( spy.isValid() );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   int count = 0;
   for ( int i = 0; i < spy.count(); ++i ) {
     Collection::List l = spy[i][0].value<Akonadi::Collection::List>();
     for ( int j = 0; j < l.count(); ++j ) {
       QVERIFY( list.count() > count + j );
       QCOMPARE( list[count + j].id(), l[j].id() );
     }
     count += l.count();
   }
   QCOMPARE( count, list.count() );
 
   // check if everything is there
   QCOMPARE( list.count(), 4 );
   Collection col;
   QStringList contentTypes;
 
   col = findCol( list, "foo" );
   QVERIFY( col.isValid() );
   QCOMPARE( col.parent(), res1ColId );
   QVERIFY( CollectionUtils::isFolder( col ) );
   contentTypes << "message/rfc822" << "text/calendar" << "text/directory"
                << "application/octet-stream" << "inode/directory";
   compareLists( col.contentMimeTypes(), contentTypes );
 
   QVERIFY( findCol( list, "bar" ).isValid() );
   QCOMPARE( findCol( list, "bar" ).parent(), col.id() );
   QVERIFY( findCol( list, "bla" ).isValid() );
 }
 
 void CollectionJobTest::testNonRecursiveFolderList( )
 {
   CollectionFetchJob *job = new CollectionFetchJob( Collection( res1ColId ), CollectionFetchJob::Base );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   QCOMPARE( list.count(), 1 );
   QVERIFY( findCol( list, "res1" ).isValid() );
 }
 
 void CollectionJobTest::testEmptyFolderList( )
 {
   CollectionFetchJob *job = new CollectionFetchJob( Collection( res3ColId ), CollectionFetchJob::FirstLevel );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   QCOMPARE( list.count(), 0 );
 }
 
 void CollectionJobTest::testSearchFolderList( )
 {
   CollectionFetchJob *job = new CollectionFetchJob( Collection( searchColId ), CollectionFetchJob::FirstLevel );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   QCOMPARE( list.count(), 0 );
 }
 
 void CollectionJobTest::testResourceFolderList()
 {
   // non-existing resource
   CollectionFetchJob *job = new CollectionFetchJob( Collection::root(), CollectionFetchJob::FirstLevel );
   job->setResource( "i_dont_exist" );
   QVERIFY( !job->exec() );
 
   // recursive listing of all collections of an existing resource
   job = new CollectionFetchJob( Collection::root(), CollectionFetchJob::Recursive );
   job->setResource( "akonadi_knut_resource_0" );
   QVERIFY( job->exec() );
 
   Collection::List list = job->collections();
   QCOMPARE( list.count(), 5 );
   QVERIFY( findCol( list, "res1" ).isValid() );
   QVERIFY( findCol( list, "foo" ).isValid() );
   QVERIFY( findCol( list, "bar" ).isValid() );
   QVERIFY( findCol( list, "bla" ).isValid() );
   int fooId = findCol( list, "foo" ).id();
 
   // limited listing of a resource
   job = new CollectionFetchJob( Collection( fooId ), CollectionFetchJob::Recursive );
   job->setResource( "akonadi_knut_resource_0" );
   QVERIFY( job->exec() );
 
   list = job->collections();
   QCOMPARE( list.count(), 3 );
   QVERIFY( findCol( list, "bar" ).isValid() );
   QVERIFY( findCol( list, "bla" ).isValid() );
 }
 
 void CollectionJobTest::testCreateDeleteFolder_data()
 {
   QTest::addColumn<Collection>("collection");
   QTest::addColumn<bool>("creatable");
 
   Collection col;
   QTest::newRow("empty") << col << false;
   col.setName( "new folder" );
   col.setParent( res3ColId );
   QTest::newRow("simple") << col << true;
 
   col.setParent( res3ColId );
   col.setName( "foo" );
   QTest::newRow( "existing in different resource" ) << col << true;
 
   col.setName( "mail folder" );
   QStringList mimeTypes;
   mimeTypes << "inode/directory" << "message/rfc822";
   col.setContentMimeTypes( mimeTypes );
   col.setRemoteId( "remote id" );
   CachePolicy policy;
   policy.setInheritFromParent( false );
   policy.setIntervalCheckTime( 60 );
   policy.setLocalParts( QStringList( MessagePart::Envelope ) );
   policy.setSyncOnDemand( true );
   policy.setCacheTimeout( 120 );
   col.setCachePolicy( policy );
   QTest::newRow( "complex" ) << col << true;
 
   col = Collection();
   col.setName( "New Folder" );
   col.setParent( searchColId );
   QTest::newRow( "search folder" ) << col << false;
 
   col.setParent( res2ColId );
   col.setName( "foo2" );
   QTest::newRow( "already existing" ) << col << false;
 
   col.setName( "Bla" );
   col.setParent( 2 );
   QTest::newRow( "already existing with different case" ) << col << true;
 
   CollectionPathResolver *resolver = new CollectionPathResolver( "res2/foo2", this );
   QVERIFY( resolver->exec() );
   col.setParent( resolver->collection() );
   col.setName( "new folder" );
   QTest::newRow( "parent noinferior" ) << col << false;
 
   col.setParent( INT_MAX );
   QTest::newRow( "missing parent" ) << col << false;
 
   col = Collection();
   col.setName( "rid parent" );
   col.setParentRemoteId( "8" );
   QTest::newRow( "rid parent" ) << col << false; // missing resource context
 }
 
 void CollectionJobTest::testCreateDeleteFolder()
 {
   QFETCH( Collection, collection );
   QFETCH( bool, creatable );
 
   CollectionCreateJob *createJob = new CollectionCreateJob( collection, this );
   QCOMPARE( createJob->exec(), creatable );
   if ( !creatable )
     return;
 
   Collection createdCol = createJob->collection();
   QVERIFY( createdCol.isValid() );
   QCOMPARE( createdCol.name(), collection.name() );
   QCOMPARE( createdCol.parent(), collection.parent() );
   QCOMPARE( createdCol.remoteId(), collection.remoteId() );
   QCOMPARE( createdCol.cachePolicy(), collection.cachePolicy() );
 
   CollectionFetchJob *listJob = new CollectionFetchJob( Collection( collection.parent() ), CollectionFetchJob::FirstLevel, this );
   AKVERIFYEXEC( listJob );
   Collection listedCol = findCol( listJob->collections(), collection.name() );
   QCOMPARE( listedCol, createdCol );
   QCOMPARE( listedCol.remoteId(), collection.remoteId() );
   QCOMPARE( listedCol.cachePolicy(), collection.cachePolicy() );
 
   // fetch parent to compare inherited collection properties
   Collection parentCol = Collection::root();
   if ( collection.parent() > 0 ) {
     CollectionFetchJob *listJob = new CollectionFetchJob( Collection( collection.parent() ), CollectionFetchJob::Base, this );
     AKVERIFYEXEC( listJob );
     QCOMPARE( listJob->collections().count(), 1 );
     parentCol = listJob->collections().first();
   }
 
   if ( collection.contentMimeTypes().isEmpty() )
     compareLists( listedCol.contentMimeTypes(), parentCol.contentMimeTypes() );
   else
     compareLists( listedCol.contentMimeTypes(), collection.contentMimeTypes() );
 
   if ( collection.resource().isEmpty() )
     QCOMPARE( listedCol.resource(), parentCol.resource() );
   else
     QCOMPARE( listedCol.resource(), collection.resource() );
 
   CollectionDeleteJob *delJob = new CollectionDeleteJob( createdCol, this );
   AKVERIFYEXEC( delJob );
 
   listJob = new CollectionFetchJob( Collection( collection.parent() ), CollectionFetchJob::FirstLevel, this );
   AKVERIFYEXEC( listJob );
   QVERIFY( !findCol( listJob->collections(), collection.name() ).isValid() );
 }
 
 void CollectionJobTest::testIllegalDeleteFolder()
 {
   // non-existing folder
   CollectionDeleteJob *del = new CollectionDeleteJob( Collection( INT_MAX ), this );
   QVERIFY( !del->exec() );
 
   // root
   del = new CollectionDeleteJob( Collection::root(), this );
   QVERIFY( !del->exec() );
 }
 
 void CollectionJobTest::testStatistics()
 {
   // empty folder
   CollectionStatisticsJob *statistics =
                    new CollectionStatisticsJob( Collection( res1ColId ), this );
   QVERIFY( statistics->exec() );
 
   CollectionStatistics s = statistics->statistics();
   QCOMPARE( s.count(), 0ll );
   QCOMPARE( s.unreadCount(), 0ll );
 
   // folder with attributes and content
   CollectionPathResolver *resolver = new CollectionPathResolver( "res1/foo", this );;
   QVERIFY( resolver->exec() );
   statistics = new CollectionStatisticsJob( Collection( resolver->collection() ), this );
   QVERIFY( statistics->exec() );
 
   s = statistics->statistics();
   QCOMPARE( s.count(), 15ll );
   QCOMPARE( s.unreadCount(), 14ll );
 }
 
 void CollectionJobTest::testModify_data()
 {
   QTest::addColumn<qint64>( "uid" );
   QTest::addColumn<QString>( "rid" );
 
   QTest::newRow( "uid" ) << collectionIdFromPath( "res1/foo" ) << QString();
   QTest::newRow( "rid" ) << -1ll << QString( "10" );
 }
 
 #define RESET_COLLECTION_ID \
   col.setId( uid ); \
   if ( !rid.isEmpty() ) col.setRemoteId( rid )
 
 void CollectionJobTest::testModify()
 {
   QFETCH( qint64, uid );
   QFETCH( QString, rid );
 
   if ( !rid.isEmpty() ) {
     ResourceSelectJob *rjob = new ResourceSelectJob( "akonadi_knut_resource_0" );
     AKVERIFYEXEC( rjob );
   }
 
   QStringList reference;
   reference << "text/calendar" << "text/directory" << "message/rfc822" << "application/octet-stream" << "inode/directory";
 
   Collection col;
   RESET_COLLECTION_ID;
 
   // test noop modify
   CollectionModifyJob *mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   CollectionFetchJob* ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QCOMPARE( ljob->collections().count(), 1 );
   col = ljob->collections().first();
   compareLists( col.contentMimeTypes(), reference );
 
   // test clearing content types
   RESET_COLLECTION_ID;
   col.setContentMimeTypes( QStringList() );
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QCOMPARE( ljob->collections().count(), 1 );
   col = ljob->collections().first();
   QVERIFY( col.contentMimeTypes().isEmpty() );
 
   // test setting contnet types
   RESET_COLLECTION_ID;
   col.setContentMimeTypes( reference );
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QCOMPARE( ljob->collections().count(), 1 );
   col = ljob->collections().first();
   compareLists( col.contentMimeTypes(), reference );
 
+  // add attribute
+  RESET_COLLECTION_ID;
+  col.attribute<TestAttribute>( Collection::AddIfMissing )->data = "new";
+  mod = new CollectionModifyJob( col, this );
+  AKVERIFYEXEC( mod );
+
+  ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
+  AKVERIFYEXEC( ljob );
+  QVERIFY( ljob->collections().first().hasAttribute<TestAttribute>() );
+  QCOMPARE( ljob->collection().first().attribute<TestAttribute>()->data, QByteArray( "new" ) );
+
+  // modify existing attribute
+  RESET_COLLECTION_ID;
+  col.attribute<TestAttribute()->data = "modified";
+  mod = new CollectionModifyJob( col, this );
+  AKVERIFYEXEC( mod );
+
+  ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
+  AKVERIFYEXEC( ljob );
+  QVERIFY( ljob->collections().first().hasAttribute<TestAttribute>() );
+  QCOMPARE( ljob->collection().first().attribute<TestAttribute>()->data, QByteArray( "modified" ) );
+
   // renaming
   RESET_COLLECTION_ID;
   col.setName( "foo (renamed)" );
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QCOMPARE( ljob->collections().count(), 1 );
   col = ljob->collections().first();
   QCOMPARE( col.name(), QString( "foo (renamed)" ) );
 
   RESET_COLLECTION_ID;
   col.setName( "foo" );
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 }
 
 #undef RESET_COLLECTION_ID
 
 void CollectionJobTest::testIllegalModify()
 {
   // non-existing collection
   Collection col( INT_MAX );
   col.setParent( res1ColId );
   CollectionModifyJob *mod = new CollectionModifyJob( col, this );
   QVERIFY( !mod->exec() );
 
   // rename to already existing name
   col = Collection( res1ColId );
   col.setName( "res2" );
   mod = new CollectionModifyJob( col, this );
   QVERIFY( !mod->exec() );
 }
 
 void CollectionJobTest::testUtf8CollectionName()
 {
   QString folderName = QString::fromUtf8( "ä" );
 
   // create collection
   Collection col;
   col.setParent( res3ColId );
   col.setName( folderName );
   CollectionCreateJob *create = new CollectionCreateJob( col, this );
   QVERIFY( create->exec() );
   col = create->collection();
   QVERIFY( col.isValid() );
 
   // list parent
   CollectionFetchJob *list = new CollectionFetchJob( Collection( res3ColId ), CollectionFetchJob::Recursive, this );
   QVERIFY( list->exec() );
   QCOMPARE( list->collections().count(), 1 );
   QCOMPARE( col, list->collections().first() );
   QCOMPARE( col.name(), folderName );
 
   // modify collection
   col.setContentMimeTypes( QStringList( "message/rfc822'" ) );
   CollectionModifyJob *modify = new CollectionModifyJob( col, this );
   QVERIFY( modify->exec() );
 
   // collection statistics
   CollectionStatisticsJob *statistics = new CollectionStatisticsJob( col, this );
   QVERIFY( statistics->exec() );
   CollectionStatistics s = statistics->statistics();
   QCOMPARE( s.count(), 0ll );
   QCOMPARE( s.unreadCount(), 0ll );
 
   // delete collection
   CollectionDeleteJob *del = new CollectionDeleteJob( col, this );
   QVERIFY( del->exec() );
 }
 
 void CollectionJobTest::testMultiList()
 {
   Collection::List req;
   req << Collection( res1ColId ) << Collection( res2ColId );
   CollectionFetchJob* job = new CollectionFetchJob( req, this );
   QVERIFY( job->exec() );
 
   Collection::List res;
   res = job->collections();
   compareLists( res, req );
 }
 
 void CollectionJobTest::testSelect()
 {
   CollectionPathResolver *resolver = new CollectionPathResolver( "res1/foo", this );;
   QVERIFY( resolver->exec() );
   Collection col( resolver->collection() );
 
   CollectionSelectJob *job = new CollectionSelectJob( col, this );
   QVERIFY( job->exec() );
   QCOMPARE( job->unseen(), -1 );
 
   job = new CollectionSelectJob( col, this );
   job->setRetrieveStatus( true );
   QVERIFY( job->exec() );
   QVERIFY( job->unseen() > -1 );
 
   job = new CollectionSelectJob( Collection::root(), this );
   QVERIFY( job->exec() );
 
   job = new CollectionSelectJob( Collection( INT_MAX ), this );
   QVERIFY( !job->exec() );
 }
 
 void CollectionJobTest::testRidFetch()
 {
   Collection col;
   col.setRemoteId( "10" );
 
   CollectionFetchJob *job = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   job->setResource( "akonadi_knut_resource_0" );
   QVERIFY( job->exec() );
   QCOMPARE( job->collections().count(), 1 );
   col = job->collections().first();
   QVERIFY( col.isValid() );
   QCOMPARE( col.remoteId(), QString::fromLatin1( "10" ) );
 }
 
 void CollectionJobTest::testRidCreate()
 {
   Collection collection;
   collection.setName( "rid create" );
   collection.setParentRemoteId( "8" );
 
   ResourceSelectJob *resSel = new ResourceSelectJob( "akonadi_knut_resource_2" );
   AKVERIFYEXEC( resSel );
 
   CollectionCreateJob *createJob = new CollectionCreateJob( collection, this );
   AKVERIFYEXEC( createJob );
 
   Collection createdCol = createJob->collection();
   QVERIFY( createdCol.isValid() );
   QCOMPARE( createdCol.name(), collection.name() );
 
   CollectionFetchJob *listJob = new CollectionFetchJob( Collection( res3ColId ), CollectionFetchJob::FirstLevel, this );
   AKVERIFYEXEC( listJob );
   Collection listedCol = findCol( listJob->collections(), collection.name() );
   QCOMPARE( listedCol, createdCol );
   QCOMPARE( listedCol.name(), collection.name() );
 
   CollectionDeleteJob *delJob = new CollectionDeleteJob( createdCol, this );
   AKVERIFYEXEC( delJob );
 
   listJob = new CollectionFetchJob( Collection( res3ColId ), CollectionFetchJob::FirstLevel, this );
   AKVERIFYEXEC( listJob );
   QVERIFY( !findCol( listJob->collections(), collection.name() ).isValid() );
 }
 
 #include "collectionjobtest.moc"
diff --git a/akonadi/tests/monitortest.cpp b/akonadi/tests/monitortest.cpp
index 4b931a4bc..6222de4e9 100644
--- a/akonadi/tests/monitortest.cpp
+++ b/akonadi/tests/monitortest.cpp
@@ -1,320 +1,320 @@
 /*
     Copyright (c) 2006 Volker Krause <vkrause@kde.org>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     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 Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "monitortest.h"
 #include "test_utils.h"
 
 #include <akonadi/agentmanager.h>
 #include <akonadi/agentinstance.h>
 #include <akonadi/monitor.h>
 #include <akonadi/collectioncreatejob.h>
 #include <akonadi/collectiondeletejob.h>
 #include <akonadi/collectionfetchjob.h>
 #include <akonadi/collectionmodifyjob.h>
 #include <akonadi/collectionstatistics.h>
 #include <akonadi/control.h>
 #include <akonadi/itemcreatejob.h>
 #include <akonadi/itemdeletejob.h>
 #include <akonadi/itemfetchjob.h>
 #include <akonadi/itemfetchscope.h>
 #include <akonadi/itemmodifyjob.h>
 #include <akonadi/itemmovejob.h>
 #include <akonadi/searchcreatejob.h>
 
 #include <QtCore/QVariant>
 #include <QtGui/QApplication>
 #include <QtTest/QSignalSpy>
 #include <qtest_akonadi.h>
 
 using namespace Akonadi;
 
 QTEST_AKONADIMAIN( MonitorTest, NoGUI )
 
 static Collection res3;
 
 Q_DECLARE_METATYPE(Akonadi::Collection::Id)
 Q_DECLARE_METATYPE(QSet<QByteArray>)
 
 void MonitorTest::initTestCase()
 {
   Control::start();
 
   res3 = Collection( collectionIdFromPath( "res3" ) );
 
   // switch all resources offline to reduce interference from them
   foreach ( Akonadi::AgentInstance agent, Akonadi::AgentManager::self()->instances() )
     agent.setIsOnline( false );
 }
 
 void MonitorTest::testMonitor_data()
 {
   QTest::addColumn<bool>( "fetchCol" );
   QTest::newRow( "with collection fetching" ) << true;
   QTest::newRow( "without collection fetching" ) << false;
 }
 
 void MonitorTest::testMonitor()
 {
   QFETCH( bool, fetchCol );
 
   Monitor *monitor = new Monitor( this );
   monitor->setCollectionMonitored( Collection::root() );
   monitor->fetchCollection( fetchCol );
   monitor->itemFetchScope().fetchFullPayload();
 
   // monitor signals
   qRegisterMetaType<Akonadi::Collection>();
   qRegisterMetaType<Akonadi::Collection::Id>();
   qRegisterMetaType<Akonadi::Item>();
   qRegisterMetaType<Akonadi::CollectionStatistics>();
   qRegisterMetaType<QSet<QByteArray> >();
   QSignalSpy caddspy( monitor, SIGNAL(collectionAdded(Akonadi::Collection,Akonadi::Collection)) );
   QSignalSpy cmodspy( monitor, SIGNAL(collectionChanged(const Akonadi::Collection&)) );
   QSignalSpy crmspy( monitor, SIGNAL(collectionRemoved(const Akonadi::Collection&)) );
   QSignalSpy cstatspy( monitor, SIGNAL(collectionStatisticsChanged(Akonadi::Collection::Id,Akonadi::CollectionStatistics)) );
   QSignalSpy iaddspy( monitor, SIGNAL(itemAdded(const Akonadi::Item&, const Akonadi::Collection&)) );
   QSignalSpy imodspy( monitor, SIGNAL(itemChanged(const Akonadi::Item&, const QSet<QByteArray>&)) );
   QSignalSpy imvspy( monitor, SIGNAL(itemMoved(const Akonadi::Item&, const Akonadi::Collection&, const Akonadi::Collection&)) );
   QSignalSpy irmspy( monitor, SIGNAL(itemRemoved(const Akonadi::Item&)) );
 
   QVERIFY( caddspy.isValid() );
   QVERIFY( cmodspy.isValid() );
   QVERIFY( crmspy.isValid() );
   QVERIFY( cstatspy.isValid() );
   QVERIFY( iaddspy.isValid() );
   QVERIFY( imodspy.isValid() );
   QVERIFY( imvspy.isValid() );
   QVERIFY( irmspy.isValid() );
 
   // create a collection
   Collection monitorCol;
   monitorCol.setParent( res3 );
   monitorCol.setName( "monitor" );
   CollectionCreateJob *create = new CollectionCreateJob( monitorCol, this );
   QVERIFY( create->exec() );
   monitorCol = create->collection();
   QVERIFY( monitorCol.isValid() );
   QTest::qWait(1000); // make sure the DBus signal has been processed
 
   QCOMPARE( caddspy.count(), 1 );
   QList<QVariant> arg = caddspy.takeFirst();
   Collection col = arg.at(0).value<Collection>();
   QCOMPARE( col, monitorCol );
   if ( fetchCol )
     QCOMPARE( col.name(), QString("monitor") );
   Collection parent = arg.at(1).value<Collection>();
   QCOMPARE( parent, res3 );
 
   QVERIFY( cmodspy.isEmpty() );
   QVERIFY( crmspy.isEmpty() );
   QVERIFY( cstatspy.isEmpty() );
   QVERIFY( iaddspy.isEmpty() );
   QVERIFY( imodspy.isEmpty() );
   QVERIFY( imvspy.isEmpty() );
   QVERIFY( irmspy.isEmpty() );
 
   // add an item
   Item newItem;
   newItem.setMimeType( "application/octet-stream" );
   ItemCreateJob *append = new ItemCreateJob( newItem, monitorCol, this );
   QVERIFY( append->exec() );
   Item monitorRef = append->item();
   QVERIFY( monitorRef.isValid() );
   QTest::qWait(1000);
 
   QCOMPARE( cstatspy.count(), 1 );
   arg = cstatspy.takeFirst();
   QEXPECT_FAIL( "", "Don't know how to handle 'Akonadi::Collection::Id', use qRegisterMetaType to register it. <-- I did this, but it still doesn't work!", Continue );
   QCOMPARE( arg.at(0).value<Akonadi::Collection::Id>(), monitorCol.id() );
 
   /*
      qRegisterMetaType<Akonadi::Collection::Id>() registers the type with a
      name of "qlonglong".  Doing
-     qRegisterMetaType<Akonadi::Collection::Id>( "Akonadi::Collection::Id" ) 
+     qRegisterMetaType<Akonadi::Collection::Id>( "Akonadi::Collection::Id" )
      doesn't help.
 
      The problem here is that Akonadi::Collection::Id is a typedef to qlonglong,
      and qlonglong is already a registered meta type.  So the signal spy will
      give us a QVariant of type Akonadi::Collection::Id, but calling
      .value<Akonadi::Collection::Id>() on that variant will in fact end up
      calling qvariant_cast<qlonglong>.  From the point of view of QMetaType,
      Akonadi::Collection::Id and qlonglong are different types, so QVariant
      can't convert, and returns a default-constructed qlonglong, zero.
 
      When connecting to a real slot (without QSignalSpy), this problem is
      avoided, because the casting is done differently (via a lot of void
      pointers).
 
      The docs say nothing about qRegisterMetaType -ing a typedef, so I'm not
      sure if this is a bug or not. (cberzan)
    */
 
   QCOMPARE( iaddspy.count(), 1 );
   arg = iaddspy.takeFirst();
   Item item = arg.at( 0 ).value<Item>();
   QCOMPARE( item, monitorRef );
   QCOMPARE( item.mimeType(), QString::fromLatin1(  "application/octet-stream" ) );
   Collection collection = arg.at( 1 ).value<Collection>();
   QCOMPARE( collection.id(), monitorCol.id() );
 
   QVERIFY( caddspy.isEmpty() );
   QVERIFY( cmodspy.isEmpty() );
   QVERIFY( crmspy.isEmpty() );
   QVERIFY( imodspy.isEmpty() );
   QVERIFY( imvspy.isEmpty() );
   QVERIFY( irmspy.isEmpty() );
 
   // modify an item
   item.setPayload<QByteArray>( "some new content" );
   ItemModifyJob *store = new ItemModifyJob( item, this );
   QVERIFY( store->exec() );
   QTest::qWait(1000);
 
   QCOMPARE( cstatspy.count(), 1 );
   arg = cstatspy.takeFirst();
   QEXPECT_FAIL( "", "Don't know how to handle 'Akonadi::Collection::Id', use qRegisterMetaType to register it. <-- I did this, but it still doesn't work!", Continue );
   QCOMPARE( arg.at(0).value<Collection::Id>(), monitorCol.id() );
 
   QCOMPARE( imodspy.count(), 1 );
   arg = imodspy.takeFirst();
   item = arg.at( 0 ).value<Item>();
   QCOMPARE( monitorRef, item );
   QCOMPARE( item.payload<QByteArray>(), QByteArray( "some new content" ) );
   QSet<QByteArray> parts = arg.at( 1 ).value<QSet<QByteArray> >();
   QCOMPARE( parts, QSet<QByteArray>() << "PLD:RFC822" );
 
   QVERIFY( caddspy.isEmpty() );
   QVERIFY( cmodspy.isEmpty() );
   QVERIFY( crmspy.isEmpty() );
   QVERIFY( iaddspy.isEmpty() );
   QVERIFY( imvspy.isEmpty() );
   QVERIFY( irmspy.isEmpty() );
 
   // move an item
   ItemMoveJob *move = new ItemMoveJob( item, res3 );
   QVERIFY( move->exec() );
   QTest::qWait( 1000 );
 
   QCOMPARE( cstatspy.count(), 1 );
   arg = cstatspy.takeFirst();
   QEXPECT_FAIL( "", "Don't know how to handle 'Akonadi::Collection::Id', use qRegisterMetaType to register it. <-- I did this, but it still doesn't work!", Continue );
   QCOMPARE( arg.at(0).value<Collection::Id>(), monitorCol.id() );
 
   QCOMPARE( imvspy.count(), 1 );
   arg = imvspy.takeFirst();
   item = arg.at( 0 ).value<Item>(); // the item
   QCOMPARE( monitorRef, item );
   col = arg.at( 1 ).value<Collection>(); // the source collection
   QCOMPARE( col.id(), monitorCol.id() );
   col = arg.at( 2 ).value<Collection>(); // the destination collection
   QCOMPARE( col.id(), res3.id() );
 
   QCOMPARE( cmodspy.count(), 2 );
   arg = cmodspy.takeFirst();
   Collection col1 = arg.at( 0 ).value<Collection>();
   arg = cmodspy.takeFirst();
   Collection col2 = arg.at( 0 ).value<Collection>();
   // source and dest collections, in any order
   QVERIFY( ( col1.id() == monitorCol.id() && col2.id() == res3.id() ) ||
            ( col2.id() == monitorCol.id() && col1.id() == res3.id() ) );
 
   QVERIFY( caddspy.isEmpty() );
   QVERIFY( crmspy.isEmpty() );
   QVERIFY( iaddspy.isEmpty() );
   QVERIFY( imodspy.isEmpty() );
   QVERIFY( irmspy.isEmpty() );
 
   // delete an item
   ItemDeleteJob *del = new ItemDeleteJob( monitorRef, this );
   QVERIFY( del->exec() );
   QTest::qWait(1000);
 
   QCOMPARE( cstatspy.count(), 1 );
   arg = cstatspy.takeFirst();
   QEXPECT_FAIL( "", "Don't know how to handle 'Akonadi::Collection::Id', use qRegisterMetaType to register it. <-- I did this, but it still doesn't work!", Continue );
   QCOMPARE( arg.at(0).value<Collection::Id>(), monitorCol.id() );
   cmodspy.clear();
 
   QCOMPARE( irmspy.count(), 1 );
   arg = irmspy.takeFirst();
   Item ref = qvariant_cast<Item>( arg.at(0) );
   QCOMPARE( monitorRef, ref );
 
   QVERIFY( caddspy.isEmpty() );
   QVERIFY( cmodspy.isEmpty() );
   QVERIFY( crmspy.isEmpty() );
   QVERIFY( iaddspy.isEmpty() );
   QVERIFY( imodspy.isEmpty() );
   QVERIFY( imvspy.isEmpty() );
   imvspy.clear();
 
   // modify a collection
   monitorCol.setName( "changed name" );
   CollectionModifyJob *mod = new CollectionModifyJob( monitorCol, this );
-  QVERIFY( mod->exec() );
+  AKVERIFYEXEC( mod );
   QTest::qWait(1000);
 
   QCOMPARE( cmodspy.count(), 1 );
   arg = cmodspy.takeFirst();
   col = arg.at(0).value<Collection>();
   QCOMPARE( col, monitorCol );
   if ( fetchCol )
     QCOMPARE( col.name(), QString("changed name") );
 
   QVERIFY( caddspy.isEmpty() );
   QVERIFY( crmspy.isEmpty() );
   QVERIFY( cstatspy.isEmpty() );
   QVERIFY( iaddspy.isEmpty() );
   QVERIFY( imodspy.isEmpty() );
   QVERIFY( imvspy.isEmpty() );
   QVERIFY( irmspy.isEmpty() );
 
   // delete a collection
   CollectionDeleteJob *cdel = new CollectionDeleteJob( monitorCol, this );
   QVERIFY( cdel->exec() );
   QTest::qWait(1000);
 
   QCOMPARE( crmspy.count(), 1 );
   arg = crmspy.takeFirst();
   QCOMPARE( arg.at(0).value<Collection>().id(), monitorCol.id() );
 
   QVERIFY( caddspy.isEmpty() );
   QVERIFY( cmodspy.isEmpty() );
   QVERIFY( cstatspy.isEmpty() );
   QVERIFY( iaddspy.isEmpty() );
   QVERIFY( imodspy.isEmpty() );
   QVERIFY( imvspy.isEmpty() );
   QVERIFY( irmspy.isEmpty() );
 }
 
 void MonitorTest::testVirtualCollectionsMonitoring()
 {
   Monitor *monitor = new Monitor( this );
   monitor->setCollectionMonitored( Collection( 1 ) );   // top-level 'Search' collection
 
   QSignalSpy caddspy( monitor, SIGNAL(collectionAdded(Akonadi::Collection,Akonadi::Collection)) );
   QVERIFY( caddspy.isValid() );
 
   SearchCreateJob *job = new SearchCreateJob( "Test search collection", "test-search-query" );
-  QVERIFY( job->exec() );
+  AKVERIFYEXEC( job );
   QTest::qWait( 1000 );
   QCOMPARE( caddspy.count(), 1 );
 }
 
 #include "monitortest.moc"