diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 01:00:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 01:00:55 +0200 |
| commit | ba2b7b8e33635f29bae8e9e580b23a544de7727f (patch) | |
| tree | 15514c09367f27944bd8a9198217639846e1a4b5 /tests/auto/corelib/serialization | |
| parent | aadc294f2dd1c7e94a997f5797bc83b34d2c59ff (diff) | |
| parent | 43ea15d01cd491639d8cb5eb85da066f5d0a8571 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib58433da04bffb5dfab5486b80f17f39cc4145fa
Diffstat (limited to 'tests/auto/corelib/serialization')
| -rw-r--r-- | tests/auto/corelib/serialization/json/invalidBinaryData/38.bjson | 0 | ||||
| -rw-r--r-- | tests/auto/corelib/serialization/json/invalidBinaryData/39.bjson | bin | 0 -> 24 bytes | |||
| -rw-r--r-- | tests/auto/corelib/serialization/json/invalidBinaryData/40.json | bin | 0 -> 60 bytes | |||
| -rw-r--r-- | tests/auto/corelib/serialization/json/tst_qtjson.cpp | 1 |
4 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/38.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/38.bjson new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/auto/corelib/serialization/json/invalidBinaryData/38.bjson diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/39.bjson b/tests/auto/corelib/serialization/json/invalidBinaryData/39.bjson Binary files differnew file mode 100644 index 0000000000..c6025aa9eb --- /dev/null +++ b/tests/auto/corelib/serialization/json/invalidBinaryData/39.bjson diff --git a/tests/auto/corelib/serialization/json/invalidBinaryData/40.json b/tests/auto/corelib/serialization/json/invalidBinaryData/40.json Binary files differnew file mode 100644 index 0000000000..277096f8cb --- /dev/null +++ b/tests/auto/corelib/serialization/json/invalidBinaryData/40.json diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp index 99bdd8deb0..41c8f760dc 100644 --- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp +++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp @@ -1863,6 +1863,7 @@ void tst_QtJson::invalidBinaryData() 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()); } |