Remove deprecated binary json feature

Deprecated in 5.15 in favor of CBOR.

Fixes: QTBUG-81239
Change-Id: I711d4bd7dd1247f58e77ac9fa53304cbe5028918
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

37 files changed, 19 insertions, 291 deletions

diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/10.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/10.bjson
deleted file mode 100644
index 12b29b7aa5..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/10.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/11.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/11.bjson
deleted file mode 100644
index cf2b612111..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/11.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/12.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/12.bjson
deleted file mode 100644
index 9c2403350e..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/12.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/13.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/13.bjson
deleted file mode 100644
index db6308b1fd..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/13.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/14.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/14.bjson
deleted file mode 100644
index 347da4572c..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/14.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/15.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/15.bjson
deleted file mode 100644
index c6c5558934..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/15.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/16.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/16.bjson
deleted file mode 100644
index ae8b57446d..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/16.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/17.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/17.bjson
deleted file mode 100644
index 32f0cc0e23..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/17.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/18.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/18.bjson
deleted file mode 100644
index 50c89169eb..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/18.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/19.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/19.bjson
deleted file mode 100644
index b922212f45..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/19.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/20.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/20.bjson
deleted file mode 100644
index c965a0d294..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/20.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/21.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/21.bjson
deleted file mode 100644
index 98165ee40c..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/21.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/22.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/22.bjson
deleted file mode 100644
index 151f773a81..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/22.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/23.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/23.bjson
deleted file mode 100644
index 6eb5269470..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/23.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/24.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/24.bjson
deleted file mode 100644
index c55a2a3e3b..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/24.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/25.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/25.bjson
deleted file mode 100644
index 6c619f2ae1..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/25.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/26.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/26.bjson
deleted file mode 100644
index 3bf303215a..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/26.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/27.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/27.bjson
deleted file mode 100644
index d2656c2287..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/27.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/28.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/28.bjson
deleted file mode 100644
index 6797cf8c40..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/28.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/29.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/29.bjson
deleted file mode 100644
index 0645dfc3b2..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/29.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/30.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/30.bjson
deleted file mode 100644
index f77fe1efd0..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/30.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/31.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/31.bjson
deleted file mode 100644
index d9840b6582..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/31.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/32.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/32.bjson
deleted file mode 100644
index 1de4cb829f..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/32.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/33.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/33.bjson
deleted file mode 100644
index 532a31dc08..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/33.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/34.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/34.bjson
deleted file mode 100644
index f498558eff..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/34.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/35.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/35.bjson
deleted file mode 100644
index 8701210755..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/35.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/36.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/36.bjson
deleted file mode 100644
index ef5864e911..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/36.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/37.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/37.bjson
deleted file mode 100644
index f4dd4ae12f..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/37.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/38.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/38.bjson
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/38.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/39.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/39.bjson
deleted file mode 100644
index c6025aa9eb..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/39.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/40.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/40.bjson
deleted file mode 100644
index 277096f8cb..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/40.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/41.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/41.bjson
deleted file mode 100644
index 0b5940ab95..0000000000
--- a/tests/auto/corelib/serialization/json/invalidBinaryData/41.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/test.bjson b/tests/auto/corelib/serialization/json/test.bjson
deleted file mode 100644
index 137b4dfeff..0000000000
--- a/tests/auto/corelib/serialization/json/test.bjson
+++ /dev/null
diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
index 0cc38e0845..bc3fc1ce24 100644
--- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
@@ -103,26 +103,16 @@ private Q_SLOTS:
     void toJsonLargeNumericValues();
     void fromJson();
     void fromJsonErrors();
-    void fromBinary();
-    void toAndFromBinary_data();
-    void toAndFromBinary();
-    void invalidBinaryData();
     void parseNumbers();
     void parseStrings();
     void parseDuplicateKeys();
     void testParser();
 
-    void compactArray();
-    void compactObject();
-
-    void validation();
-
     void assignToDocument();
 
     void testDuplicateKeys();
     void testCompaction();
     void testDebugStream();
-    void testCompactionError();
 
     void parseUnicodeEscapes();
 
@@ -864,8 +854,6 @@ void tst_QtJson::testArrayNestedEmpty()
     object.insert("count", 0.);
     QCOMPARE(object.value("inner").toArray().size(), 0);
     QVERIFY(object.value("inner").toArray().isEmpty());
