1 files changed, 50 insertions, 0 deletions
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index b215364f0e..417b9a4173 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -145,6 +145,9 @@ private Q_SLOTS:
     void parseErrorOffset_data();
     void parseErrorOffset();
 
+    void implicitValueType();
+    void implicitDocumentType();
+
 private:
     QString testDataDir;
 };
@@ -2908,5 +2911,52 @@ void tst_QtJson::parseErrorOffset()
     QCOMPARE(error.offset, errorOffset);
 }
 
+void tst_QtJson::implicitValueType()
+{
+    QJsonObject rootObject{
+        {"object", QJsonObject{{"value", 42}}},
+        {"array", QJsonArray{665, 666, 667}}
+    };
+
+    QJsonValue objectValue = rootObject["object"];
+    QCOMPARE(objectValue["value"].toInt(), 42);
+    QCOMPARE(objectValue["missingValue"], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(objectValue[123], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(objectValue["missingValue"].toInt(123), 123);
+
+    QJsonValue arrayValue = rootObject["array"];
+    QCOMPARE(arrayValue[1].toInt(), 666);
+    QCOMPARE(arrayValue[-1], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(arrayValue["asObject"], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(arrayValue[-1].toInt(123), 123);
+
+    const QJsonObject constObject = rootObject;
+    QCOMPARE(constObject["object"]["value"].toInt(), 42);
+    QCOMPARE(constObject["array"][1].toInt(), 666);
+
+    QJsonValue objectAsValue(rootObject);
+    QCOMPARE(objectAsValue["object"]["value"].toInt(), 42);
+    QCOMPARE(objectAsValue["array"][1].toInt(), 666);
+}
+
+void tst_QtJson::implicitDocumentType()
+{
+    QJsonDocument emptyDocument;
+    QCOMPARE(emptyDocument["asObject"], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(emptyDocument[123], QJsonValue(QJsonValue::Undefined));
+
+    QJsonDocument objectDocument(QJsonObject{{"value", 42}});
+    QCOMPARE(objectDocument["value"].toInt(), 42);
+    QCOMPARE(objectDocument["missingValue"], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(objectDocument[123], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(objectDocument["missingValue"].toInt(123), 123);
+
+    QJsonDocument arrayDocument(QJsonArray{665, 666, 667});
+    QCOMPARE(arrayDocument[1].toInt(), 666);
+    QCOMPARE(arrayDocument[-1], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(arrayDocument["asObject"], QJsonValue(QJsonValue::Undefined));
+    QCOMPARE(arrayDocument[-1].toInt(123), 123);
+}
+
 QTEST_MAIN(tst_QtJson)
 #include "tst_qtjson.moc"