diff options
| author | Denis Dzyubenko <[email protected]> | 2012-04-11 15:59:00 +0200 |
|---|---|---|
| committer | Denis Dzyubenko <[email protected]> | 2012-04-11 16:54:46 +0200 |
| commit | 6b7df60a752422b1f6ff07bb2682c21e18a43985 (patch) | |
| tree | 3e56bd3f4ee34a228777d00ff328ef1c53cb1df1 /tests/shared/util.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/shared/util.h')
| -rw-r--r-- | tests/shared/util.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/tests/shared/util.h b/tests/shared/util.h index 90e6535..93b4353 100644 --- a/tests/shared/util.h +++ b/tests/shared/util.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef UTIL_H -#define UTIL_H +#ifndef JSONDB_UTIL_H +#define JSONDB_UTIL_H #include <QFile> #include <QDir> @@ -49,6 +49,8 @@ #include <QLocalSocket> #include <qtestsystem.h> #include <qjsondocument.h> +#include <qjsonarray.h> +#include <qjsonobject.h> inline QString findFile(const QString &filename) { @@ -73,7 +75,7 @@ inline QString findFile(const char *filename) return findFile(QString::fromLocal8Bit(filename)); } -QJsonDocument readJsonFile(const QString &filename, QJsonParseError *error = 0) +inline QJsonValue readJsonFile(const QString &filename, QJsonParseError *error = 0) { QString filepath = filename; QFile jsonFile(filepath); @@ -82,16 +84,18 @@ QJsonDocument readJsonFile(const QString &filename, QJsonParseError *error = 0) error->error = QJsonParseError::MissingObject; error->offset = 0; } - return QJsonDocument(); + return QJsonValue(); } jsonFile.open(QIODevice::ReadOnly); QByteArray json = jsonFile.readAll(); QJsonDocument doc(QJsonDocument::fromJson(json, error)); - return doc; + return doc.isArray() ? QJsonValue(doc.array()) : QJsonValue(doc.object()); } -inline QProcess *launchJsonDbDaemon(const char *prefix, const QString &socketName, const QStringList &args) +inline QProcess *launchJsonDbDaemon(const char *prefix, const QString &socketName, const QStringList &args, const char *sourceFile) { + qputenv("JSONDB_CONFIG_SEARCH_PATH", QFileInfo(QString::fromUtf8(sourceFile)).dir().absolutePath().toUtf8()); + static bool dontlaunch = qgetenv("AUTOTEST_DONT_LAUNCH_JSONDB").toInt() == 1; static bool useValgrind = qgetenv("AUTOTEST_VALGRIND_JSONDB").toInt() == 1; if (dontlaunch) @@ -133,8 +137,10 @@ inline QProcess *launchJsonDbDaemon(const char *prefix, const QString &socketNam return process; } -inline qint64 launchJsonDbDaemonDetached(const char *prefix, const QString &socketName, const QStringList &args) +inline qint64 launchJsonDbDaemonDetached(const char *prefix, const QString &socketName, const QStringList &args, const char *sourceFile) { + qputenv("JSONDB_CONFIG_SEARCH_PATH", QFileInfo(QString::fromUtf8(sourceFile)).dir().absolutePath().toUtf8()); + static bool dontlaunch = qgetenv("AUTOTEST_DONT_LAUNCH_JSONDB").toInt() == 1; static bool useValgrind = qgetenv("AUTOTEST_VALGRIND_JSONDB").toInt() == 1; if (dontlaunch) @@ -169,4 +175,4 @@ inline qint64 launchJsonDbDaemonDetached(const char *prefix, const QString &sock return pid; } -#endif // UTIL_H +#endif // JSONDB_UTIL_H |