-    QJsonDocument(object).toBinaryData();
-    QCOMPARE(object.value("inner").toArray().size(), 0);
 }
 
 void tst_QtJson::testObjectNestedEmpty()
@@ -883,15 +871,6 @@ void tst_QtJson::testObjectNestedEmpty()
     object.insert("count", 0.);
     QCOMPARE(object.value("inner").toObject().size(), 0);
     QCOMPARE(object.value("inner").type(), QJsonValue::Object);
-    QJsonDocument(object).toBinaryData();
-    QVERIFY(object.value("inner").toObject().isEmpty());
-    QVERIFY(object.value("inner2").toObject().isEmpty());
-    QJsonDocument doc = QJsonDocument::fromBinaryData(QJsonDocument(object).toBinaryData());
-    QVERIFY(!doc.isNull());
-    QJsonObject reconstituted(doc.object());
-    QCOMPARE(reconstituted.value("inner").toObject().size(), 0);
-    QCOMPARE(reconstituted.value("inner").type(), QJsonValue::Object);
-    QCOMPARE(reconstituted.value("inner2").type(), QJsonValue::Object);
 }
 
 void tst_QtJson::testArrayComfortOperators()
@@ -2074,64 +2053,6 @@ void tst_QtJson::fromJsonErrors()
     }
 }
 
