Remove QVariant::operator< and related operator
The operator does not have a total order Change-Id: Ifd263c3495aca08c8ccceb9949596c308a76a6c1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>bb10
Olivier Goffart
parent
0c29ebe374
commit
8652c79df0
|
|
@ -3840,58 +3840,6 @@ bool QVariant::convert(const int type, void *ptr) const
|
|||
QMetaType::registerComparators().
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn bool QVariant::operator<(const QVariant &v) const
|
||||
|
||||
Compares this QVariant with \a v and returns \c true if this is less than \a v.
|
||||
|
||||
\note Comparability might not be availabe for the type stored in this QVariant
|
||||
or in \a v.
|
||||
|
||||
\warning To make this function work with a custom type registered with
|
||||
qRegisterMetaType(), its comparison operator must be registered using
|
||||
QMetaType::registerComparators().
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn bool QVariant::operator<=(const QVariant &v) const
|
||||
|
||||
Compares this QVariant with \a v and returns \c true if this is less or equal than \a v.
|
||||
|
||||
\note Comparability might not be available for the type stored in this QVariant
|
||||
or in \a v.
|
||||
|
||||
\warning To make this function work with a custom type registered with
|
||||
qRegisterMetaType(), its comparison operator must be registered using
|
||||
QMetaType::registerComparators().
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn bool QVariant::operator>(const QVariant &v) const
|
||||
|
||||
Compares this QVariant with \a v and returns \c true if this is larger than \a v.
|
||||
|
||||
\note Comparability might not be available for the type stored in this QVariant
|
||||
or in \a v.
|
||||
|
||||
\warning To make this function work with a custom type registered with
|
||||
qRegisterMetaType(), its comparison operator must be registered using
|
||||
QMetaType::registerComparators().
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn bool QVariant::operator>=(const QVariant &v) const
|
||||
|
||||
Compares this QVariant with \a v and returns \c true if this is larger or equal than \a v.
|
||||
|
||||
\note Comparability might not be available for the type stored in this QVariant
|
||||
or in \a v.
|
||||
|
||||
\warning To make this function work with a custom type registered with
|
||||
qRegisterMetaType(), its comparison operator must be registered using
|
||||
QMetaType::registerComparators().
|
||||
*/
|
||||
|
||||
static bool qIsNumericType(uint tp)
|
||||
{
|
||||
static const qulonglong numericTypeBits =
|
||||
|
|
@ -4069,73 +4017,6 @@ bool QVariant::cmp(const QVariant &v) const
|
|||
return cmp_helper(v1.d, v2.d);
|
||||
}
|
||||
|
||||
/*!
|
||||
\internal
|
||||
*/
|
||||
int QVariant::compare(const QVariant &v) const
|
||||
{
|
||||
// try numerics first, with C++ type promotion rules (no conversion)
|
||||
if (qIsNumericType(d.type) && qIsNumericType(v.d.type))
|
||||
return numericCompare(&d, &v.d);
|
||||
|
||||
// check for equality next, as more types implement operator== than operator<
|
||||
if (cmp(v))
|
||||
return 0;
|
||||
|
||||
const QVariant *v1 = this;
|
||||
const QVariant *v2 = &v;
|
||||
QVariant converted1;
|
||||
QVariant converted2;
|
||||
|
||||
if (d.type != v.d.type) {
|
||||
// if both types differ, try to convert
|
||||
if (v2->canConvert(v1->d.type)) {
|
||||
converted2 = *v2;
|
||||
if (converted2.convert(v1->d.type))
|
||||
v2 = &converted2;
|
||||
}
|
||||
if (v1->d.type != v2->d.type && v1->canConvert(v2->d.type)) {
|
||||
converted1 = *v1;
|
||||
if (converted1.convert(v2->d.type))
|
||||
v1 = &converted1;
|
||||
}
|
||||
if (v1->d.type != v2->d.type) {
|
||||
// if conversion fails, default to toString
|
||||
int r = v1->toString().compare(v2->toString(), Qt::CaseInsensitive);
|
||||
if (r == 0) {
|
||||
// cmp(v) returned false, so we should try to agree with it.
|
||||
return (v1->d.type < v2->d.type) ? -1 : 1;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
// did we end up with two numerics? If so, restart
|
||||
if (qIsNumericType(v1->d.type) && qIsNumericType(v2->d.type))
|
||||
return v1->compare(*v2);
|
||||
}
|
||||
if (v1->d.type >= QMetaType::User) {
|
||||
int result;
|
||||
if (QMetaType::compare(QT_PREPEND_NAMESPACE(constData(d)), QT_PREPEND_NAMESPACE(constData(v2->d)), d.type, &result))
|
||||
return result;
|
||||
}
|
||||
switch (v1->d.type) {
|
||||
case QVariant::Date:
|
||||
return v1->toDate() < v2->toDate() ? -1 : 1;
|
||||
case QVariant::Time:
|
||||
return v1->toTime() < v2->toTime() ? -1 : 1;
|
||||
case QVariant::DateTime:
|
||||
return v1->toDateTime() < v2->toDateTime() ? -1 : 1;
|
||||
case QVariant::StringList:
|
||||
return v1->toStringList() < v2->toStringList() ? -1 : 1;
|
||||
}
|
||||
int r = v1->toString().compare(v2->toString(), Qt::CaseInsensitive);
|
||||
if (r == 0) {
|
||||
// cmp(v) returned false, so we should try to agree with it.
|
||||
return (d.type < v.d.type) ? -1 : 1;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
/*!
|
||||
\internal
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -465,14 +465,6 @@ class Q_CORE_EXPORT QVariant
|
|||
{ return cmp(v); }
|
||||
inline bool operator!=(const QVariant &v) const
|
||||
{ return !cmp(v); }
|
||||
inline bool operator<(const QVariant &v) const
|
||||
{ return compare(v) < 0; }
|
||||
inline bool operator<=(const QVariant &v) const
|
||||
{ return compare(v) <= 0; }
|
||||
inline bool operator>(const QVariant &v) const
|
||||
{ return compare(v) > 0; }
|
||||
inline bool operator>=(const QVariant &v) const
|
||||
{ return compare(v) >= 0; }
|
||||
|
||||
protected:
|
||||
friend inline bool operator==(const QVariant &, const QVariantComparisonHelper &);
|
||||
|
|
@ -491,7 +483,6 @@ public:
|
|||
Private d;
|
||||
void create(int type, const void *copy);
|
||||
bool cmp(const QVariant &other) const;
|
||||
int compare(const QVariant &other) const;
|
||||
bool convert(const int t, void *ptr) const; // ### Qt6: drop const
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -120,8 +120,6 @@ private slots:
|
|||
void constRefs();
|
||||
void convertCustomType_data();
|
||||
void convertCustomType();
|
||||
void compareCustomType_data();
|
||||
void compareCustomType();
|
||||
void compareCustomEqualOnlyType();
|
||||
void customDebugStream();
|
||||
void unknownType();
|
||||
|
|
@ -2132,7 +2130,7 @@ struct CustomConvertibleType
|
|||
};
|
||||
|
||||
bool operator<(const CustomConvertibleType &lhs, const CustomConvertibleType &rhs)
|
||||
{ return lhs.m_foo < rhs.m_foo; }
|
||||
{ return lhs.m_foo.toString() < rhs.m_foo.toString(); }
|
||||
bool operator==(const CustomConvertibleType &lhs, const CustomConvertibleType &rhs)
|
||||
{ return lhs.m_foo == rhs.m_foo; }
|
||||
bool operator!=(const CustomConvertibleType &lhs, const CustomConvertibleType &rhs)
|
||||
|
|
@ -2422,43 +2420,6 @@ void tst_QMetaType::convertCustomType()
|
|||
QCOMPARE(v.value<CustomConvertibleType2>().m_foo, testCustom.m_foo);
|
||||
}
|
||||
|
||||
void tst_QMetaType::compareCustomType_data()
|
||||
{
|
||||
QMetaType::registerComparators<CustomConvertibleType>();
|
||||
|
||||
QTest::addColumn<QVariantList>("unsorted");
|
||||
QTest::addColumn<QVariantList>("sorted");
|
||||
|
||||
QTest::newRow("int") << (QVariantList() << 37 << 458 << 1 << 243 << -4 << 383)
|
||||
<< (QVariantList() << -4 << 1 << 37 << 243 << 383 << 458);
|
||||
|
||||
QTest::newRow("dobule") << (QVariantList() << 4934.93 << 0.0 << 302.39 << -39.0)
|
||||
<< (QVariantList() << -39.0 << 0.0 << 302.39 << 4934.93);
|
||||
|
||||
QTest::newRow("QString") << (QVariantList() << "Hello" << "World" << "this" << "is" << "a" << "test")
|
||||
<< (QVariantList() << "a" << "Hello" << "is" << "test" << "this" << "World");
|
||||
|
||||
QTest::newRow("QTime") << (QVariantList() << QTime(14, 39) << QTime(0, 0) << QTime(18, 18) << QTime(9, 27))
|
||||
<< (QVariantList() << QTime(0, 0) << QTime(9, 27) << QTime(14, 39) << QTime(18, 18));
|
||||
|
||||
QTest::newRow("QDate") << (QVariantList() << QDate(2013, 3, 23) << QDate(1900, 12, 1) << QDate(2001, 2, 2) << QDate(1982, 12, 16))
|
||||
<< (QVariantList() << QDate(1900, 12, 1) << QDate(1982, 12, 16) << QDate(2001, 2, 2) << QDate(2013, 3, 23));
|
||||
|
||||
QTest::newRow("mixed") << (QVariantList() << "Hello" << "World" << QChar('a') << 38 << QChar('z') << -39 << 4.6)
|
||||
<< (QVariantList() << -39 << 4.6 << 38 << QChar('a') << "Hello" << "World" << QChar('z'));
|
||||
|
||||
QTest::newRow("custom") << (QVariantList() << QVariant::fromValue(CustomConvertibleType(1)) << QVariant::fromValue(CustomConvertibleType(100)) << QVariant::fromValue(CustomConvertibleType(50)))
|
||||
<< (QVariantList() << QVariant::fromValue(CustomConvertibleType(1)) << QVariant::fromValue(CustomConvertibleType(50)) << QVariant::fromValue(CustomConvertibleType(100)));
|
||||
}
|
||||
|
||||
void tst_QMetaType::compareCustomType()
|
||||
{
|
||||
QFETCH(QVariantList, unsorted);
|
||||
QFETCH(QVariantList, sorted);
|
||||
std::sort(unsorted.begin(), unsorted.end());
|
||||
QCOMPARE(unsorted, sorted);
|
||||
}
|
||||
|
||||
void tst_QMetaType::compareCustomEqualOnlyType()
|
||||
{
|
||||
int metaTypeId = qRegisterMetaType<CustomEqualsOnlyType>();
|
||||
|
|
@ -2480,11 +2441,6 @@ void tst_QMetaType::compareCustomEqualOnlyType()
|
|||
QCOMPARE(variant100, variant100x);
|
||||
QCOMPARE(variant100, variant100);
|
||||
|
||||
// compare always fails
|
||||
QVERIFY(!(variant50 < variant50));
|
||||
QVERIFY(!(variant50 < variant100));
|
||||
QVERIFY(!(variant100 < variant50));
|
||||
|
||||
// check QMetaType::compare works/doesn't crash for equals only comparators
|
||||
bool wasSuccess = QMetaType::compare(variant50.constData(), variant50.constData(),
|
||||
metaTypeId, &result);
|
||||
|
|
|
|||
|
|
@ -189,8 +189,6 @@ private slots:
|
|||
void operator_eq_eq_data();
|
||||
void operator_eq_eq();
|
||||
void operator_eq_eq_rhs();
|
||||
void compareNumbers_data() const;
|
||||
void compareNumbers() const;
|
||||
|
||||
void typeName_data();
|
||||
void typeName();
|
||||
|
|
@ -269,9 +267,6 @@ private slots:
|
|||
|
||||
void enums();
|
||||
void metaEnums();
|
||||
void compareSanity_data();
|
||||
void compareSanity();
|
||||
void compareRich();
|
||||
|
||||
void nullConvert();
|
||||
|
||||
|
|
@ -1725,344 +1720,6 @@ void tst_QVariant::operator_eq_eq_rhs()
|
|||
#endif
|
||||
}
|
||||
|
||||
void tst_QVariant::compareNumbers_data() const
|
||||
{
|
||||
typedef signed char schar;
|
||||
QTest::addColumn<QVariant>("v1");
|
||||
QTest::addColumn<QVariant>("v2");
|
||||
QTest::addColumn<int>("expected");
|
||||
|
||||
// sanity checking: same types
|
||||
QTest::newRow("bool1") << QVariant(false) << QVariant(false) << 0;
|
||||
QTest::newRow("bool2") << QVariant(true) << QVariant(true) << 0;
|
||||
QTest::newRow("bool3") << QVariant(false) << QVariant(true) << -1;
|
||||
QTest::newRow("bool4") << QVariant(true) << QVariant(false) << +1;
|
||||
|
||||
QTest::newRow("char1") << QVariant::fromValue(char(0)) << QVariant::fromValue(char(0)) << 0;
|
||||
QTest::newRow("char2") << QVariant::fromValue(CHAR_MAX) << QVariant::fromValue(CHAR_MAX) << 0;
|
||||
QTest::newRow("char3") << QVariant::fromValue(CHAR_MIN) << QVariant::fromValue(CHAR_MIN) << 0;
|
||||
QTest::newRow("char4") << QVariant::fromValue(CHAR_MIN) << QVariant::fromValue(CHAR_MAX) << -1;
|
||||
QTest::newRow("char5") << QVariant::fromValue(CHAR_MAX) << QVariant::fromValue(CHAR_MIN) << +1;
|
||||
|
||||
QTest::newRow("schar1") << QVariant::fromValue(schar(0)) << QVariant::fromValue(schar(0)) << 0;
|
||||
QTest::newRow("schar2") << QVariant::fromValue(SCHAR_MAX) << QVariant::fromValue(SCHAR_MAX) << 0;
|
||||
QTest::newRow("schar3") << QVariant::fromValue(SCHAR_MIN) << QVariant::fromValue(SCHAR_MIN) << 0;
|
||||
QTest::newRow("schar4") << QVariant::fromValue(SCHAR_MIN) << QVariant::fromValue(SCHAR_MAX) << -1;
|
||||
QTest::newRow("schar5") << QVariant::fromValue(SCHAR_MAX) << QVariant::fromValue(SCHAR_MIN) << +1;
|
||||
|
||||
QTest::newRow("uchar1") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(uchar(0)) << 0;
|
||||
QTest::newRow("uchar2") << QVariant::fromValue(UCHAR_MAX) << QVariant::fromValue(UCHAR_MAX) << 0;
|
||||
QTest::newRow("uchar3") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(UCHAR_MAX) << -1;
|
||||
QTest::newRow("uchar4") << QVariant::fromValue(UCHAR_MAX) << QVariant::fromValue(uchar(0)) << +1;
|
||||
|
||||
QTest::newRow("short1") << QVariant::fromValue(short(0)) << QVariant::fromValue(short(0)) << 0;
|
||||
QTest::newRow("short2") << QVariant::fromValue(SHRT_MAX) << QVariant::fromValue(SHRT_MAX) << 0;
|
||||
QTest::newRow("short3") << QVariant::fromValue(SHRT_MIN) << QVariant::fromValue(SHRT_MIN) << 0;
|
||||
QTest::newRow("short4") << QVariant::fromValue(SHRT_MIN) << QVariant::fromValue(SHRT_MAX) << -1;
|
||||
QTest::newRow("short5") << QVariant::fromValue(SHRT_MAX) << QVariant::fromValue(SHRT_MIN) << +1;
|
||||
|
||||
QTest::newRow("ushort1") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(ushort(0)) << 0;
|
||||
QTest::newRow("ushort2") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(USHRT_MAX) << 0;
|
||||
QTest::newRow("ushort3") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(USHRT_MAX) << -1;
|
||||
QTest::newRow("ushort4") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(ushort(0)) << +1;
|
||||
|
||||
QTest::newRow("int1") << QVariant::fromValue(int(0)) << QVariant::fromValue(int(0)) << 0;
|
||||
QTest::newRow("int2") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(INT_MAX) << 0;
|
||||
QTest::newRow("int3") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(INT_MIN) << 0;
|
||||
QTest::newRow("int4") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(INT_MAX) << -1;
|
||||
QTest::newRow("int5") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(INT_MIN) << +1;
|
||||
|
||||
QTest::newRow("uint1") << QVariant::fromValue(uint(0)) << QVariant::fromValue(uint(0)) << 0;
|
||||
QTest::newRow("uint2") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(UINT_MAX) << 0;
|
||||
QTest::newRow("uint3") << QVariant::fromValue(uint(0)) << QVariant::fromValue(UINT_MAX) << -1;
|
||||
QTest::newRow("uint4") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(uint(0)) << +1;
|
||||
|
||||
QTest::newRow("long1") << QVariant::fromValue(long(0)) << QVariant::fromValue(long(0)) << 0;
|
||||
QTest::newRow("long2") << QVariant::fromValue(LONG_MAX) << QVariant::fromValue(LONG_MAX) << 0;
|
||||
QTest::newRow("long3") << QVariant::fromValue(LONG_MIN) << QVariant::fromValue(LONG_MIN) << 0;
|
||||
QTest::newRow("long4") << QVariant::fromValue(LONG_MIN) << QVariant::fromValue(LONG_MAX) << -1;
|
||||
QTest::newRow("long5") << QVariant::fromValue(LONG_MAX) << QVariant::fromValue(LONG_MIN) << +1;
|
||||
|
||||
QTest::newRow("ulong1") << QVariant::fromValue(ulong(0)) << QVariant::fromValue(ulong(0)) << 0;
|
||||
QTest::newRow("ulong2") << QVariant::fromValue(ULONG_MAX) << QVariant::fromValue(ULONG_MAX) << 0;
|
||||
QTest::newRow("ulong3") << QVariant::fromValue(ulong(0)) << QVariant::fromValue(ULONG_MAX) << -1;
|
||||
QTest::newRow("ulong4") << QVariant::fromValue(ULONG_MAX) << QVariant::fromValue(ulong(0)) << +1;
|
||||
|
||||
QTest::newRow("llong1") << QVariant::fromValue(qlonglong(0)) << QVariant::fromValue(qlonglong(0)) << 0;
|
||||
QTest::newRow("llong2") << QVariant::fromValue(LLONG_MAX) << QVariant::fromValue(LLONG_MAX) << 0;
|
||||
QTest::newRow("llong3") << QVariant::fromValue(LLONG_MIN) << QVariant::fromValue(LLONG_MIN) << 0;
|
||||
QTest::newRow("llong4") << QVariant::fromValue(LLONG_MIN) << QVariant::fromValue(LLONG_MAX) << -1;
|
||||
QTest::newRow("llong5") << QVariant::fromValue(LLONG_MAX) << QVariant::fromValue(LLONG_MIN) << +1;
|
||||
|
||||
QTest::newRow("ullong1") << QVariant::fromValue(qulonglong(0)) << QVariant::fromValue(qulonglong(0)) << 0;
|
||||
QTest::newRow("ullong2") << QVariant::fromValue(ULLONG_MAX) << QVariant::fromValue(ULLONG_MAX) << 0;
|
||||
QTest::newRow("ullong3") << QVariant::fromValue(qulonglong(0)) << QVariant::fromValue(ULLONG_MAX) << -1;
|
||||
QTest::newRow("ullong4") << QVariant::fromValue(ULLONG_MAX) << QVariant::fromValue(qulonglong(0)) << +1;
|
||||
|
||||
QTest::newRow("float1") << QVariant::fromValue(0.f) << QVariant::fromValue(0.f) << 0;
|
||||
QTest::newRow("float2") << QVariant::fromValue(-1.f) << QVariant::fromValue(0.f) << -1;
|
||||
QTest::newRow("float3") << QVariant::fromValue(0.f) << QVariant::fromValue(-1.f) << +1;
|
||||
QTest::newRow("float4") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(0.f) << -1;
|
||||
QTest::newRow("float5") << QVariant::fromValue(0.f) << QVariant::fromValue(-float(qInf())) << +1;
|
||||
QTest::newRow("float6") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(-float(qInf())) << 0;
|
||||
QTest::newRow("float7") << QVariant::fromValue(float(qInf())) << QVariant::fromValue(float(qInf())) << 0;
|
||||
|
||||
QTest::newRow("double1") << QVariant::fromValue(0.) << QVariant::fromValue(0.) << 0;
|
||||
QTest::newRow("double2") << QVariant::fromValue(-1.) << QVariant::fromValue(0.) << -1;
|
||||
QTest::newRow("double3") << QVariant::fromValue(0.) << QVariant::fromValue(-1.) << +1;
|
||||
QTest::newRow("double4") << QVariant::fromValue(-qInf()) << QVariant::fromValue(0.) << -1;
|
||||
QTest::newRow("double5") << QVariant::fromValue(0.) << QVariant::fromValue(-qInf()) << +1;
|
||||
QTest::newRow("double6") << QVariant::fromValue(-double(qInf())) << QVariant::fromValue(-qInf()) << 0;
|
||||
QTest::newRow("double7") << QVariant::fromValue(qInf()) << QVariant::fromValue(qInf()) << 0;
|
||||
QTest::newRow("double8") << QVariant::fromValue(-qInf()) << QVariant::fromValue(qInf()) << -1;
|
||||
QTest::newRow("double9") << QVariant::fromValue(qQNaN()) << QVariant::fromValue(0.) << INT_MAX;
|
||||
QTest::newRow("double10") << QVariant::fromValue(0.) << QVariant::fromValue(qQNaN()) << INT_MAX;
|
||||
QTest::newRow("double11") << QVariant::fromValue(qQNaN()) << QVariant::fromValue(qQNaN()) << INT_MAX;
|
||||
|
||||
// mixed comparisons
|
||||
// fp + fp
|
||||
QTest::newRow("float+double1") << QVariant::fromValue(0.f) << QVariant::fromValue(0.) << 0;
|
||||
QTest::newRow("float+double2") << QVariant::fromValue(-1.f) << QVariant::fromValue(0.) << -1;
|
||||
QTest::newRow("float+double3") << QVariant::fromValue(0.f) << QVariant::fromValue(-1.) << +1;
|
||||
QTest::newRow("float+double4") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(0.) << -1;
|
||||
QTest::newRow("float+double5") << QVariant::fromValue(0.f) << QVariant::fromValue(-qInf()) << +1;
|
||||
QTest::newRow("float+double6") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(-qInf()) << 0;
|
||||
QTest::newRow("float+double7") << QVariant::fromValue(float(qInf())) << QVariant::fromValue(qInf()) << 0;
|
||||
QTest::newRow("float+double8") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(qInf()) << -1;
|
||||
QTest::newRow("float+double9") << QVariant::fromValue(qQNaN()) << QVariant::fromValue(0.) << INT_MAX;
|
||||
QTest::newRow("float+double10") << QVariant::fromValue(0.) << QVariant::fromValue(qQNaN()) << INT_MAX;
|
||||
QTest::newRow("float+double11") << QVariant::fromValue(qQNaN()) << QVariant::fromValue(qQNaN()) << INT_MAX;
|
||||
|
||||
// fp + int
|
||||
QTest::newRow("float+int1") << QVariant::fromValue(0.f) << QVariant::fromValue(0) << 0;
|
||||
QTest::newRow("double+int1") << QVariant::fromValue(0.) << QVariant::fromValue(0) << 0;
|
||||
QTest::newRow("float+int2") << QVariant::fromValue(-1.f) << QVariant::fromValue(0) << -1;
|
||||
QTest::newRow("double+int2") << QVariant::fromValue(-1.) << QVariant::fromValue(0) << -1;
|
||||
QTest::newRow("float+int3") << QVariant::fromValue(0.f) << QVariant::fromValue(-1) << +1;
|
||||
QTest::newRow("double+int3") << QVariant::fromValue(0.) << QVariant::fromValue(-1) << +1;
|
||||
QTest::newRow("float+int4") << QVariant::fromValue(1.5f) << QVariant::fromValue(1) << +1;
|
||||
QTest::newRow("double+int4") << QVariant::fromValue(1.5) << QVariant::fromValue(1) << +1;
|
||||
QTest::newRow("double+int5") << QVariant::fromValue(qInf()) << QVariant::fromValue(1) << +1;
|
||||
|
||||
// fp + uint
|
||||
QTest::newRow("float+uint1") << QVariant::fromValue(0.f) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("double+uint1") << QVariant::fromValue(0.) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("float+uint2") << QVariant::fromValue(-1.f) << QVariant::fromValue(0U) << -1;
|
||||
QTest::newRow("double+uint2") << QVariant::fromValue(-1.) << QVariant::fromValue(0U) << -1;
|
||||
QTest::newRow("float+uint3") << QVariant::fromValue(0.f) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("double+uint3") << QVariant::fromValue(0.) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("float+uint4") << QVariant::fromValue(1.5f) << QVariant::fromValue(1U) << +1;
|
||||
QTest::newRow("double+uint4") << QVariant::fromValue(1.5) << QVariant::fromValue(1U) << +1;
|
||||
|
||||
// lower ranked + int
|
||||
QTest::newRow("bool+int1") << QVariant::fromValue(false) << QVariant::fromValue(0) << 0;
|
||||
QTest::newRow("bool+int2") << QVariant::fromValue(false) << QVariant::fromValue(1) << -1;
|
||||
QTest::newRow("bool+int3") << QVariant::fromValue(true) << QVariant::fromValue(0) << +1;
|
||||
QTest::newRow("bool+int4") << QVariant::fromValue(true) << QVariant::fromValue(1) << 0;
|
||||
QTest::newRow("bool+int5") << QVariant::fromValue(true) << QVariant::fromValue(2) << -1;
|
||||
|
||||
QTest::newRow("char+int1") << QVariant::fromValue(char(0)) << QVariant::fromValue(0) << 0;
|
||||
QTest::newRow("char+int2") << QVariant::fromValue(char(0)) << QVariant::fromValue(1) << -1;
|
||||
QTest::newRow("char+int3") << QVariant::fromValue(char(1)) << QVariant::fromValue(0) << +1;
|
||||
QTest::newRow("char+int4") << QVariant::fromValue(char(1)) << QVariant::fromValue(1) << 0;
|
||||
if (std::numeric_limits<char>::is_signed) {
|
||||
QTest::newRow("char+int5") << QVariant::fromValue(char(-1)) << QVariant::fromValue(0) << -1;
|
||||
QTest::newRow("char+int6") << QVariant::fromValue(char(-1)) << QVariant::fromValue(-1) << 0;
|
||||
}
|
||||
|
||||
QTest::newRow("schar+int1") << QVariant::fromValue(schar(0)) << QVariant::fromValue(0) << 0;
|
||||
QTest::newRow("schar+int2") << QVariant::fromValue(schar(0)) << QVariant::fromValue(1) << -1;
|
||||
QTest::newRow("schar+int3") << QVariant::fromValue(schar(1)) << QVariant::fromValue(0) << +1;
|
||||
QTest::newRow("schar+int4") << QVariant::fromValue(schar(1)) << QVariant::fromValue(1) << 0;
|
||||
QTest::newRow("schar+int5") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(0) << -1;
|
||||
QTest::newRow("schar+int6") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(-1) << 0;
|
||||
|
||||
QTest::newRow("uchar+int1") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(0) << 0;
|
||||
QTest::newRow("uchar+int2") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(1) << -1;
|
||||
QTest::newRow("uchar+int3") << QVariant::fromValue(uchar(1)) << QVariant::fromValue(0) << +1;
|
||||
QTest::newRow("uchar+int4") << QVariant::fromValue(uchar(1)) << QVariant::fromValue(1) << 0;
|
||||
|
||||
QTest::newRow("short+int1") << QVariant::fromValue(short(0)) << QVariant::fromValue(0) << 0;
|
||||
QTest::newRow("short+int2") << QVariant::fromValue(short(0)) << QVariant::fromValue(1) << -1;
|
||||
QTest::newRow("short+int3") << QVariant::fromValue(short(1)) << QVariant::fromValue(0) << +1;
|
||||
QTest::newRow("short+int4") << QVariant::fromValue(short(1)) << QVariant::fromValue(1) << 0;
|
||||
QTest::newRow("short+int5") << QVariant::fromValue(short(-1)) << QVariant::fromValue(0) << -1;
|
||||
QTest::newRow("short+int6") << QVariant::fromValue(short(-1)) << QVariant::fromValue(-1) << 0;
|
||||
|
||||
QTest::newRow("ushort+int1") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(0) << 0;
|
||||
QTest::newRow("ushort+int2") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(1) << -1;
|
||||
QTest::newRow("ushort+int3") << QVariant::fromValue(ushort(1)) << QVariant::fromValue(0) << +1;
|
||||
QTest::newRow("ushort+int4") << QVariant::fromValue(ushort(1)) << QVariant::fromValue(1) << 0;
|
||||
|
||||
// lower ranked + uint (without sign change)
|
||||
QTest::newRow("bool+uint1") << QVariant::fromValue(false) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("bool+uint2") << QVariant::fromValue(false) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("bool+uint3") << QVariant::fromValue(true) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("bool+uint4") << QVariant::fromValue(true) << QVariant::fromValue(1U) << 0;
|
||||
QTest::newRow("bool+uint5") << QVariant::fromValue(true) << QVariant::fromValue(2U) << -1;
|
||||
|
||||
QTest::newRow("char+uint1") << QVariant::fromValue(char(0)) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("char+uint2") << QVariant::fromValue(char(0)) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("char+uint3") << QVariant::fromValue(char(1)) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("char+uint4") << QVariant::fromValue(char(1)) << QVariant::fromValue(1U) << 0;
|
||||
|
||||
QTest::newRow("schar+uint1") << QVariant::fromValue(schar(0)) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("schar+uint2") << QVariant::fromValue(schar(0)) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("schar+uint3") << QVariant::fromValue(schar(1)) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("schar+uint4") << QVariant::fromValue(schar(1)) << QVariant::fromValue(1U) << 0;
|
||||
|
||||
QTest::newRow("uchar+uint1") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("uchar+uint2") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("uchar+uint3") << QVariant::fromValue(uchar(1)) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("uchar+uint4") << QVariant::fromValue(uchar(1)) << QVariant::fromValue(1U) << 0;
|
||||
|
||||
QTest::newRow("short+uint1") << QVariant::fromValue(short(0)) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("short+uint2") << QVariant::fromValue(short(0)) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("short+uint3") << QVariant::fromValue(short(1)) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("short+uint4") << QVariant::fromValue(short(1)) << QVariant::fromValue(1U) << 0;
|
||||
|
||||
QTest::newRow("ushort+uint1") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("ushort+uint2") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("ushort+uint3") << QVariant::fromValue(ushort(1)) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("ushort+uint4") << QVariant::fromValue(ushort(1)) << QVariant::fromValue(1U) << 0;
|
||||
|
||||
// int + qlonglong
|
||||
QTest::newRow("int+qlonglong1") << QVariant::fromValue(0) << QVariant::fromValue(Q_INT64_C(0)) << 0;
|
||||
QTest::newRow("int+qlonglong2") << QVariant::fromValue(1) << QVariant::fromValue(Q_INT64_C(0)) << +1;
|
||||
QTest::newRow("int+qlonglong3") << QVariant::fromValue(0) << QVariant::fromValue(Q_INT64_C(1)) << -1;
|
||||
QTest::newRow("int+qlonglong4") << QVariant::fromValue(1) << QVariant::fromValue(Q_INT64_C(1)) << 0;
|
||||
QTest::newRow("int+qlonglong5") << QVariant::fromValue(0) << QVariant::fromValue(Q_INT64_C(-1)) << +1;
|
||||
QTest::newRow("int+qlonglong6") << QVariant::fromValue(-1) << QVariant::fromValue(Q_INT64_C(0)) << -1;
|
||||
QTest::newRow("int+qlonglong7") << QVariant::fromValue(-1) << QVariant::fromValue(Q_INT64_C(-1)) << 0;
|
||||
|
||||
// uint + qulonglong
|
||||
QTest::newRow("uint+qulonglong1") << QVariant::fromValue(0U) << QVariant::fromValue(Q_UINT64_C(0)) << 0;
|
||||
QTest::newRow("uint+qulonglong2") << QVariant::fromValue(1U) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
QTest::newRow("uint+qulonglong3") << QVariant::fromValue(0U) << QVariant::fromValue(Q_UINT64_C(1)) << -1;
|
||||
QTest::newRow("uint+qulonglong4") << QVariant::fromValue(1U) << QVariant::fromValue(Q_UINT64_C(1)) << 0;
|
||||
|
||||
// int + uint (without sign change)
|
||||
QTest::newRow("int+uint1") << QVariant::fromValue(0) << QVariant::fromValue(0U) << 0;
|
||||
QTest::newRow("int+uint2") << QVariant::fromValue(1) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("int+uint3") << QVariant::fromValue(0) << QVariant::fromValue(1U) << -1;
|
||||
QTest::newRow("int+uint4") << QVariant::fromValue(1) << QVariant::fromValue(1U) << 0;
|
||||
|
||||
// uint + qlonglong
|
||||
QTest::newRow("uint+qlonglong1") << QVariant::fromValue(0U) << QVariant::fromValue(Q_INT64_C(0)) << 0;
|
||||
QTest::newRow("uint+qlonglong2") << QVariant::fromValue(1U) << QVariant::fromValue(Q_INT64_C(0)) << +1;
|
||||
QTest::newRow("uint+qlonglong3") << QVariant::fromValue(0U) << QVariant::fromValue(Q_INT64_C(1)) << -1;
|
||||
QTest::newRow("uint+qlonglong4") << QVariant::fromValue(1U) << QVariant::fromValue(Q_INT64_C(1)) << 0;
|
||||
QTest::newRow("uint+qlonglong5") << QVariant::fromValue(0U) << QVariant::fromValue(Q_INT64_C(-1)) << +1;
|
||||
|
||||
// boundary conditions
|
||||
QTest::newRow("charmax+intmax") << QVariant::fromValue(CHAR_MAX) << QVariant::fromValue(INT_MAX) << -1;
|
||||
QTest::newRow("charmax+uintmax") << QVariant::fromValue(CHAR_MAX) << QVariant::fromValue(UINT_MAX) << -1;
|
||||
QTest::newRow("scharmax+intmax") << QVariant::fromValue(SCHAR_MAX) << QVariant::fromValue(INT_MAX) << -1;
|
||||
QTest::newRow("scharmax+uintmax") << QVariant::fromValue(SCHAR_MAX) << QVariant::fromValue(UINT_MAX) << -1;
|
||||
QTest::newRow("ucharmax+intmax") << QVariant::fromValue(UCHAR_MAX) << QVariant::fromValue(INT_MAX) << -1;
|
||||
QTest::newRow("ucharmax+uintmax") << QVariant::fromValue(UCHAR_MAX) << QVariant::fromValue(UINT_MAX) << -1;
|
||||
QTest::newRow("shortmax+intmax") << QVariant::fromValue(SHRT_MAX) << QVariant::fromValue(INT_MAX) << -1;
|
||||
QTest::newRow("shortmax+uintmax") << QVariant::fromValue(SHRT_MAX) << QVariant::fromValue(UINT_MAX) << -1;
|
||||
QTest::newRow("ushortmax+intmax") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(INT_MAX) << -1;
|
||||
QTest::newRow("ushortmax+uintmax") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(UINT_MAX) << -1;
|
||||
|
||||
QTest::newRow("intmin+qlonglongmin") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(LLONG_MIN) << +1;
|
||||
QTest::newRow("intmax+uintmax") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(UINT_MAX) << -1;
|
||||
QTest::newRow("intmax+qlonglongmax") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(LLONG_MAX) << -1;
|
||||
QTest::newRow("uintmax+qlonglongmax") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(LLONG_MAX) << -1;
|
||||
QTest::newRow("intmax+qulonglongmax") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(ULLONG_MAX) << -1;
|
||||
QTest::newRow("qlonglongmax+qulonglongmax") << QVariant::fromValue(LLONG_MAX) << QVariant::fromValue(ULLONG_MAX) << -1;
|
||||
QTest::newRow("uintmax+qlonglongmin") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(LLONG_MIN) << +1;
|
||||
|
||||
// check for no sign-extension issues
|
||||
QTest::newRow("ushortmax+intzero") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(0) << +1;
|
||||
QTest::newRow("ushortmax+qlonglongzero") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(Q_INT64_C(0)) << +1;
|
||||
QTest::newRow("uintmax+qlonglongzero") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(Q_INT64_C(0)) << +1;
|
||||
|
||||
// sign changes
|
||||
// the tests below check that a signed negative number sign-changes to a non-zero unsigned number and that
|
||||
// signed -1 sign-changes to unsigned maximum (all bits set, ~0). This works on two's complement machines
|
||||
// (all that Qt supports), and would also work on one's complement.
|
||||
if (std::numeric_limits<char>::is_signed) {
|
||||
QTest::newRow("signchange-char+uint") << QVariant::fromValue(char(-1)) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("signchange-char+uintmax") << QVariant::fromValue(char(-1)) << QVariant::fromValue(UINT_MAX) << 0;
|
||||
QTest::newRow("signchange-charmin+uint") << QVariant::fromValue(CHAR_MIN) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("signchange-char+qulonglong") << QVariant::fromValue(char(-1)) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
QTest::newRow("signchange-char+qulonglongmax") << QVariant::fromValue(char(-1)) << QVariant::fromValue(ULLONG_MAX) << 0;
|
||||
QTest::newRow("signchange-charmin+qulonglong") << QVariant::fromValue(CHAR_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
}
|
||||
QTest::newRow("signchange-schar+uint") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("signchange-schar+uintmax") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(UINT_MAX) << 0;
|
||||
QTest::newRow("signchange-scharmin+uint") << QVariant::fromValue(SCHAR_MIN) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("signchange-schar+qulonglong") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
QTest::newRow("signchange-schar+qulonglongmax") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(ULLONG_MAX) << 0;
|
||||
QTest::newRow("signchange-scharmin+qulonglong") << QVariant::fromValue(SCHAR_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
QTest::newRow("signchange-short+uint") << QVariant::fromValue(short(-1)) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("signchange-short+uintmax") << QVariant::fromValue(short(-1)) << QVariant::fromValue(UINT_MAX) << 0;
|
||||
QTest::newRow("signchange-shortmin+uint") << QVariant::fromValue(SHRT_MIN) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("signchange-short+qulonglong") << QVariant::fromValue(short(-1)) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
QTest::newRow("signchange-short+qulonglongmax") << QVariant::fromValue(short(-1)) << QVariant::fromValue(ULLONG_MAX) << 0;
|
||||
QTest::newRow("signchange-shortmin+qulonglong") << QVariant::fromValue(SHRT_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
QTest::newRow("signchange-int+uint") << QVariant::fromValue(-1) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("signchange-int+uintmax") << QVariant::fromValue(-1) << QVariant::fromValue(UINT_MAX) << 0;
|
||||
QTest::newRow("signchange-intmin+uint") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(0U) << +1;
|
||||
QTest::newRow("signchange-int+qulonglong") << QVariant::fromValue(-1) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
QTest::newRow("signchange-int+qulonglongmax") << QVariant::fromValue(-1) << QVariant::fromValue(ULLONG_MAX) << 0;
|
||||
QTest::newRow("signchange-intmin+qulonglong") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
// no qlonglong+uint, since that should promote to qlonglong and then the comparison is signed (tested above)
|
||||
QTest::newRow("signchange-qlonglong+qulonglong") << QVariant::fromValue(Q_INT64_C(-1)) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
QTest::newRow("signchange-qlonglong+qulonglongmax") << QVariant::fromValue(Q_INT64_C(-1)) << QVariant::fromValue(ULLONG_MAX) << 0;
|
||||
QTest::newRow("signchange-qlonglongmin+qulonglong") << QVariant::fromValue(LLONG_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
|
||||
}
|
||||
|
||||
void tst_QVariant::compareNumbers() const
|
||||
{
|
||||
QFETCH(QVariant, v1);
|
||||
QFETCH(QVariant, v2);
|
||||
QFETCH(int, expected);
|
||||
|
||||
if (expected == -1) {
|
||||
QVERIFY(v1 < v2);
|
||||
QVERIFY(v1 <= v2);
|
||||
QVERIFY(!(v1 == v2));
|
||||
QVERIFY(!(v1 > v2));
|
||||
QVERIFY(!(v1 >= v2));
|
||||
|
||||
QVERIFY(!(v2 < v1));
|
||||
QVERIFY(!(v2 <= v1));
|
||||
QVERIFY(!(v2 == v1));
|
||||
QVERIFY(v2 >= v1);
|
||||
QVERIFY(v2 > v1);
|
||||
} else if (expected == 0) {
|
||||
QVERIFY(!(v1 < v2));
|
||||
QVERIFY(v1 <= v2);
|
||||
QCOMPARE(v1, v2);
|
||||
QVERIFY(!(v1 > v2));
|
||||
QVERIFY(v1 >= v2);
|
||||
|
||||
QVERIFY(!(v2 < v1));
|
||||
QVERIFY(v2 <= v1);
|
||||
QCOMPARE(v2, v1);
|
||||
QVERIFY(v2 >= v1);
|
||||
QVERIFY(!(v2 > v1));
|
||||
} else if (expected == +1) {
|
||||
QVERIFY(!(v1 < v2));
|
||||
QVERIFY(!(v1 <= v2));
|
||||
QVERIFY(!(v1 == v2));
|
||||
QVERIFY(v1 > v2);
|
||||
QVERIFY(v1 >= v2);
|
||||
|
||||
QVERIFY(v2 < v1);
|
||||
QVERIFY(v2 <= v1);
|
||||
QVERIFY(!(v2 == v1));
|
||||
QVERIFY(!(v2 >= v1));
|
||||
QVERIFY(!(v2 > v1));
|
||||
} else {
|
||||
// unorderable (NaN)
|
||||
QVERIFY(!(v1 == v2));
|
||||
}
|
||||
}
|
||||
|
||||
void tst_QVariant::typeName_data()
|
||||
{
|
||||
QTest::addColumn<int>("type");
|
||||
|
|
@ -4858,86 +4515,6 @@ void tst_QVariant::metaEnums()
|
|||
METAENUMS_TEST(MetaEnumTest_Enum8_value);
|
||||
}
|
||||
|
||||
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));
|
||||
}
|
||||
}
|
||||
|
||||
static void richComparison(const QVariant& less, const QVariant& more)
|
||||
{
|
||||
QVERIFY(less.type() == more.type());
|
||||
|
||||
QVERIFY(less < more);
|
||||
QVERIFY(!(more < less));
|
||||
|
||||
QVERIFY(more > less);
|
||||
QVERIFY(!(less > more));
|
||||
|
||||
QVERIFY(less <= more);
|
||||
QVERIFY(!(more <= less));
|
||||
QVERIFY(less <= less);
|
||||
|
||||
QVERIFY(more >= less);
|
||||
QVERIFY(!(less >= more));
|
||||
QVERIFY(more >= more);
|
||||
}
|
||||
|
||||
void tst_QVariant::compareRich()
|
||||
{
|
||||
richComparison(QUuid("{49d8ad2a-2ee8-4c3d-949f-1b5a3765ddf0}"),
|
||||
QUuid("{f6d56824-16e9-4543-a375-add2877c2d05}"));
|
||||
richComparison(QByteArray::fromRawData("a", 1),
|
||||
QByteArray::fromRawData("b", 1));
|
||||
richComparison(QStringLiteral("a"), QStringLiteral("b"));
|
||||
richComparison(QLatin1String("a"), QLatin1String("b"));
|
||||
richComparison(QChar('a'), QChar('b'));
|
||||
richComparison(QDate(2016, 7, 23), QDate(2016, 7, 24));
|
||||
richComparison(QTime(0, 0), QTime(0, 1));
|
||||
richComparison(QDateTime(QDate(2016, 7, 23), QTime(0, 0)),
|
||||
QDateTime(QDate(2016, 7, 23), QTime(0, 1)));
|
||||
|
||||
richComparison(QStringList(), QStringList() << QStringLiteral("a"));
|
||||
richComparison(QStringList(), QStringList() << QStringLiteral("a")
|
||||
<< QStringLiteral("b"));
|
||||
richComparison(QStringList() << QStringLiteral("a"),
|
||||
QStringList() << QStringLiteral("b"));
|
||||
richComparison(QStringList() << QStringLiteral("a"),
|
||||
QStringList() << QStringLiteral("b")
|
||||
<< QStringLiteral("c"));
|
||||
richComparison(QStringList() << QStringLiteral("a")
|
||||
<< QStringLiteral("c"),
|
||||
QStringList() << QStringLiteral("b"));
|
||||
richComparison(QStringList() << QStringLiteral("a")
|
||||
<< QStringLiteral("c"),
|
||||
QStringList() << QStringLiteral("b")
|
||||
<< QStringLiteral("d"));
|
||||
richComparison(QStringList() << QStringLiteral("a")
|
||||
<< QStringLiteral("c"),
|
||||
QStringList() << QStringLiteral("a")
|
||||
<< QStringLiteral("d"));
|
||||
}
|
||||
|
||||
void tst_QVariant::nullConvert()
|
||||
{
|
||||
// Test quirks with QVariants different types of null states.
|
||||
|
|
|
|||
Loading…
Reference in New Issue