I have made the following changes intended for : CE:MW:Shared / qtcontacts-tracker
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/8379 Thank You, martyone [This message was auto-generated] --- Request # 8379: Messages from BOSS: State: review at 2013-03-06T14:45:22 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:martyone:branches:CE:MW:Shared / qtcontacts-tracker -> CE:MW:Shared / qtcontacts-tracker changes files: -------------- --- qtcontacts-tracker.changes +++ qtcontacts-tracker.changes @@ -0,0 +1,3 @@ +* Wed Mar 06 2013 Martin Kampas <[email protected]> - 4.19.2 +- Fixed NEMO#512: 4 qtcontacts-tracker unit tests fail in Nemo + old: ---- 0002-make-failing-tests-in-Nemo-insignificant.patch spec files: ----------- --- qtcontacts-tracker.spec +++ qtcontacts-tracker.spec @@ -23,7 +23,6 @@ Patch4: 0001-Fix-QObject-thread-ownership-issues.patch Patch5: qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch Patch6: qtcontacts-tracker-4.19.2-no-su-for-tests.patch -Patch7: 0002-make-failing-tests-in-Nemo-insignificant.patch Requires: libqtsparql-tracker >= 0.0.18 Requires: libqtsparql-tracker-direct BuildRequires: pkgconfig(QtContacts) >= 1.2 @@ -99,8 +98,6 @@ %patch5 -p1 # qtcontacts-tracker-4.19.2-no-su-for-tests.patch %patch6 -p1 -# 0002-make-failing-tests-in-Nemo-insignificant.patch -%patch7 -p1 # >> setup # << setup other changes: -------------- ++++++ qtcontacts-tracker-4.19.2-fix-field-extended-address-reference.patch --- qtcontacts-tracker-4.19.2-fix-field-extended-address-reference.patch +++ qtcontacts-tracker-4.19.2-fix-field-extended-address-reference.patch @@ -1,7 +1,14 @@ -diff -uNr qtcontacts-tracker/src/dao/contactdetailschema.cpp qtcontacts-tracker.p1/src/dao/contactdetailschema.cpp ---- qtcontacts-tracker/src/dao/contactdetailschema.cpp 2012-08-03 08:23:59.678055344 +0000 -+++ qtcontacts-tracker.p1/src/dao/contactdetailschema.cpp 2012-08-03 08:43:44.386023548 +0000 -@@ -132,10 +132,10 @@ +Until #QTMOBILITY-1749 is fixed, extended-address field is not supported. + +QContactAddress::extendedAddress was introduced by git commit 0ef3498 but +reverted by cc06a8a, with comment "Lets wait until we get responses from the +symbian side before we push this to qt mobility master." + +Index: qtcontacts-tracker-4.19.2/src/dao/contactdetailschema.cpp +=================================================================== +--- qtcontacts-tracker-4.19.2.orig/src/dao/contactdetailschema.cpp ++++ qtcontacts-tracker-4.19.2/src/dao/contactdetailschema.cpp +@@ -132,10 +132,10 @@ public: << QctPropertyInfo<nco::hasPostalAddress>().setHasDetailUri() << QctPropertyInfo<nco::country>())); @@ -14,10 +21,11 @@ addField(QctContactDetailField(QContactAddress::FieldLocality). setPropertyChain(QctPropertyInfoList() -diff -uNr qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp qtcontacts-tracker.p1/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp ---- qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp 2012-08-03 08:23:59.690055344 +0000 -+++ qtcontacts-tracker.p1/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp 2012-08-03 08:48:40.810015597 +0000 -@@ -1293,7 +1293,7 @@ +Index: qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp +=================================================================== +--- qtcontacts-tracker-4.19.2.orig/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp ++++ qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp +@@ -1293,7 +1293,7 @@ ut_qtcontacts_trackerplugin::testSaveAdd values.insert(QLatin1String(QContactAddress::FieldCountry), "Barbados"); values.insert(QLatin1String(QContactAddress::FieldPostcode), "55555"); values.insert(QLatin1String(QContactAddress::FieldStreet), "Martindales Rd"); @@ -26,7 +34,16 @@ values.insert(QLatin1String(QContactAddress::FieldRegion), "Bridgetown"); values.insert(QLatin1String(QContactAddress::FieldLocality), "Bridgetown town"); -@@ -1364,8 +1364,8 @@ +@@ -1357,6 +1357,8 @@ ut_qtcontacts_trackerplugin::testSaveAdd + void + ut_qtcontacts_trackerplugin::testExtendedAddress() + { ++ QSKIP("This test cannot be run until #QTMOBILITY-1749 is fixed", SkipAll); ++ + // Check parsing from vcard + QList<QContact> contacts = parseVCards(referenceFileName("NB248183.vcf")); + QCOMPARE(contacts.count(), 1); +@@ -1364,8 +1366,8 @@ ut_qtcontacts_trackerplugin::testExtende QContact contact = contacts.first(); QCOMPARE(contact.details<QContactAddress>().count(), 1); @@ -37,7 +54,7 @@ // Check saving and fetching QContactManager::Error error = QContactManager::UnspecifiedError; -@@ -1381,7 +1381,7 @@ +@@ -1381,7 +1383,7 @@ ut_qtcontacts_trackerplugin::testExtende QCOMPARE(fetchedContact.localId(), contact.localId()); QCOMPARE(fetchedContact.details<QContactAddress>().count(), 1); @@ -46,3 +63,62 @@ } void +@@ -6998,6 +7000,10 @@ ut_qtcontacts_trackerplugin::testVCardsA + QFETCH(QString, vcfFileName); + QFETCH(QString, xmlFileName); + ++ if (QFileInfo(vcfFileName).fileName() == "NB248183.vcf") { ++ QSKIP("This test cannot be run until #QTMOBILITY-1749 is fixed", SkipSingle); ++ } ++ + QList<QContact> vcardContacts = parseVCards(vcfFileName); + QVERIFY(not vcardContacts.isEmpty()); + +Index: qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin_querybuilder/data/100-Contact.rq +=================================================================== +--- qtcontacts-tracker-4.19.2.orig/tests/ut_qtcontacts_trackerplugin_querybuilder/data/100-Contact.rq ++++ qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin_querybuilder/data/100-Contact.rq +@@ -5,7 +5,6 @@ SELECT + (SELECT + GROUP_CONCAT(fn:concat(?_postalAddress, "\u001f", + tracker:coalesce(nco:country(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", +- tracker:coalesce(nco:extendedAddress(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:locality(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:pobox(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:postalcode(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", +Index: qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin_querybuilder/data/100-Group.rq +=================================================================== +--- qtcontacts-tracker-4.19.2.orig/tests/ut_qtcontacts_trackerplugin_querybuilder/data/100-Group.rq ++++ qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin_querybuilder/data/100-Group.rq +@@ -5,7 +5,6 @@ SELECT + (SELECT + GROUP_CONCAT(fn:concat(?_postalAddress, "\u001f", + tracker:coalesce(nco:country(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", +- tracker:coalesce(nco:extendedAddress(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:locality(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:pobox(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:postalcode(?_postalAddress, "\u002c", "\u001c"), ""), "\u001f", +Index: qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin_querybuilder/data/101-Contact-Address.rq +=================================================================== +--- qtcontacts-tracker-4.19.2.orig/tests/ut_qtcontacts_trackerplugin_querybuilder/data/101-Contact-Address.rq ++++ qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin_querybuilder/data/101-Contact-Address.rq +@@ -5,7 +5,6 @@ SELECT + (SELECT + GROUP_CONCAT(fn:concat(?_address, "\u001f", + tracker:coalesce(nco:country(?_address, "\u002c", "\u001c"), ""), "\u001f", +- tracker:coalesce(nco:extendedAddress(?_address, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:locality(?_address, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:pobox(?_address, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:postalcode(?_address, "\u002c", "\u001c"), ""), "\u001f", +Index: qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin_querybuilder/data/101-Group-Address.rq +=================================================================== +--- qtcontacts-tracker-4.19.2.orig/tests/ut_qtcontacts_trackerplugin_querybuilder/data/101-Group-Address.rq ++++ qtcontacts-tracker-4.19.2/tests/ut_qtcontacts_trackerplugin_querybuilder/data/101-Group-Address.rq +@@ -5,7 +5,6 @@ SELECT + (SELECT + GROUP_CONCAT(fn:concat(?_address, "\u001f", + tracker:coalesce(nco:country(?_address, "\u002c", "\u001c"), ""), "\u001f", +- tracker:coalesce(nco:extendedAddress(?_address, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:locality(?_address, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:pobox(?_address, "\u002c", "\u001c"), ""), "\u001f", + tracker:coalesce(nco:postalcode(?_address, "\u002c", "\u001c"), ""), "\u001f", ++++++ qtcontacts-tracker.yaml --- qtcontacts-tracker.yaml +++ qtcontacts-tracker.yaml @@ -15,7 +15,6 @@ - 0001-Fix-QObject-thread-ownership-issues.patch - qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch - qtcontacts-tracker-4.19.2-no-su-for-tests.patch - - 0002-make-failing-tests-in-Nemo-insignificant.patch Description: QtContact tracker storage plugin. Requires: ++++++ deleted files: --- 0002-make-failing-tests-in-Nemo-insignificant.patch