-void tst_QtJson::fromBinary()
-{
-    QFile file(testDataDir + "/test.json");
-    file.open(QFile::ReadOnly);
-    QByteArray testJson = file.readAll();
-
-    QJsonDocument doc = QJsonDocument::fromJson(testJson);
-    QJsonDocument outdoc = QJsonDocument::fromBinaryData(doc.toBinaryData());
-    QVERIFY(!outdoc.isNull());
-    QCOMPARE(doc, outdoc);
-
-    QFile bfile(testDataDir + "/test.bjson");
-    bfile.open(QFile::ReadOnly);
-    QByteArray binary = bfile.readAll();
-
-    QJsonDocument bdoc = QJsonDocument::fromBinaryData(binary);
-    QVERIFY(!bdoc.isNull());
-    QCOMPARE(doc.toVariant(), bdoc.toVariant());
-    QCOMPARE(doc, bdoc);
-}
-
-void tst_QtJson::toAndFromBinary_data()
-{
-    QTest::addColumn<QString>("filename");
-    QTest::newRow("test.json") << (testDataDir + "/test.json");
-    QTest::newRow("test2.json") << (testDataDir + "/test2.json");
-}
-
-void tst_QtJson::toAndFromBinary()
-{
-    QFETCH(QString, filename);
-    QFile file(filename);
-    QVERIFY(file.open(QFile::ReadOnly));
-    QByteArray data = file.readAll();
-
-    QJsonDocument doc = QJsonDocument::fromJson(data);
-    QVERIFY(!doc.isNull());
-    QJsonDocument outdoc = QJsonDocument::fromBinaryData(doc.toBinaryData());
-    QVERIFY(!outdoc.isNull());
-    QCOMPARE(doc, outdoc);
-}
-
-void tst_QtJson::invalidBinaryData()
-{
-    QDir dir(testDataDir + "/invalidBinaryData");
-    QFileInfoList files = dir.entryInfoList();
-    for (int i = 0; i < files.size(); ++i) {
-        if (!files.at(i).isFile())
-            continue;
-        QFile file(files.at(i).filePath());
-        file.open(QIODevice::ReadOnly);
-        QByteArray bytes = file.readAll();
-        bytes.squeeze();
-        QJsonDocument document = QJsonDocument::fromRawData(bytes.constData(), bytes.size());
-        QVERIFY(document.isNull());
-    }
-}
-
 void tst_QtJson::parseNumbers()
 {
     {
@@ -2308,131 +2229,6 @@ void tst_QtJson::testParser()
     QVERIFY(!doc.isEmpty());
 }
 
-void tst_QtJson::compactArray()
-{
-    QJsonArray array;
-    array.append(QLatin1String("First Entry"));
-    array.append(QLatin1String("Second Entry"));
-    array.append(QLatin1String("Third Entry"));
-    QJsonDocument doc(array);
-    int s =  doc.toBinaryData().size();
-    array.removeAt(1);
-    doc.setArray(array);
-    QVERIFY(s > doc.toBinaryData().size());
-    s = doc.toBinaryData().size();
-    QCOMPARE(doc.toJson(),
-             QByteArray("[\n"
-                        "    \"First Entry\",\n"
-                        "    \"Third Entry\"\n"
-                        "]\n"));
-
-    array.removeAt(0);
-    doc.setArray(array);
-    QVERIFY(s > doc.toBinaryData().size());
-    s = doc.toBinaryData().size();
-    QCOMPARE(doc.toJson(),
-             QByteArray("[\n"
-                        "    \"Third Entry\"\n"
-                        "]\n"));
-
-    array.removeAt(0);
-    doc.setArray(array);
-    QVERIFY(s > doc.toBinaryData().size());
-    s = doc.toBinaryData().size();
-    QCOMPARE(doc.toJson(),
-             QByteArray("[\n"
-                        "]\n"));
-
-}
-
-void tst_QtJson::compactObject()
-{
-    QJsonObject object;
-    object.insert(QLatin1String("Key1"), QLatin1String("First Entry"));
-    object.insert(QLatin1String("Key2"), QLatin1String("Second Entry"));
-    object.insert(QLatin1String("Key3"), QLatin1String("Third Entry"));
-    QJsonDocument doc(object);
-    int s =  doc.toBinaryData().size();
-    object.remove(QLatin1String("Key2"));
-    doc.setObject(object);
-    QVERIFY(s > doc.toBinaryData().size());
-    s = doc.toBinaryData().size();
-    QCOMPARE(doc.toJson(),
-             QByteArray("{\n"
-                        "    \"Key1\": \"First Entry\",\n"
-                        "    \"Key3\": \"Third Entry\"\n"
-                        "}\n"));
-
-    object.remove(QLatin1String("Key1"));
-    doc.setObject(object);
-    QVERIFY(s > doc.toBinaryData().size());
-    s = doc.toBinaryData().size();
-    QCOMPARE(doc.toJson(),
-             QByteArray("{\n"
-                        "    \"Key3\": \"Third Entry\"\n"
-                        "}\n"));
-
-    object.remove(QLatin1String("Key3"));
-    doc.setObject(object);
-    QVERIFY(s > doc.toBinaryData().size());
-    s = doc.toBinaryData().size();
-    QCOMPARE(doc.toJson(),
-             QByteArray("{\n"
-                        "}\n"));
-
-}
-
-void tst_QtJson::validation()
-{
-    // this basically tests that we don't crash on corrupt data
-    QFile file(testDataDir + "/test.json");
-    QVERIFY(file.open(QFile::ReadOnly));
-    QByteArray testJson = file.readAll();
-    QVERIFY(!testJson.isEmpty());
-
-    QJsonDocument doc = QJsonDocument::fromJson(testJson);
-    QVERIFY(!doc.isNull());
-
-    QByteArray binary = doc.toBinaryData();
-
-    // only test the first 1000 bytes. Testing the full file takes too long
-    for (int i = 0; i < 1000; ++i) {
-        QByteArray corrupted = binary;
-        corrupted[i] = char(0xff);
-        QJsonDocument doc = QJsonDocument::fromBinaryData(corrupted);
-        if (doc.isNull())
-            continue;
-        QByteArray json = doc.toJson();
-    }
-
-
-    QFile file2(testDataDir + "/test3.json");
-    file2.open(QFile::ReadOnly);
-    testJson = file2.readAll();
-    QVERIFY(!testJson.isEmpty());
-
-    doc = QJsonDocument::fromJson(testJson);
-    QVERIFY(!doc.isNull());
-
-    binary = doc.toBinaryData();
-
-    for (int i = 0; i < binary.size(); ++i) {
-        QByteArray corrupted = binary;
-        corrupted[i] = char(0xff);
-        QJsonDocument doc = QJsonDocument::fromBinaryData(corrupted);
-        if (doc.isNull())
-            continue;
-        QByteArray json = doc.toJson();
-
-        corrupted = binary;
-        corrupted[i] = 0x00;
-        doc = QJsonDocument::fromBinaryData(corrupted);
-        if (doc.isNull())
-            continue;
-        json = doc.toJson();
-    }
-}
-
 void tst_QtJson::assignToDocument()
 {
     {
@@ -2482,13 +2278,6 @@ void tst_QtJson::testCompaction()
     }
     QCOMPARE(obj.size(), 1);
     QCOMPARE(obj.value(QLatin1String("foo")).toString(), QLatin1String("bar"));
-
-    QJsonDocument doc = QJsonDocument::fromBinaryData(QJsonDocument(obj).toBinaryData());
-    QVERIFY(!doc.isNull());
-    QVERIFY(!doc.isEmpty());
-    QCOMPARE(doc.isArray(), false);
-    QCOMPARE(doc.isObject(), true);
-    QCOMPARE(doc.object(), obj);
 }
 
 void tst_QtJson::testDebugStream()
@@ -2578,34 +2367,6 @@ void tst_QtJson::testDebugStream()
     }
 }
 
