diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-17 11:11:28 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-18 11:22:51 +0000 |
commit | a2e23bca0f2b43a26e2e489f83cfe2e521da63b9 (patch) | |
tree | 1ec2672a5887889b120796d5e7f50659460faa8a /tests/auto/corelib/serialization/json/tst_qtjson.cpp | |
parent | 09fc4f9525740b8c671c036413153d3419750b99 (diff) |
QJsonObject: Fix operator<=()
We had a copy-paste error there.
Pick-to: 6.0 6.1
Change-Id: Ib1448197ac4f4641c6559f133f41dcf326f210f1
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/serialization/json/tst_qtjson.cpp')
-rw-r--r-- | tests/auto/corelib/serialization/json/tst_qtjson.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp index b5aa1d7331..afd3303298 100644 --- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp +++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp @@ -170,6 +170,8 @@ private Q_SLOTS: void fromToVariantConversions_data(); void fromToVariantConversions(); + void testIteratorComparison(); + private: QString testDataDir; }; @@ -3520,5 +3522,34 @@ void tst_QtJson::fromToVariantConversions() } } +void tst_QtJson::testIteratorComparison() +{ + QJsonObject t = QJsonObject::fromVariantHash({ + { QStringLiteral("a"), QVariant(12) }, + { QStringLiteral("b"), QVariant(13) } + }); + + QVERIFY(t.begin() == t.begin()); + QVERIFY(t.begin() <= t.begin()); + QVERIFY(t.begin() >= t.begin()); + QVERIFY(!(t.begin() != t.begin())); + QVERIFY(!(t.begin() < t.begin())); + QVERIFY(!(t.begin() > t.begin())); + + QVERIFY(!(t.begin() == t.end())); + QVERIFY(t.begin() <= t.end()); + QVERIFY(!(t.begin() >= t.end())); + QVERIFY(t.begin() != t.end()); + QVERIFY(t.begin() < t.end()); + QVERIFY(!(t.begin() > t.end())); + + QVERIFY(!(t.end() == t.begin())); + QVERIFY(!(t.end() <= t.begin())); + QVERIFY(t.end() >= t.begin()); + QVERIFY(t.end() != t.begin()); + QVERIFY(!(t.end() < t.begin())); + QVERIFY(t.end() > t.begin()); +} + QTEST_MAIN(tst_QtJson) #include "tst_qtjson.moc" |