diff options
author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2012-04-11 15:59:00 +0200 |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2012-04-11 16:54:46 +0200 |
commit | 6b7df60a752422b1f6ff07bb2682c21e18a43985 (patch) | |
tree | 3e56bd3f4ee34a228777d00ff328ef1c53cb1df1 /tests/auto/jsondbqueryobject/testjsondbqueryobject.h | |
parent | 20549eedb5b5e852c0e384cd76bfbff14168dbda (diff) | |
parent | 7ef36e3c5a88560eb4e3a81c2c9f14059739108b (diff) |
Merge remote-tracking branch 'gerrit/master' into hbtreehbtree
Conflicts:
src/daemon/daemon.pri
src/daemon/jsondbview.cpp
src/partition/jsondbindex.cpp
src/partition/jsondbindex.h
src/partition/jsondbindexquery.h
src/partition/jsondbmanagedbtree.cpp
src/partition/jsondbmanagedbtree.h
src/partition/jsondbmanagedbtreetxn.cpp
src/partition/jsondbmanagedbtreetxn.h
src/partition/jsondbobjecttable.cpp
src/partition/jsondbobjecttable.h
src/partition/jsondbpartition.cpp
src/partition/jsondbpartition.h
tests/auto/auto.pro
tests/auto/partition/testpartition.cpp
tests/benchmarks/benchmarks.pro
Change-Id: I963adefd6d32fca9b3537981306b67538c759034
Diffstat (limited to 'tests/auto/jsondbqueryobject/testjsondbqueryobject.h')
-rw-r--r-- | tests/auto/jsondbqueryobject/testjsondbqueryobject.h | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/tests/auto/jsondbqueryobject/testjsondbqueryobject.h b/tests/auto/jsondbqueryobject/testjsondbqueryobject.h index c79745a..4c2645f 100644 --- a/tests/auto/jsondbqueryobject/testjsondbqueryobject.h +++ b/tests/auto/jsondbqueryobject/testjsondbqueryobject.h @@ -41,27 +41,13 @@ #ifndef TESTJSONDBQUERYOBJECT_H #define TESTJSONDBQUERYOBJECT_H -#include <QCoreApplication> -#include <QList> -#include <QTest> -#include <QFile> -#include <QProcess> -#include <QEventLoop> -#include <QDebug> -#include <QLocalSocket> -#include <QTimer> -#include <QJSValue> - -#include <jsondb-client.h> -#include <jsondb-error.h> - #include <QAbstractItemModel> -#include "clientwrapper.h" -#include "../../shared/qmltestutil.h" +#include "requestwrapper.h" +#include "qmltestutil.h" QT_USE_NAMESPACE_JSONDB -class TestJsonDbQueryObject: public ClientWrapper +class TestJsonDbQueryObject: public RequestWrapper { Q_OBJECT public: @@ -85,7 +71,7 @@ public slots: void errorSlot(const QVariantMap &newError); void finishedSlot(); -protected slots: +public: void timeout(); private: @@ -95,17 +81,12 @@ private: private: QProcess *mProcess; - QStringList mNotificationsReceived; QList<ComponentData*> mComponents; QString mPluginPath; + bool mTimedOut; - bool callbackError; - int callbackErrorCode; - QString callbackErrorMessage; - QVariantList cbData; - QEventLoop mEventLoop2; QObject *currentQmlElement; - + QVariantList callbackData; }; #endif |