QJsonObject: add QLatin1String overloads of non-const methods

Also optimized the existing QL1S overload of non-const operator[](), and
applied Extract Method refactoring to the other existing QL1S overloads.

[ChangeLog][QtCore][QJsonObject] Added insert(), remove(), and take()
overloads taking QLatin1String.

Change-Id: I5e737cf2d7d9ffb325d6981db1e4a6a9f093657b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
index 28c84fd30f..7b055b5b63 100644
--- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
@@ -437,6 +437,7 @@ void tst_QtJson::testObjectSimple()
     QCOMPARE(object.value("boolean").toBool(), true);
     QCOMPARE(object.value(QLatin1String("boolean")).toBool(), true);
     QJsonObject object2 = object;
+    QJsonObject object3 = object;
 
     QStringList keys = object.keys();
     QVERIFY2(keys.contains("number"), "key number not found");
@@ -479,6 +480,23 @@ void tst_QtJson::testObjectSimple()
     object2.insert(QStringView(u"string"), QString::fromLatin1("foo"));
     QVERIFY2(object2.value(QStringView(u"string")).toString() != before, "value should have been updated");
 
+    // same tests again but with QLatin1String keys
+    object3.insert(QLatin1String("value"), value);
+    QCOMPARE(object3.value("value"), value);
+
+    size = object3.size();
+    object3.remove(QLatin1String("boolean"));
+    QCOMPARE(object3.size(), size - 1);
+    QVERIFY2(!object3.contains("boolean"), "key boolean should have been removed");
+
+    taken = object3.take(QLatin1String("value"));
+    QCOMPARE(taken, value);
+    QVERIFY2(!object3.contains("value"), "key value should have been removed");
+
+    before = object3.value("string").toString();
+    object3.insert(QLatin1String("string"), QString::fromLatin1("foo"));
+    QVERIFY2(object3.value(QLatin1String("string")).toString() != before, "value should have been updated");
+
     size = object.size();
     QJsonObject subobject;
     subobject.insert("number", 42);
@@ -2716,6 +2734,8 @@ void tst_QtJson::longStrings()
     // test around 15 and 16 bit boundaries, as these are limits
     // in the data structures (for Latin1String in qjson_p.h)
     QString s(0x7ff0, 'a');
+    QByteArray ba(0x7ff0, 'a');
+    ba.append(0x8010 - 0x7ff0, 'c');
     for (int i = 0x7ff0; i < 0x8010; i++) {
         s.append(QLatin1Char('c'));
 
@@ -2732,9 +2752,21 @@ void tst_QtJson::longStrings()
         /* ... and a QByteArray from the QJsonDocument */
         QByteArray a2 = d2.toJson();
         QCOMPARE(a1, a2);
+
+        // Test long keys
+        QJsonObject o1, o2;
+        o1[s] = 42;
+        o2[QLatin1String(ba.data(), i + 1)] = 42;
+        d1.setObject(o1);
+        d2.setObject(o2);
+        a1 = d1.toJson();
+        a2 = d2.toJson();
+        QCOMPARE(a1, a2);
     }
 
     s = QString(0xfff0, 'a');
+    ba = QByteArray(0xfff0, 'a');
+    ba.append(0x10010 - 0xfff0, 'c');
     for (int i = 0xfff0; i < 0x10010; i++) {
         s.append(QLatin1Char('c'));
 
@@ -2751,6 +2783,16 @@ void tst_QtJson::longStrings()
         /* ... and a QByteArray from the QJsonDocument */
         QByteArray a2 = d2.toJson();
         QCOMPARE(a1, a2);
+
+        // Test long keys
+        QJsonObject o1, o2;
+        o1[s] = 42;
+        o2[QLatin1String(ba.data(), i + 1)] = 42;
+        d1.setObject(o1);
+        d2.setObject(o2);
+        a1 = d1.toJson();
+        a2 = d2.toJson();
+        QCOMPARE(a1, a2);
     }
 }