diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-06-26 13:14:25 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-07-25 15:25:29 +0200 |
| commit | 77d7348be27016a439f06bef207362d0f91531ca (patch) | |
| tree | 8382e3266d22acb659a2ef6b89de51142ddff127 /tests/auto/corelib/json/tst_qtjson.cpp | |
| parent | 20cf632ad5f3ffe7b0fd231724c971f4e07304eb (diff) | |
Fix QJsonValue comparison.
QJsonValue, while comparing two QJsonObjects, should consult also length
of the objects, because a different than null base pointer doesn't mean
that an object is not empty.
Change-Id: Ibee1849ef9fed15d32f2c8f2aad9b053846e46b7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/corelib/json/tst_qtjson.cpp')
| -rw-r--r-- | tests/auto/corelib/json/tst_qtjson.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp index 7f5d438ac2..9a2fdecafc 100644 --- a/tests/auto/corelib/json/tst_qtjson.cpp +++ b/tests/auto/corelib/json/tst_qtjson.cpp @@ -2444,14 +2444,20 @@ void tst_QtJson::objectEquals() QFETCH(QJsonObject, right); QFETCH(bool, result); - QVERIFY((left == right) == result); - QVERIFY((right == left) == result); + QCOMPARE(left == right, result); + QCOMPARE(right == left, result); // invariants checks QCOMPARE(left, left); QCOMPARE(right, right); - QVERIFY((left != right) != result); - QVERIFY((right != left) != result); + QCOMPARE(left != right, !result); + QCOMPARE(right != left, !result); + + // The same but from QJsonValue perspective + QCOMPARE(QJsonValue(left) == QJsonValue(right), result); + QCOMPARE(QJsonValue(left) != QJsonValue(right), !result); + QCOMPARE(QJsonValue(right) == QJsonValue(left), result); + QCOMPARE(QJsonValue(right) != QJsonValue(left), !result); } void tst_QtJson::bom() |