From 0d7a97f0717cef8a16cdba6b37de860a531f9407 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Fri, 16 Oct 2020 11:26:20 +1000 Subject: Adapt to Qt6 behavior changes - QVariant comparison now doesn't perform type conversion - Null QDateTime now compares less than other QDateTime values, rather than being equal to epoch. - Sequence type name is printed by default in warnings - QMultiHash::operator==() can return false for empty hashes in some cases (QTBUG-87575) - QJsonValue will expose input like "2.0" as an integral type as the value can be perfectly expressed as an integral (QTBUG-87443) Change-Id: I848888ecc74b5fb790488181a0d62a04138fcd81 Reviewed-by: Pekka Vuorela --- src/versit/qvcard21writer.cpp | 3 ++ src/versit/qvcard30writer.cpp | 2 + src/versit/qversitproperty.cpp | 3 +- src/versitorganizer/qversitorganizerexporter_p.cpp | 4 +- .../contacts/qcontactfilter/tst_qcontactfilter.cpp | 14 +++--- .../qcontactmanager/tst_qcontactmanager.cpp | 4 +- .../tst_qorganizeritemfilter.cpp | 52 +++++++++++----------- .../tst_qversitcontactimporter.cpp | 25 ++++++++--- .../versit/qversitreader/tst_qversitreader.cpp | 10 ++--- 9 files changed, 67 insertions(+), 50 deletions(-) diff --git a/src/versit/qvcard21writer.cpp b/src/versit/qvcard21writer.cpp index 45914a58b..7acce33ba 100644 --- a/src/versit/qvcard21writer.cpp +++ b/src/versit/qvcard21writer.cpp @@ -79,6 +79,9 @@ void QVCard21Writer::encodeVersitProperty(const QVersitProperty& property) encodeGroupsAndName(property); QMultiHash parameters = property.parameters(); QVariant variant(property.variantValue()); + if (variant.type() == QVariant::Url) { + variant = QVariant(variant.toUrl().toString()); + } QString renderedValue; QByteArray renderedBytes; diff --git a/src/versit/qvcard30writer.cpp b/src/versit/qvcard30writer.cpp index 2a0f883da..f632f9af4 100644 --- a/src/versit/qvcard30writer.cpp +++ b/src/versit/qvcard30writer.cpp @@ -80,6 +80,8 @@ void QVCard30Writer::encodeVersitProperty(const QVersitProperty& property) QVariant variant(modifiedProperty.variantValue()); if (variant.type() == QVariant::ByteArray) { modifiedProperty.insertParameter(QStringLiteral("ENCODING"), QStringLiteral("b")); + } else if (variant.type() == QVariant::Url) { + variant = QVariant(variant.toUrl().toString()); } encodeParameters(modifiedProperty.parameters()); writeString(QStringLiteral(":")); diff --git a/src/versit/qversitproperty.cpp b/src/versit/qversitproperty.cpp index af7f8ec5f..59e3ab935 100644 --- a/src/versit/qversitproperty.cpp +++ b/src/versit/qversitproperty.cpp @@ -136,7 +136,8 @@ bool QVersitProperty::operator==(const QVersitProperty& other) const { bool equal = d->mGroups == other.d->mGroups && d->mName == other.d->mName && - d->mParameters == other.d->mParameters && + ((d->mParameters.isEmpty() && other.d->mParameters.isEmpty()) // QTBUG-87575 + || (d->mParameters == other.d->mParameters)) && d->mValueType == other.d->mValueType; if (!equal) return false; diff --git a/src/versitorganizer/qversitorganizerexporter_p.cpp b/src/versitorganizer/qversitorganizerexporter_p.cpp index 58ba684cf..673a27dc8 100644 --- a/src/versitorganizer/qversitorganizerexporter_p.cpp +++ b/src/versitorganizer/qversitorganizerexporter_p.cpp @@ -611,7 +611,7 @@ void QVersitOrganizerExporterPrivate::encodeAudibleReminder( const QUrl attachUrl = audibleReminder.dataUrl(); if (!attachUrl.isEmpty()) { property.setName(QStringLiteral("ATTACH")); - property.setValue(attachUrl.toString()); + property.setValue(attachUrl); valarmDocument.addProperty(property); *processedFields << QOrganizerItemAudibleReminder::FieldDataUrl; } @@ -681,7 +681,7 @@ void QVersitOrganizerExporterPrivate::encodeVisualReminder( //ICAL specs do not include ATTACH property for DISPLAY VALARM components //Hence, we add it here as an (optional) extended QTPROJECT-specific property property.setName(QStringLiteral("X-QTPROJECT-ATTACH")); - property.setValue(attachUrl.toString()); + property.setValue(attachUrl); valarmDocument.addProperty(property); *processedFields << QOrganizerItemAudibleReminder::FieldDataUrl; } diff --git a/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp b/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp index c6247d4df..9f19b7ff8 100644 --- a/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp +++ b/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp @@ -1339,31 +1339,31 @@ void tst_QContactFilter::testDebugStreamOut_data() ids << id1 << id2 << id3; filter.setCollectionIds(ids); // Testing method setCollectionIds - QTest::newRow("collection") << (QContactFilter)filter << "QContactFilter(QContactCollectionFilter(collectionIds=(QContactCollectionId(qtcontacts:basic::05000000), QContactCollectionId(qtcontacts:basic::06000000), QContactCollectionId(qtcontacts:basic::07000000))))"; + QTest::newRow("collection") << (QContactFilter)filter << "QContactFilter(QContactCollectionFilter(collectionIds=QList(QContactCollectionId(qtcontacts:basic::05000000), QContactCollectionId(qtcontacts:basic::06000000), QContactCollectionId(qtcontacts:basic::07000000))))"; filter.setCollectionId(id2); // Testing method setCollectionId (and the related clearing of the collection) - QTest::newRow("collection") << (QContactFilter)filter << "QContactFilter(QContactCollectionFilter(collectionIds=(QContactCollectionId(qtcontacts:basic::06000000))))"; + QTest::newRow("collection") << (QContactFilter)filter << "QContactFilter(QContactCollectionFilter(collectionIds=QList(QContactCollectionId(qtcontacts:basic::06000000))))"; filter.setCollectionId(id4); // Testing again method setCollectionId (and the related clearing of the collection) - QTest::newRow("collection") << (QContactFilter)filter << "QContactFilter(QContactCollectionFilter(collectionIds=(QContactCollectionId(qtcontacts:basic::0c000000))))"; + QTest::newRow("collection") << (QContactFilter)filter << "QContactFilter(QContactCollectionFilter(collectionIds=QList(QContactCollectionId(qtcontacts:basic::0c000000))))"; ids.clear(); ids << id4; // Testing again method setCollectionIds - QTest::newRow("collection") << (QContactFilter)filter << "QContactFilter(QContactCollectionFilter(collectionIds=(QContactCollectionId(qtcontacts:basic::0c000000))))"; + QTest::newRow("collection") << (QContactFilter)filter << "QContactFilter(QContactCollectionFilter(collectionIds=QList(QContactCollectionId(qtcontacts:basic::0c000000))))"; QContactCollectionFilter filter2; filter2 = filter; // Testing again method setCollectionIds on the copied filter - QTest::newRow("collection") << (QContactFilter)filter2 << "QContactFilter(QContactCollectionFilter(collectionIds=(QContactCollectionId(qtcontacts:basic::0c000000))))"; + QTest::newRow("collection") << (QContactFilter)filter2 << "QContactFilter(QContactCollectionFilter(collectionIds=QList(QContactCollectionId(qtcontacts:basic::0c000000))))"; QContactFilter fil; fil = filter; // Testing that the assignment/conversion went fine - QTest::newRow("collection") << (QContactFilter)fil << "QContactFilter(QContactCollectionFilter(collectionIds=(QContactCollectionId(qtcontacts:basic::0c000000))))"; + QTest::newRow("collection") << (QContactFilter)fil << "QContactFilter(QContactCollectionFilter(collectionIds=QList(QContactCollectionId(qtcontacts:basic::0c000000))))"; QContactCollectionFilter filter3(fil); - QTest::newRow("collection") << (QContactFilter)filter3 << "QContactFilter(QContactCollectionFilter(collectionIds=(QContactCollectionId(qtcontacts:basic::0c000000))))"; + QTest::newRow("collection") << (QContactFilter)filter3 << "QContactFilter(QContactCollectionFilter(collectionIds=QList(QContactCollectionId(qtcontacts:basic::0c000000))))"; } } diff --git a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp index a46cf97a9..6599db41f 100644 --- a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp +++ b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp @@ -3512,9 +3512,7 @@ void tst_QContactManager::compareVariant_data() QDateTime dt4(d5, t1); QDateTime dt5(d6, t4); // end of the universe - // Note: this test used to verify that null QDateTime compared less than a non-null date prior to 1AD - // The current Qt behavior is to compare null as the UNIX epoch, so we will follow that - QTest::newRow("datetimes dt0 > dt1") << QVariant(dt0) << QVariant(dt1) << Qt::CaseInsensitive << 1; + QTest::newRow("datetimes dt0 > dt1") << QVariant(dt0) << QVariant(dt1) << Qt::CaseInsensitive << -1; QTest::newRow("datetimes dt1 < dt2") << QVariant(dt1) << QVariant(dt2) << Qt::CaseInsensitive << -1; QTest::newRow("datetimes dt2 < dt3") << QVariant(dt2) << QVariant(dt3) << Qt::CaseInsensitive << -1; QTest::newRow("datetimes dt3 < dt4") << QVariant(dt3) << QVariant(dt4) << Qt::CaseInsensitive << -1; diff --git a/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp b/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp index 77f8787cf..eec60ac6b 100644 --- a/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp +++ b/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp @@ -1164,31 +1164,31 @@ void tst_QOrganizerItemFilter::testDebugStreamOut_data() ids << id1 << id2 << id3; filter.setCollectionIds(ids); // Testing method setCollectionIds - QTest::newRow("collection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=(QOrganizerCollectionId(qtorganizer:basic::05000000), QOrganizerCollectionId(qtorganizer:basic::06000000), QOrganizerCollectionId(qtorganizer:basic::07000000))))"; + QTest::newRow("collection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=QList(QOrganizerCollectionId(qtorganizer:basic::05000000), QOrganizerCollectionId(qtorganizer:basic::06000000), QOrganizerCollectionId(qtorganizer:basic::07000000))))"; filter.setCollectionId(id2); // Testing method setCollectionId (and the related clearing of the collection) - QTest::newRow("collection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=(QOrganizerCollectionId(qtorganizer:basic::06000000))))"; + QTest::newRow("collection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=QList(QOrganizerCollectionId(qtorganizer:basic::06000000))))"; filter.setCollectionId(id4); // Testing again method setCollectionId (and the related clearing of the collection) - QTest::newRow("collection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; + QTest::newRow("collection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=QList(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; ids.clear(); ids << id4; // Testing again method setCollectionIds - QTest::newRow("collection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; + QTest::newRow("collection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=QList(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; QOrganizerItemCollectionFilter filter2; filter2 = filter; // Testing again method setCollectionIds on the copied filter - QTest::newRow("collection") << (QOrganizerItemFilter)filter2 << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; + QTest::newRow("collection") << (QOrganizerItemFilter)filter2 << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=QList(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; QOrganizerItemFilter fil; fil = filter; // Testing that the assignment/conversion went fine - QTest::newRow("collection") << (QOrganizerItemFilter)fil << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; + QTest::newRow("collection") << (QOrganizerItemFilter)fil << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=QList(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; QOrganizerItemCollectionFilter filter3(fil); - QTest::newRow("collection") << (QOrganizerItemFilter)filter3 << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; + QTest::newRow("collection") << (QOrganizerItemFilter)filter3 << "QOrganizerItemFilter(QOrganizerItemCollectionFilter(collectionIds=QList(QOrganizerCollectionId(qtorganizer:basic::0c000000))))"; } { @@ -1266,65 +1266,65 @@ void tst_QOrganizerItemFilter::testDebugStreamOut_data() { // Testing creation of an empty filter QOrganizerItemIdFilter filter; - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=()))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList()))"; // Testing the method setIds QList ids; ids << makeItemId(5) << makeItemId(6) << makeItemId(17); filter.setIds(ids); - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; // Resetting the list of Ids filter.setIds(QList()); - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=()))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList()))"; // Testing the method insert QOrganizerItemId singleId = makeItemId(12); filter.insert(singleId); - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=(QOrganizerItemId(qtorganizer:basic::0c000000))))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList(QOrganizerItemId(qtorganizer:basic::0c000000))))"; // Testing the method remove filter.remove(singleId); - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=()))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList()))"; QList allIds = filter.ids(); filter.remove(singleId); // remove again filter.clear(); filter.setIds(allIds); - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=()))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList()))"; // Test op= filter.setIds(ids); QOrganizerItemFilter f = filter; - QTest::newRow("Id") << (QOrganizerItemFilter)f << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; + QTest::newRow("Id") << (QOrganizerItemFilter)f << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; QOrganizerItemIdFilter filter2 = f; - QTest::newRow("Id") << (QOrganizerItemFilter)filter2 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter2 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; filter2 = filter; - QTest::newRow("Id") << (QOrganizerItemFilter)filter2 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter2 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; // Self assignment should do nothing filter2 = filter2; - QTest::newRow("Id") << (QOrganizerItemFilter)filter2 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter2 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; QOrganizerItemDetailFieldFilter dfil; QOrganizerItemIdFilter filter3(dfil); - QTest::newRow("Id") << (QOrganizerItemFilter)filter3 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=()))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter3 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList()))"; QOrganizerItemIdFilter filter4(filter); - QTest::newRow("Id") << (QOrganizerItemFilter)filter4 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter4 << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; filter = dfil; // now assign. - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=()))"; - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=()))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList()))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList()))"; filter = filter3; filter.setIds(ids); // force a detach - QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; + QTest::newRow("Id") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIdFilter(ids=QList(QOrganizerItemId(qtorganizer:basic::05000000), QOrganizerItemId(qtorganizer:basic::06000000), QOrganizerItemId(qtorganizer:basic::11000000))))"; } { // Test empty filter QOrganizerItemIntersectionFilter filter; - QTest::newRow("intersection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIntersectionFilter(filters=()))"; + QTest::newRow("intersection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIntersectionFilter(filters=QList()))"; // Test boolean ops QOrganizerItemDetailFieldFilter filter1; @@ -1337,7 +1337,7 @@ void tst_QOrganizerItemFilter::testDebugStreamOut_data() filter3.setDetail(QOrganizerItemDetail::TypeDisplayLabel, QOrganizerItemDisplayLabel::FieldLabel); filter << filter1 << filter2; - QTest::newRow("intersection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIntersectionFilter(filters=(QOrganizerItemFilter(QOrganizerItemDetailFieldFilter(detailType=200,detailField=201,value=QVariant(Invalid),matchFlags=0)), QOrganizerItemFilter(QOrganizerItemDetailFieldFilter(detailType=300,detailField=301,value=QVariant(Invalid),matchFlags=0)))))"; + QTest::newRow("intersection") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemIntersectionFilter(filters=QList(QOrganizerItemFilter(QOrganizerItemDetailFieldFilter(detailType=200,detailField=201,value=QVariant(Invalid),matchFlags=0)), QOrganizerItemFilter(QOrganizerItemDetailFieldFilter(detailType=300,detailField=301,value=QVariant(Invalid),matchFlags=0)))))"; } { @@ -1347,7 +1347,7 @@ void tst_QOrganizerItemFilter::testDebugStreamOut_data() { QOrganizerItemUnionFilter filter; - QTest::newRow("union") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemUnionFilter(filters=()))"; + QTest::newRow("union") << (QOrganizerItemFilter)filter << "QOrganizerItemFilter(QOrganizerItemUnionFilter(filters=QList()))"; // Test boolean ops QOrganizerItemDetailFieldFilter df; @@ -1361,7 +1361,7 @@ void tst_QOrganizerItemFilter::testDebugStreamOut_data() QOrganizerItemUnionFilter bf; bf << df << df2; - QTest::newRow("union") << (QOrganizerItemFilter)bf << "QOrganizerItemFilter(QOrganizerItemUnionFilter(filters=(QOrganizerItemFilter(QOrganizerItemDetailFieldFilter(detailType=200,detailField=201,value=QVariant(Invalid),matchFlags=0)), QOrganizerItemFilter(QOrganizerItemDetailFieldFilter(detailType=300,detailField=301,value=QVariant(Invalid),matchFlags=0)))))"; + QTest::newRow("union") << (QOrganizerItemFilter)bf << "QOrganizerItemFilter(QOrganizerItemUnionFilter(filters=QList(QOrganizerItemFilter(QOrganizerItemDetailFieldFilter(detailType=200,detailField=201,value=QVariant(Invalid),matchFlags=0)), QOrganizerItemFilter(QOrganizerItemDetailFieldFilter(detailType=300,detailField=301,value=QVariant(Invalid),matchFlags=0)))))"; } } diff --git a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp index 77514b03a..834074f25 100644 --- a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp +++ b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp @@ -1525,20 +1525,33 @@ void tst_QVersitContactImporter::testExtendedDetail_data() } { - QTest::newRow("double data") + QTest::newRow("integral data") << QString("name") - << QVariant((double)2.0) + << QVariant((qlonglong)2) << jsonArrayWith.arg("2") << true; + QTest::newRow("integral data - perfectly representable") // QTBUG-87443 + << QString("name") + << QVariant((qlonglong)2) + << jsonArrayWith.arg("2.0") + << true; + } + + { + QTest::newRow("double data") + << QString("name") + << QVariant((double)2.1) + << jsonArrayWith.arg("2.1") + << true; QTest::newRow("double data, negative") << QString("name") - << QVariant((double)-1.0) - << jsonArrayWith.arg("-1") + << QVariant((double)-1.2) + << jsonArrayWith.arg("-1.2") << true; QTest::newRow("double data, multiple digits") << QString("name") - << QVariant((double)10.2) - << jsonArrayWith.arg("10.2") + << QVariant((double)10.23456) + << jsonArrayWith.arg("10.23456") << true; } diff --git a/tests/auto/versit/qversitreader/tst_qversitreader.cpp b/tests/auto/versit/qversitreader/tst_qversitreader.cpp index 9457d403f..eed6dad11 100644 --- a/tests/auto/versit/qversitreader/tst_qversitreader.cpp +++ b/tests/auto/versit/qversitreader/tst_qversitreader.cpp @@ -806,7 +806,7 @@ void tst_QVersitReader::testParseNextVersitProperty_data() { QVersitProperty expectedProperty; expectedProperty.setName(QStringLiteral("X-FOLKS-FAVOURITE")); - expectedProperty.setValue(QStringLiteral("true")); + expectedProperty.setValue(QStringList() << QStringLiteral("true")); expectedProperty.setValueType(QVersitProperty::CompoundType); QTest::newRow("vcard21 folks favorite") << QVersitDocument::VCard21Type @@ -913,7 +913,7 @@ void tst_QVersitReader::testParseNextVersitProperty_data() { QVersitProperty expectedProperty; expectedProperty.setName(QStringLiteral("ORG")); - expectedProperty.setValue(QString::fromUtf8(KATAKANA_NOKIA)); + expectedProperty.setValue(QStringList() << QString::fromUtf8(KATAKANA_NOKIA)); expectedProperty.setValueType(QVersitProperty::CompoundType); QTest::newRow("org utf8") << QVersitDocument::VCard21Type @@ -924,7 +924,7 @@ void tst_QVersitReader::testParseNextVersitProperty_data() { QVersitProperty expectedProperty; expectedProperty.setName(QStringLiteral("ORG")); - expectedProperty.setValue(QString::fromUtf8(KATAKANA_NOKIA)); + expectedProperty.setValue(QStringList() << QString::fromUtf8(KATAKANA_NOKIA)); expectedProperty.setValueType(QVersitProperty::CompoundType); QTest::newRow("vcard21 org utf8 qp") << QVersitDocument::VCard21Type @@ -1276,7 +1276,7 @@ void tst_QVersitReader::testParseVersitDocument_data() nestedAlarm.addProperty(property); property.clear(); property.setName(QStringLiteral("REPEAT")); - property.setValue(4); + property.setValue(QStringLiteral("4")); nestedAlarm.addProperty(property); property.setName("DURATION"); property.setValue(QStringLiteral("PT15M")); @@ -1288,7 +1288,7 @@ void tst_QVersitReader::testParseVersitDocument_data() parameters.clear(); parameters.insert(QStringLiteral("FMTTYPE"), QStringLiteral("audio/basic")); property.setParameters(parameters); - property.setValue(QUrl(QStringLiteral("ftp://host.com/pub/sounds/bell-01.aud"))); + property.setValue(QStringLiteral("ftp://host.com/pub/sounds/bell-01.aud")); nestedAlarm.addProperty(property); nested.addSubDocument(nestedAlarm); expected.addSubDocument(nested); -- cgit v1.2.3