diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 14:27:19 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-07-31 17:12:48 +0200 |
commit | a6b3a1e4598f829b1b60407b2e47417db6f0e442 (patch) | |
tree | 4689912a67e2e7007d954683646f9f8f0a37e5c7 /tests/auto/corelib/serialization/json | |
parent | 13c90a0a752c6f67a4fb4078f190505b0c2c46d7 (diff) |
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>
Diffstat (limited to 'tests/auto/corelib/serialization/json')
34 files changed, 0 insertions, 239 deletions
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/10.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/10.bjson Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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\" ]"; |