-void tst_QtJson::testCompactionError()
-{
-    QJsonObject schemaObject;
-    schemaObject.insert("_Type", QLatin1String("_SchemaType"));
-    schemaObject.insert("name", QLatin1String("Address"));
-    schemaObject.insert("schema", QJsonObject());
-    {
-        QJsonObject content(schemaObject);
-        QJsonDocument doc(content);
-        QVERIFY(!doc.isNull());
-        QByteArray hash = QCryptographicHash::hash(doc.toBinaryData(), QCryptographicHash::Md5).toHex();
-        schemaObject.insert("_Version", QString::fromLatin1(hash.constData(), hash.size()));
-    }
-
-    QJsonObject schema;
-    schema.insert("streetNumber", schema.value("number").toObject());
-    schemaObject.insert("schema", schema);
-    {
-        QJsonObject content(schemaObject);
-        content.remove("_Uuid");
-        content.remove("_Version");
-        QJsonDocument doc(content);
-        QVERIFY(!doc.isNull());
-        QByteArray hash = QCryptographicHash::hash(doc.toBinaryData(), QCryptographicHash::Md5).toHex();
-        schemaObject.insert("_Version", QString::fromLatin1(hash.constData(), hash.size()));
-    }
-}
-
 void tst_QtJson::parseUnicodeEscapes()
 {
     const QByteArray json = "[ \"A\\u00e4\\u00C4\" ]";
diff --git a/tests/benchmarks/corelib/json/CMakeLists.txt b/tests/benchmarks/corelib/json/CMakeLists.txt
index 2f81190182..2108deb6bb 100644
--- a/tests/benchmarks/corelib/json/CMakeLists.txt
+++ b/tests/benchmarks/corelib/json/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from json.pro.
 
 #####################################################################
-## tst_bench_qtbinaryjson Binary:
+## tst_bench_qtjson Binary:
 #####################################################################
 
-qt_add_benchmark(tst_bench_qtbinaryjson
+qt_add_benchmark(tst_bench_qtjson
     SOURCES
-        tst_bench_qtbinaryjson.cpp
+        tst_bench_qtjson.cpp
     PUBLIC_LIBRARIES
         Qt::Test
 )
diff --git a/tests/benchmarks/corelib/json/json.pro b/tests/benchmarks/corelib/json/json.pro
index 8f9e515cb9..c26168945d 100644
--- a/tests/benchmarks/corelib/json/json.pro
+++ b/tests/benchmarks/corelib/json/json.pro
@@ -2,7 +2,7 @@ QT = core testlib
 CONFIG += benchmark
 CONFIG -= app_bundle
 
-TARGET = tst_bench_qtbinaryjson
-SOURCES += tst_bench_qtbinaryjson.cpp
+TARGET = tst_bench_qtjson
+SOURCES += tst_bench_qtjson.cpp
 
 TESTDATA = numbers.json test.json
diff --git a/tests/benchmarks/corelib/json/tst_bench_qtbinaryjson.cpp b/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp
index ba61496c82..3a7996f4e7 100644
--- a/tests/benchmarks/corelib/json/tst_bench_qtbinaryjson.cpp
+++ b/tests/benchmarks/corelib/json/tst_bench_qtjson.cpp
@@ -30,11 +30,11 @@
 #include <qjsondocument.h>
 #include <qjsonobject.h>
 
-class BenchmarkQtBinaryJson: public QObject
+class BenchmarkQtJson: public QObject
 {
     Q_OBJECT
 public:
-    BenchmarkQtBinaryJson(QObject *parent = 0);
+    BenchmarkQtJson(QObject *parent = 0);
 
 private Q_SLOTS:
     void initTestCase();
@@ -46,39 +46,36 @@ private Q_SLOTS:
     void parseJson();
     void parseJsonToVariant();
 
-    void toByteArray();
-    void fromByteArray();
-
     void jsonObjectInsert();
     void variantMapInsert();
 };
 
-BenchmarkQtBinaryJson::BenchmarkQtBinaryJson(QObject *parent) : QObject(parent)
+BenchmarkQtJson::BenchmarkQtJson(QObject *parent) : QObject(parent)
 {
 
 }
 
-void BenchmarkQtBinaryJson::initTestCase()
+void BenchmarkQtJson::initTestCase()
 {
 
 }
 
-void BenchmarkQtBinaryJson::cleanupTestCase()
+void BenchmarkQtJson::cleanupTestCase()
 {
 
 }
 
-void BenchmarkQtBinaryJson::init()
+void BenchmarkQtJson::init()
 {
 
 }
 
-void BenchmarkQtBinaryJson::cleanup()
+void BenchmarkQtJson::cleanup()
 {
 
 }
 
-void BenchmarkQtBinaryJson::parseNumbers()
+void BenchmarkQtJson::parseNumbers()
 {
     QString testFile = QFINDTESTDATA("numbers.json");
     QVERIFY2(!testFile.isEmpty(), "cannot find test file numbers.json!");
@@ -92,7 +89,7 @@ void BenchmarkQtBinaryJson::parseNumbers()
     }
 }
 
-void BenchmarkQtBinaryJson::parseJson()
+void BenchmarkQtJson::parseJson()
 {
     QString testFile = QFINDTESTDATA("test.json");
     QVERIFY2(!testFile.isEmpty(), "cannot find test file test.json!");
@@ -106,7 +103,7 @@ void BenchmarkQtBinaryJson::parseJson()
     }
 }
 
