Improve symmetry of variant json conversions

Make QVariant::toJsonValue do conversions as well as
QJsonValue::fromVariant.

Change-Id: I175d43677061470691e2e0104a800be355fbbd3d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 49 insertions, 21 deletions

diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index 417b9a4173..1e3604ac9e 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -80,7 +80,10 @@ private Q_SLOTS:
 
     void undefinedValues();
 
+    void fromVariant_data();
     void fromVariant();
+    void toVariant_data();
+    void toVariant();
     void fromVariantMap();
     void fromVariantHash();
     void toVariantMap();
@@ -1095,8 +1098,11 @@ void tst_QtJson::undefinedValues()
     QCOMPARE(array.at(-1).type(), QJsonValue::Undefined);
 }
 
-void tst_QtJson::fromVariant()
+void tst_QtJson::fromVariant_data()
 {
+    QTest::addColumn<QVariant>("variant");
+    QTest::addColumn<QJsonValue>("jsonvalue");
+
     bool boolValue = true;
     int intValue = -1;
     uint uintValue = 1;
@@ -1119,44 +1125,66 @@ void tst_QtJson::fromVariant()
     variantList.append(doubleValue);
     variantList.append(stringValue);
     variantList.append(stringList);
-    variantList.append(QVariant());
+    variantList.append(QVariant::fromValue(nullptr));
     QJsonArray jsonArray_variant;
     jsonArray_variant.append(boolValue);
     jsonArray_variant.append(floatValue);
     jsonArray_variant.append(doubleValue);
     jsonArray_variant.append(stringValue);
     jsonArray_variant.append(jsonArray_string);
-    jsonArray_variant.append(QJsonValue());
+    jsonArray_variant.append(QJsonValue(QJsonValue::Null));
 
     QVariantMap variantMap;
     variantMap["bool"] = boolValue;
     variantMap["float"] = floatValue;
     variantMap["string"] = stringValue;
     variantMap["array"] = variantList;
+    QVariantHash variantHash;
+    variantHash["bool"] = boolValue;
+    variantHash["float"] = floatValue;
+    variantHash["string"] = stringValue;
+    variantHash["array"] = variantList;
     QJsonObject jsonObject;
     jsonObject["bool"] = boolValue;
     jsonObject["float"] = floatValue;
     jsonObject["string"] = stringValue;
     jsonObject["array"] = jsonArray_variant;
 
-    QCOMPARE(QJsonValue::fromVariant(QVariant::fromValue(nullptr)), QJsonValue(QJsonValue::Null));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(boolValue)), QJsonValue(boolValue));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(intValue)), QJsonValue(intValue));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(uintValue)), QJsonValue(static_cast<double>(uintValue)));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(longlongValue)), QJsonValue(longlongValue));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(ulonglongValue)), QJsonValue(static_cast<double>(ulonglongValue)));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(floatValue)), QJsonValue(static_cast<double>(floatValue)));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(doubleValue)), QJsonValue(doubleValue));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(stringValue)), QJsonValue(stringValue));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(stringList)), QJsonValue(jsonArray_string));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(variantList)), QJsonValue(jsonArray_variant));
-    QCOMPARE(QJsonValue::fromVariant(QVariant(variantMap)), QJsonValue(jsonObject));
-
-    QVERIFY(QJsonValue::fromVariant(QVariant(QJsonValue(true))).isBool());
-    QVERIFY(QJsonValue::fromVariant(QVariant(jsonArray_string)).isArray());
-    QVERIFY(QJsonValue::fromVariant(QVariant(QJsonDocument(jsonArray_string))).isArray());
-    QVERIFY(QJsonValue::fromVariant(QVariant(jsonObject)).isObject());
-    QVERIFY(QJsonValue::fromVariant(QVariant(QJsonDocument(jsonObject))).isObject());
+    QTest::newRow("nullptr") << QVariant::fromValue(nullptr) <<  QJsonValue(QJsonValue::Null);
+    QTest::newRow("bool") << QVariant(boolValue) <<  QJsonValue(boolValue);
+    QTest::newRow("int") << QVariant(intValue) <<  QJsonValue(intValue);
+    QTest::newRow("uint") << QVariant(uintValue) <<  QJsonValue(static_cast<double>(uintValue));
+    QTest::newRow("longlong") << QVariant(longlongValue) <<  QJsonValue(longlongValue);
+    QTest::newRow("ulonglong") << QVariant(ulonglongValue) <<  QJsonValue(static_cast<double>(ulonglongValue));
+    QTest::newRow("float") << QVariant(floatValue) <<  QJsonValue(floatValue);
+    QTest::newRow("double") << QVariant(doubleValue) <<  QJsonValue(doubleValue);
+    QTest::newRow("string") << QVariant(stringValue) <<  QJsonValue(stringValue);
+    QTest::newRow("stringList") << QVariant(stringList) <<  QJsonValue(jsonArray_string);
+    QTest::newRow("variantList") << QVariant(variantList) <<  QJsonValue(jsonArray_variant);
+    QTest::newRow("variantMap") << QVariant(variantMap) <<  QJsonValue(jsonObject);
+    QTest::newRow("variantHash") << QVariant(variantHash) <<  QJsonValue(jsonObject);
+}
+
+void tst_QtJson::fromVariant()
+{
+    QFETCH( QVariant, variant );
+    QFETCH( QJsonValue, jsonvalue );
+
+    QCOMPARE(QJsonValue::fromVariant(variant), jsonvalue);
+    QCOMPARE(variant.toJsonValue(), jsonvalue);
+}
+
+void tst_QtJson::toVariant_data()
+{
+    fromVariant_data();
+}
+
+void tst_QtJson::toVariant()
+{
+    QFETCH( QVariant, variant );
+    QFETCH( QJsonValue, jsonvalue );
+
+    QCOMPARE(jsonvalue.toVariant(), variant);
 }
 
 void tst_QtJson::fromVariantMap()