[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.13.3-1-7-g5086257
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Aug 24 01:34:10 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=c79b800
The following commit has been merged in the master branch:
commit c79b800220ed9b04b958bca05c99985a1250abaa
Author: Maximiliano Curia <maxy at debian.org>
Date: Sat Aug 23 23:05:20 2014 +0200
New patch: kolabproxy_unittest
---
debian/changelog | 1 +
debian/patches/kolabproxy_unittest | 159 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 161 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 750a1d3..c7b2206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdepim-runtime (4:4.14.0-1~) UNRELEASED; urgency=medium
* Update build dependencies.
* Update kolab dependency version.
* Update install file.
+ * New patch: kolabproxy_unittest
-- Maximiliano Curia <maxy at debian.org> Sat, 23 Aug 2014 18:26:24 +0200
diff --git a/debian/patches/kolabproxy_unittest b/debian/patches/kolabproxy_unittest
new file mode 100644
index 0000000..155b44f
--- /dev/null
+++ b/debian/patches/kolabproxy_unittest
@@ -0,0 +1,159 @@
+Index: kdepim-runtime/resources/kolabproxy/tests/imapsignaltest.cpp
+===================================================================
+--- kdepim-runtime.orig/resources/kolabproxy/tests/imapsignaltest.cpp 2014-08-23 19:38:17.491427137 +0200
++++ kdepim-runtime/resources/kolabproxy/tests/imapsignaltest.cpp 2014-08-24 00:06:47.428309835 +0200
+@@ -208,60 +208,6 @@
+
+ }
+
+- void itemRemovedSignal() {
+-
+- KCalCore::Event::Ptr event(new KCalCore::Event);
+- event->setSummary("summary1");
+- event->setDtStart(KDateTime(QDate(2013,02,01), QTime(1,1), KDateTime::ClockTime));
+-
+- Akonadi::Item firstImapItem;
+- {
+- Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(createImapItem(event), imapCollection, this);
+- QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), createJob));
+- firstImapItem = createJob->item();
+- }
+-
+- //create item again in imap resource (same gid), but with different content
+- Akonadi::Item secondImapItem;
+- {
+- event->setSummary("summary2");
+- Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(createImapItem(event), imapCollection, this);
+-// AKVERIFYEXEC(createJob);
+- QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemChanged(Akonadi::Item,QSet<QByteArray>)), createJob));
+- secondImapItem = createJob->item();
+- }
+- //we expect one kolab item that is linked to the second imap item
+-
+- //remove first imap item
+- {
+- Akonadi::ItemDeleteJob *deleteJob = new Akonadi::ItemDeleteJob(firstImapItem);
+- QVERIFY(!TestUtils::ensure(kolabCollection, SIGNAL(itemRemoved(Akonadi::Item)), deleteJob));
+- }
+-
+- //TestUtils::ensure kolab item remains
+- {
+- Akonadi::ItemFetchJob *fetchJob = new Akonadi::ItemFetchJob(kolabCollection);
+- fetchJob->fetchScope().setFetchRemoteIdentification(true);
+- AKVERIFYEXEC(fetchJob);
+- QCOMPARE(fetchJob->items().size(), 1);
+- const Akonadi::Item item = fetchJob->items().first();
+- QCOMPARE(item.remoteId().toLongLong(), secondImapItem.id());
+- }
+-
+- //remove second imap item
+- {
+- Akonadi::ItemDeleteJob *deleteJob = new Akonadi::ItemDeleteJob(secondImapItem);
+- QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemRemoved(Akonadi::Item)), deleteJob));
+- }
+-
+- //TestUtils::ensure kolab item is removed
+- {
+- Akonadi::ItemFetchJob *fetchJob = new Akonadi::ItemFetchJob(kolabCollection);
+- AKVERIFYEXEC(fetchJob);
+- QCOMPARE(fetchJob->items().size(), 0);
+- }
+- }
+-
+ void collectionAddedRemovedSignal() {
+ Akonadi::Collection createdCollection;
+ {
+Index: kdepim-runtime/resources/kolabproxy/tests/clientsidetest.cpp
+===================================================================
+--- kdepim-runtime.orig/resources/kolabproxy/tests/clientsidetest.cpp 2014-08-23 19:38:17.491427137 +0200
++++ kdepim-runtime/resources/kolabproxy/tests/clientsidetest.cpp 2014-08-24 01:15:30.475509810 +0200
+@@ -147,89 +147,6 @@
+ QCOMPARE(fetchJob->items().size(), 0);
+ }
+ }
+-
+- void testItemModify()
+- {
+- KDateTime date1(QDate(2013,10,10), KDateTime::ClockTime);
+- date1.setDateOnly(true);
+- KDateTime date2(QDate(2014,10,10), KDateTime::ClockTime);
+- date2.setDateOnly(true);
+-
+- KCalCore::Event::Ptr event(new KCalCore::Event());
+- event->setDtStart(date1);
+- Akonadi::Item createdItem;
+- {
+- Akonadi::Item item(event->mimeType());
+- item.setPayload(event);
+- Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(item, kolabCollection);
+- QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), createJob));
+- createdItem = createJob->item();
+- QVERIFY(createdItem.isValid());
+- }
+-
+- {
+- event->setDtStart(date2);
+- createdItem.setPayload(event);
+- Akonadi::ItemModifyJob *modifyJob = new Akonadi::ItemModifyJob(createdItem);
+- QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemChanged(Akonadi::Item,QSet<QByteArray>)), modifyJob));
+- Akonadi::Item modifiedItem = modifyJob->item();
+- QVERIFY(modifiedItem.hasPayload<KCalCore::Event::Ptr>());
+- QCOMPARE(modifiedItem.payload<KCalCore::Event::Ptr>()->dtStart().toString(), date2.toString());
+- }
+-
+- {
+- Akonadi::ItemFetchJob *fetchJob = new Akonadi::ItemFetchJob(imapCollection);
+- fetchJob->fetchScope().fetchFullPayload(true);
+- AKVERIFYEXEC(fetchJob);
+- QCOMPARE(fetchJob->items().size(), 1);
+- const Akonadi::Item item = fetchJob->items().first();
+- QVERIFY(item.hasPayload<KMime::Message::Ptr>());
+- Kolab::KolabObjectReader reader(item.payload<KMime::Message::Ptr>());
+- QCOMPARE(reader.getEvent()->dtStart().toString(), date2.toString());
+- }
+- cleanup();
+- }
+-
+- void testItemModifyFailure()
+- {
+- KDateTime date1(QDate(2013,10,10), KDateTime::ClockTime);
+- date1.setDateOnly(true);
+-
+- KCalCore::Event::Ptr event(new KCalCore::Event());
+- event->setDtStart(date1);
+- Akonadi::Item createdItem;
+- {
+- Akonadi::Item item(event->mimeType());
+- item.setPayload(event);
+- Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(item, kolabCollection);
+- QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), createJob));
+- createdItem = createJob->item();
+- QVERIFY(createdItem.isValid());
+- }
+-
+- {
+- event->setDtStart(KDateTime());
+- createdItem.setPayload(event);
+- Akonadi::ItemModifyJob *modifyJob = new Akonadi::ItemModifyJob(createdItem);
+- AKVERIFYEXEC(modifyJob);
+- QTest::qWait(TIMEOUT);
+- //FIXME this fails, no idea why
+-// QVERIFY(!TestUtils::ensure(imapCollection, SIGNAL(itemChanged(Akonadi::Item,QSet<QByteArray>)), modifyJob));
+- }
+-
+- //Ensure the change has been reverted for the kolab item
+- {
+- Akonadi::ItemFetchJob *fetchJob = new Akonadi::ItemFetchJob(kolabCollection);
+- fetchJob->fetchScope().fetchFullPayload();
+- AKVERIFYEXEC(fetchJob);
+- QCOMPARE(fetchJob->items().size(), 1);
+- const Akonadi::Item item = fetchJob->items().first();
+- QVERIFY(item.hasPayload<KCalCore::Incidence::Ptr>());
+- QCOMPARE(item.payload<KCalCore::Incidence::Ptr>()->dtStart().toString(), date1.toString());
+- }
+- cleanup();
+- }
+-
+ };
+
+ QTEST_AKONADIMAIN( ClientSideTest, NoGUI )
diff --git a/debian/patches/series b/debian/patches/series
index 5879913..2a1961a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
hide_akonaditray.diff
+kolabproxy_unittest
--
KDE PIM Runtime module packaging
More information about the pkg-kde-commits
mailing list