diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-08-21 14:22:34 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-09-11 23:05:35 +0200 |
commit | 294e65f8092dd5b624740ee39d52979c7ca6f387 (patch) | |
tree | aad711d5fcf79570d018af4baa7ebe4aa366112c /tests/auto/corelib/kernel/qvariant | |
parent | 8e7cb47a3463c4d0f3662d901f7718e7c6cacefe (diff) |
QVariant::compare shouldn't return match when QVariant::cmp does not
If the types doesn't match in QVariant::compare we do a comparison based
on QString, this may end up indicating a full match, though the we don't
match according to cmp. In this case it would be better if we preserved
the non-matching to avoid breaking ordering.
[ChangeLog][QtCore][QVariant] Fixed ordered comparison between QVariants
that do not match but produce identical toString output.
Task-number: QTBUG-40363
Change-Id: I84a8eca11e8875dba9948bde2906ae7c5aa35704
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qvariant')
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index c7d862c20e..7bdc91cfbb 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -250,6 +250,10 @@ private slots: void pairElements(); void enums(); + + void compareSanity_data(); + void compareSanity(); + private: void dataStream_data(QDataStream::Version version); void loadQVariantFromDataStream(QDataStream::Version version); @@ -4153,5 +4157,31 @@ void tst_QVariant::enums() #endif } +void tst_QVariant::compareSanity_data() +{ + QTest::addColumn<QVariant>("value1"); + QTest::addColumn<QVariant>("value2"); + + QTest::newRow( "int <>/== QUrl" ) << QVariant( 97 ) << QVariant(QUrl("a")); + QTest::newRow( "int <>/== QChar" ) << QVariant( 97 ) << QVariant(QChar('a')); + QTest::newRow( "int <>/== QString" ) << QVariant( 97 ) << QVariant(QString("a")); + QTest::newRow( "QUrl <>/== QChar" ) << QVariant(QUrl("a")) << QVariant(QChar('a')); + QTest::newRow( "QUrl <>/== QString" ) << QVariant(QUrl("a")) << QVariant(QString("a")); + QTest::newRow( "QChar <>/== QString" ) << QVariant(QChar('a')) << QVariant(QString("a")); +} + +void tst_QVariant::compareSanity() +{ + QFETCH(QVariant, value1); + QFETCH(QVariant, value2); + + if (value1 == value2) { + QVERIFY(!(value1 < value2) && !(value1 > value2)); + } else { + QVERIFY(value1 != value2); + QVERIFY((value1 < value2) || (value1 > value2)); + } +} + QTEST_MAIN(tst_QVariant) #include "tst_qvariant.moc" |