From 507f1889e2b21d0b3367715dc5e63e124433a992 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 22 Aug 2013 16:25:13 +0200 Subject: Add QJsonValue::toInt(). It's a nice feature to have. MSVC also complains about using doubles to create enum values, so the ugly workaround is: enumValue = MyEnum(qRound(json["myEnumValue"].toDouble())); [ChangeLog][QtCore][QJsonValue]Added QJsonValue::toInt(). Change-Id: I1a200b912abf66b2e96390b1980caff26cfa2685 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- tests/auto/corelib/json/tst_qtjson.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp index 9111c59408..9dbd6414ad 100644 --- a/tests/auto/corelib/json/tst_qtjson.cpp +++ b/tests/auto/corelib/json/tst_qtjson.cpp @@ -449,13 +449,13 @@ void tst_QtJson::testObjectSimple() void tst_QtJson::testObjectSmallKeys() { QJsonObject data1; - data1.insert(QStringLiteral("1"), 123); + data1.insert(QStringLiteral("1"), 123.); QVERIFY(data1.contains(QStringLiteral("1"))); QCOMPARE(data1.value(QStringLiteral("1")).toDouble(), (double)123); - data1.insert(QStringLiteral("12"), 133); + data1.insert(QStringLiteral("12"), 133.); QCOMPARE(data1.value(QStringLiteral("12")).toDouble(), (double)133); QVERIFY(data1.contains(QStringLiteral("12"))); - data1.insert(QStringLiteral("123"), 323); + data1.insert(QStringLiteral("123"), 323.); QCOMPARE(data1.value(QStringLiteral("12")).toDouble(), (double)133); QVERIFY(data1.contains(QStringLiteral("123"))); QCOMPARE(data1.value(QStringLiteral("123")).type(), QJsonValue::Double); @@ -670,11 +670,15 @@ void tst_QtJson::testValueRef() array.append(1.); array.append(2.); array.append(3.); + array.append(4); + array.append(4.1); array[1] = false; - QCOMPARE(array.size(), 3); + QCOMPARE(array.size(), 5); QCOMPARE(array.at(0).toDouble(), 1.); QCOMPARE(array.at(2).toDouble(), 3.); + QCOMPARE(array.at(3).toInt(), 4); + QCOMPARE(array.at(4).toInt(), 0); QCOMPARE(array.at(1).type(), QJsonValue::Bool); QCOMPARE(array.at(1).toBool(), false); @@ -2170,6 +2174,16 @@ void tst_QtJson::valueEquals() QVERIFY(QJsonValue(true) != QJsonValue(QJsonArray())); QVERIFY(QJsonValue(true) != QJsonValue(QJsonObject())); + QVERIFY(QJsonValue(1) == QJsonValue(1)); + QVERIFY(QJsonValue(1) != QJsonValue(2)); + QVERIFY(QJsonValue(1) == QJsonValue(1.)); + QVERIFY(QJsonValue(1) != QJsonValue(1.1)); + QVERIFY(QJsonValue(1) != QJsonValue(QJsonValue::Undefined)); + QVERIFY(QJsonValue(1) != QJsonValue()); + QVERIFY(QJsonValue(1) != QJsonValue(true)); + QVERIFY(QJsonValue(1) != QJsonValue(QJsonArray())); + QVERIFY(QJsonValue(1) != QJsonValue(QJsonObject())); + QVERIFY(QJsonValue(1.) == QJsonValue(1.)); QVERIFY(QJsonValue(1.) != QJsonValue(2.)); QVERIFY(QJsonValue(1.) != QJsonValue(QJsonValue::Undefined)); -- cgit v1.2.3