-void BenchmarkQtBinaryJson::parseJsonToVariant()
+void BenchmarkQtJson::parseJsonToVariant()
 {
     QString testFile = QFINDTESTDATA("test.json");
     QVERIFY2(!testFile.isEmpty(), "cannot find test file test.json!");
@@ -120,37 +117,7 @@ void BenchmarkQtBinaryJson::parseJsonToVariant()
     }
 }
 
-void BenchmarkQtBinaryJson::toByteArray()
-{
-    // Example: send information over a datastream to another process
-    // Measure performance of creating and processing data into bytearray
-    QBENCHMARK {
-        QVariantMap message;
-        message.insert("command", 1);
-        message.insert("key", "some information");
-        message.insert("env", "some environment variables");
-        QByteArray msg = QJsonDocument(QJsonObject::fromVariantMap(message)).toBinaryData();
-    }
-}
-
-void BenchmarkQtBinaryJson::fromByteArray()
-{
-    // Example: receive information over a datastream from another process
-    // Measure performance of converting content back to QVariantMap
-    // We need to recreate the bytearray but here we only want to measure the latter
-    QVariantMap message;
-    message.insert("command", 1);
-    message.insert("key", "some information");
-    message.insert("env", "some environment variables");
-    QByteArray msg = QJsonDocument(QJsonObject::fromVariantMap(message)).toBinaryData();
-
-    QBENCHMARK {
-        QVariantMap message;
-        message = QJsonDocument::fromBinaryData(msg, QJsonDocument::Validate).object().toVariantMap();
-    }
-}
-
-void BenchmarkQtBinaryJson::jsonObjectInsert()
+void BenchmarkQtJson::jsonObjectInsert()
 {
     QJsonObject object;
     QString test(QStringLiteral("testString"));
@@ -162,7 +129,7 @@ void BenchmarkQtBinaryJson::jsonObjectInsert()
     }
 }
 
-void BenchmarkQtBinaryJson::variantMapInsert()
+void BenchmarkQtJson::variantMapInsert()
 {
     QVariantMap object;
     QString test(QStringLiteral("testString"));
@@ -174,6 +141,6 @@ void BenchmarkQtBinaryJson::variantMapInsert()
     }
 }
 
-QTEST_MAIN(BenchmarkQtBinaryJson)
-#include "tst_bench_qtbinaryjson.moc"
+QTEST_MAIN(BenchmarkQtJson)
+#include "tst_bench_qtjson.moc"