From 37a7b035f8feb248d25741b22e22ffb0ec7463d6 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 18 Jan 2012 10:12:50 +0100 Subject: Import json support from playground/qtbinaryjson This imports the JSON support for Qt 5 from playground/qtbinaryjson. It adds a fast, fully compliant json parser, a convenient C++ API, conversion to and from QVariants and a binary format for JSON that is extremely fast to use together with the C++ API. Change-Id: If9e3a21a4241d388d0abaa446b6824f9cc6edb1c Reviewed-by: Thiago Macieira --- tests/benchmarks/corelib/json/json.pro | 6 + tests/benchmarks/corelib/json/numbers.json | 19 ++++ .../corelib/json/tst_bench_qtbinaryjson.cpp | 126 +++++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 tests/benchmarks/corelib/json/json.pro create mode 100644 tests/benchmarks/corelib/json/numbers.json create mode 100644 tests/benchmarks/corelib/json/tst_bench_qtbinaryjson.cpp (limited to 'tests/benchmarks/corelib/json') diff --git a/tests/benchmarks/corelib/json/json.pro b/tests/benchmarks/corelib/json/json.pro new file mode 100644 index 0000000000..14222b3fff --- /dev/null +++ b/tests/benchmarks/corelib/json/json.pro @@ -0,0 +1,6 @@ +TARGET = tst_bench_qtbinaryjson +QT = core testlib +CONFIG -= app_bundle +CONFIG += testcase + +SOURCES += tst_bench_qtbinaryjson.cpp diff --git a/tests/benchmarks/corelib/json/numbers.json b/tests/benchmarks/corelib/json/numbers.json new file mode 100644 index 0000000000..469156a78a --- /dev/null +++ b/tests/benchmarks/corelib/json/numbers.json @@ -0,0 +1,19 @@ +[ + { + "integer": 1234567890, + "real": -9876.543210, + "e": 0.123456789e-12, + "E": 1.234567890E+34, + "": 23456789012E66, + "zero": 0, + "one": 1 + }, + [ + -1234567890, + -1234567890, + -1234567890, + 1234567890, + 1234567890, + 1234567890 + ] +] diff --git a/tests/benchmarks/corelib/json/tst_bench_qtbinaryjson.cpp b/tests/benchmarks/corelib/json/tst_bench_qtbinaryjson.cpp new file mode 100644 index 0000000000..08340ff455 --- /dev/null +++ b/tests/benchmarks/corelib/json/tst_bench_qtbinaryjson.cpp @@ -0,0 +1,126 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +class BenchmarkQtBinaryJson: public QObject +{ + Q_OBJECT +public: + BenchmarkQtBinaryJson(QObject *parent = 0); + +private Q_SLOTS: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + + void parseNumbers(); + void parseJson(); + void parseJsonToVariant(); +}; + +BenchmarkQtBinaryJson::BenchmarkQtBinaryJson(QObject *parent) : QObject(parent) +{ + +} + +void BenchmarkQtBinaryJson::initTestCase() +{ + +} + +void BenchmarkQtBinaryJson::cleanupTestCase() +{ + +} + +void BenchmarkQtBinaryJson::init() +{ + +} + +void BenchmarkQtBinaryJson::cleanup() +{ + +} + +void BenchmarkQtBinaryJson::parseNumbers() +{ + QFile file(QLatin1String("numbers.json")); + file.open(QFile::ReadOnly); + QByteArray testJson = file.readAll(); + + QBENCHMARK { + QJsonDocument doc = QJsonDocument::fromJson(testJson); + QJsonObject object = doc.object(); + } +} + +void BenchmarkQtBinaryJson::parseJson() +{ + QFile file(QLatin1String("../../../auto/corelib/json/test.json")); + file.open(QFile::ReadOnly); + QByteArray testJson = file.readAll(); + + QBENCHMARK { + QJsonDocument doc = QJsonDocument::fromJson(testJson); + QJsonObject object = doc.object(); + } +} + +void BenchmarkQtBinaryJson::parseJsonToVariant() +{ + QFile file(QLatin1String("../../../auto/corelib/json/test.json")); + file.open(QFile::ReadOnly); + QByteArray testJson = file.readAll(); + + QBENCHMARK { + QJsonDocument doc = QJsonDocument::fromJson(testJson); + QVariant v = doc.toVariant(); + } +} + +QTEST_MAIN(BenchmarkQtBinaryJson) +#include "tst_bench_qtbinaryjson.moc" + -- cgit v1.2.3