Git commit fc655d4ad23425d955ad756e97fd402d5cfc03bb by Dan Vr=C3=A1til. Committed on 31/05/2015 at 23:09. Pushed by dvratil into branch 'dev/binary-protocol'. Start rewriting the handler testing infrastructure to use the streaming API M +1 -1 autotests/CMakeLists.txt M +3 -4 autotests/server/fakeclient.cpp M +2 -3 autotests/server/fakeclient.h M +0 -2 autotests/server/fakeconnection.cpp M +1 -1 autotests/server/fakedatastore.cpp M +28 -25 autotests/server/fakedatastore.h http://commits.kde.org/akonadi/fc655d4ad23425d955ad756e97fd402d5cfc03bb diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index b1fffe7..b37ae43 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(private) -#add_subdirectory(server) \ No newline at end of file +add_subdirectory(server) \ No newline at end of file diff --git a/autotests/server/fakeclient.cpp b/autotests/server/fakeclient.= cpp index 9f92eff..3557951 100644 --- a/autotests/server/fakeclient.cpp +++ b/autotests/server/fakeclient.cpp @@ -19,7 +19,7 @@ = #include "fakeclient.h" #include "fakeakonadiserver.h" -#include "imapstreamparser.h" + #include = #include @@ -133,12 +133,11 @@ void FakeClient::run() if (!mSocket->waitForConnected()) { akFatal() << "Failed to connect to FakeAkonadiServer"; } - mStreamParser =3D new ImapStreamParser(mSocket); + mStream.setDevice(mSocket); = exec(); = - delete mStreamParser; - mStreamParser =3D 0; + mStream.setDevice(Q_NULLPTR); mSocket->close(); delete mSocket; mSocket =3D 0; diff --git a/autotests/server/fakeclient.h b/autotests/server/fakeclient.h index 9885afa..1fdcf07 100644 --- a/autotests/server/fakeclient.h +++ b/autotests/server/fakeclient.h @@ -22,14 +22,13 @@ = #include #include +#include = class QLocalSocket; = namespace Akonadi { namespace Server { = -class ImapStreamParser; - class FakeClient : public QThread { Q_OBJECT @@ -55,8 +54,8 @@ private: mutable QMutex mMutex; = QList mScenario; - ImapStreamParser *mStreamParser; QLocalSocket *mSocket; + QDataStream mStream; }; } } diff --git a/autotests/server/fakeconnection.cpp b/autotests/server/fakecon= nection.cpp index 34d9b40..149f11e 100644 --- a/autotests/server/fakeconnection.cpp +++ b/autotests/server/fakeconnection.cpp @@ -18,7 +18,6 @@ */ = #include "fakeconnection.h" -#include "imapstreamparser.h" #include "response.h" #include "fakedatastore.h" #include "fakeakonadiserver.h" @@ -30,7 +29,6 @@ using namespace Akonadi::Server; FakeConnection::FakeConnection(quintptr socketDescriptor, QObject *parent) : Connection(socketDescriptor, parent) { - m_streamParser->setWaitTimeout(500); } = FakeConnection::FakeConnection(QObject *parent) diff --git a/autotests/server/fakedatastore.cpp b/autotests/server/fakedata= store.cpp index 3ba1d08..f0a6507 100644 --- a/autotests/server/fakedatastore.cpp +++ b/autotests/server/fakedatastore.cpp @@ -171,7 +171,7 @@ bool FakeDataStore::removeItemsTags(const PimItem::List= &items, } = bool FakeDataStore::removeItemParts(const PimItem &item, - const QList &parts) + const QVector &parts) { mChanges.insert(QLatin1String("remoteItemParts"), QVariantList() << QVariant::fromValue(item) diff --git a/autotests/server/fakedatastore.h b/autotests/server/fakedatast= ore.h index f8a8b56..e5d21e7 100644 --- a/autotests/server/fakedatastore.h +++ b/autotests/server/fakedatastore.h @@ -44,51 +44,54 @@ public: const QVector &flags, bool *flagsChanged =3D 0, const Collection &col =3D Collection(), - bool silent =3D false); + bool silent =3D false) Q_DECL_OVERRIDE; virtual bool appendItemsFlags(const PimItem::List &items, const QVector &flags, bool *flagsChanged =3D 0, bool checkIfExists =3D true, const Collection &col =3D Collection(), - bool silent =3D false); + bool silent =3D false) Q_DECL_OVERRIDE; virtual bool removeItemsFlags(const PimItem::List &items, const QVector &flags, bool *flagsChanged =3D 0, const Collection &col =3D Collection(), - bool silent =3D false); + bool silent =3D false) Q_DECL_OVERRIDE; = virtual bool setItemsTags(const PimItem::List &items, const Tag::List &tags, bool *tagsChanged =3D 0, - bool silent =3D false); + bool silent =3D false) Q_DECL_OVERRIDE; virtual bool appendItemsTags(const PimItem::List &items, const Tag::List &tags, bool *tagsChanged =3D 0, bool checkIfExists =3D true, const Collection &col =3D Collection(), - bool silent =3D false); + bool silent =3D false) Q_DECL_OVERRIDE; virtual bool removeItemsTags(const PimItem::List &items, const Tag::List &tags, bool *tagsChanged =3D 0, - bool silent =3D false); + bool silent =3D false) Q_DECL_OVERRIDE; = - virtual bool removeItemParts(const PimItem &item, const QList &parts); + virtual bool removeItemParts(const PimItem &item, + const QVector &parts) Q_DECL= _OVERRIDE; = - virtual bool invalidateItemCache(const PimItem &item); + virtual bool invalidateItemCache(const PimItem &item) Q_DECL_OVERRIDE; = - virtual bool appendCollection(Collection &collection); + virtual bool appendCollection(Collection &collection) Q_DECL_OVERRIDE; = - virtual bool cleanupCollection(Collection &collection); - virtual bool cleanupCollection_slow(Collection &collection); + virtual bool cleanupCollection(Collection &collection) Q_DECL_OVERRIDE; + virtual bool cleanupCollection_slow(Collection &collection) Q_DECL_OVE= RRIDE; = - virtual bool moveCollection(Collection &collection, const Collection &= newParent); + virtual bool moveCollection(Collection &collection, + const Collection &newParent) Q_DECL_OVERRI= DE; = - virtual bool appendMimeTypeForCollection(qint64 collectionId, const QS= tringList &mimeTypes); + virtual bool appendMimeTypeForCollection(qint64 collectionId, + const QStringList &mimeTypes)= Q_DECL_OVERRIDE; = - virtual void activeCachePolicy(Collection &col); + virtual void activeCachePolicy(Collection &col) Q_DECL_OVERRIDE; = virtual bool appendMimeType(const QString &mimetype, - qint64 *insertId =3D 0); + qint64 *insertId =3D 0) Q_DECL_OVERRIDE; virtual bool appendPimItem(QVector &parts, const MimeType &mimetype, const Collection &collection, @@ -96,24 +99,24 @@ public: const QString &remote_id, const QString &remoteRevision, const QString &gid, - PimItem &pimItem); + PimItem &pimItem) Q_DECL_OVERRIDE; = - virtual bool cleanupPimItems(const PimItem::List &items); + virtual bool cleanupPimItems(const PimItem::List &items) Q_DECL_OVERRI= DE; = - virtual bool unhidePimItem(PimItem &pimItem); - virtual bool unhideAllPimItems(); + virtual bool unhidePimItem(PimItem &pimItem) Q_DECL_OVERRIDE; + virtual bool unhideAllPimItems() Q_DECL_OVERRIDE; = virtual bool addCollectionAttribute(const Collection &col, const QByteArray &key, - const QByteArray &value); + const QByteArray &value) Q_DECL_OV= ERRIDE; virtual bool removeCollectionAttribute(const Collection &col, - const QByteArray &key); + const QByteArray &key) Q_DECL_O= VERRIDE; = - virtual bool beginTransaction(); - virtual bool rollbackTransaction(); - virtual bool commitTransaction(); + virtual bool beginTransaction() Q_DECL_OVERRIDE; + virtual bool rollbackTransaction() Q_DECL_OVERRIDE; + virtual bool commitTransaction() Q_DECL_OVERRIDE; = - virtual NotificationCollector *notificationCollector(); + virtual NotificationCollector *notificationCollector() Q_DECL_OVERRIDE; = void setPopulateDb(bool populate); =20