3 commits - tests/kcalconversiontest.cpp tests/testfiles tests/timezonetest.cpp tests/timezonetest.h
Christian Mollekopf
mollekopf at kolabsys.com
Tue Aug 26 14:38:16 CEST 2014
tests/kcalconversiontest.cpp | 18 ++++-
tests/testfiles/v3/contacts/distlist.vcf.mime | 2
tests/timezonetest.cpp | 86 +++++++++++++-------------
tests/timezonetest.h | 2
4 files changed, 61 insertions(+), 47 deletions(-)
New commits:
commit 2148b17a086e18e0b9d77b22d8c9a2683f6e3b73
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Tue Aug 26 14:37:23 2014 +0200
Test KABC birthday conversion.
diff --git a/tests/kcalconversiontest.cpp b/tests/kcalconversiontest.cpp
index 6f7e84d..c62a8e0 100644
--- a/tests/kcalconversiontest.cpp
+++ b/tests/kcalconversiontest.cpp
@@ -504,8 +504,6 @@ void KCalConversionTest::testContactConversion_data()
QTest::addColumn<KABC::Addressee>( "kcal" );
QTest::addColumn<Kolab::Contact>( "kolab" );
- Kolab::cDateTime date(2011,2,2,12,11,10,true);
- Kolab::cDateTime date2(2011,2,2,12,12,10,true);
{
KABC::Addressee kcal;
kcal.setUid("uid");
@@ -520,6 +518,20 @@ void KCalConversionTest::testContactConversion_data()
{
KABC::Addressee kcal;
kcal.setUid("uid");
+ kcal.setFormattedName("name");
+ kcal.setBirthday(QDateTime(QDate(2012,2,2)));
+
+ //Because QDateTime doesn't know date-only values we always end up with a date-time
+ Kolab::Contact kolab;
+ kolab.setUid("uid");
+ kolab.setName("name");
+ kolab.setBDay(Kolab::cDateTime(2012,2,2,0,0,0));
+
+ QTest::newRow("bday") << kcal << kolab;
+ }
+ {
+ KABC::Addressee kcal;
+ kcal.setUid("uid");
//The first address is always the preferred
kcal.setEmails(QStringList() << "email1 at example.org" << "email2 at example.org");
kcal.insertCustom("KOLAB", "EmailTypesemail1 at example.org", "home,work");
@@ -554,12 +566,14 @@ void KCalConversionTest::testContactConversion()
foreach (const QString &mail, e.emails()) {
QCOMPARE(e.custom(QLatin1String("KOLAB"), QString::fromLatin1("EmailTypes%1").arg(mail)), kcal.custom(QLatin1String("KOLAB"), QString::fromLatin1("EmailTypes%1").arg(mail)));
}
+ QCOMPARE(e.birthday(), kcal.birthday());
const Kolab::Contact &b = fromKABC(kcal);
QCOMPARE(b.uid(), kolab.uid());
QCOMPARE(b.name(), kolab.name());
QCOMPARE(b.emailAddresses(), kolab.emailAddresses());
QCOMPARE(b.emailAddressPreferredIndex(), kolab.emailAddressPreferredIndex());
+ QCOMPARE(b.bDay(), kolab.bDay());
}
commit c72cb55fb58393d1e7b94c3f73d86fa2e61038c5
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Sun Aug 24 15:11:01 2014 +0200
This test started failing becaue we had to disable windows timezone conversion (since it wasn't working).
diff --git a/tests/timezonetest.cpp b/tests/timezonetest.cpp
index cf31012..5f60083 100644
--- a/tests/timezonetest.cpp
+++ b/tests/timezonetest.cpp
@@ -112,49 +112,49 @@ void TimezoneTest::testKolabObjectWriter()
QCOMPARE(result->dtStart().timeZone().name(), KTimeZone(QLatin1String("Africa/Lagos")).name());
}
-void TimezoneTest::testKolabObjectReader()
-{
- const Kolab::Version version = Kolab::KolabV3;
- const Kolab::ObjectType type = Kolab::EventObject;
- QString icalFileName = TESTFILEDIR+QString::fromLatin1("timezone/windowsTimezone.ics"); //To compare
- QString mimeFileName = TESTFILEDIR+QString::fromLatin1("timezone/windowsTimezoneV3.mime"); //For parsing
-
- //Parse mime message
- bool ok = false;
- const KMime::Message::Ptr &msg = readMimeFile( mimeFileName, ok );
- QVERIFY(ok);
- Kolab::KolabObjectReader reader;
- Kolab::ObjectType t = reader.parseMimeMessage(msg);
- QCOMPARE(t, type);
- QCOMPARE(reader.getVersion(), version);
- QCOMPARE(Kolab::ErrorHandler::instance().error(), Kolab::ErrorHandler::Debug);
-
- KCalCore::Incidence::Ptr convertedIncidence = reader.getIncidence();
- kDebug() << "read incidence";
-
- //Parse ICalFile for comparison
- QFile icalFile( icalFileName );
- QVERIFY( icalFile.open( QFile::ReadOnly ) );
- KCalCore::ICalFormat format;
- KCalCore::Incidence::Ptr realIncidence( format.fromString( QString::fromUtf8( icalFile.readAll() ) ) );
-
- // fix up the converted incidence for comparisson
- normalizeIncidence(convertedIncidence);
- normalizeIncidence(realIncidence);
-
- // recurrence objects are created on demand, but KCalCore::Incidence::operator==() doesn't take that into account
- // so make sure both incidences have one
- realIncidence->recurrence();
- convertedIncidence->recurrence();
-
- realIncidence->setLastModified(convertedIncidence->lastModified());
-
- //The following test is just for debugging and not really relevant
- if ( *(realIncidence.data()) != *(convertedIncidence.data()) ) {
- showDiff(format.toString( realIncidence ), format.toString( convertedIncidence ));
- }
- QVERIFY( *(realIncidence.data()) == *(convertedIncidence.data()) );
-}
+// void TimezoneTest::testKolabObjectReader()
+// {
+// const Kolab::Version version = Kolab::KolabV3;
+// const Kolab::ObjectType type = Kolab::EventObject;
+// QString icalFileName = TESTFILEDIR+QString::fromLatin1("timezone/windowsTimezone.ics"); //To compare
+// QString mimeFileName = TESTFILEDIR+QString::fromLatin1("timezone/windowsTimezoneV3.mime"); //For parsing
+//
+// //Parse mime message
+// bool ok = false;
+// const KMime::Message::Ptr &msg = readMimeFile( mimeFileName, ok );
+// QVERIFY(ok);
+// Kolab::KolabObjectReader reader;
+// Kolab::ObjectType t = reader.parseMimeMessage(msg);
+// QCOMPARE(t, type);
+// QCOMPARE(reader.getVersion(), version);
+// QCOMPARE(Kolab::ErrorHandler::instance().error(), Kolab::ErrorHandler::Debug);
+//
+// KCalCore::Incidence::Ptr convertedIncidence = reader.getIncidence();
+// kDebug() << "read incidence";
+//
+// //Parse ICalFile for comparison
+// QFile icalFile( icalFileName );
+// QVERIFY( icalFile.open( QFile::ReadOnly ) );
+// KCalCore::ICalFormat format;
+// KCalCore::Incidence::Ptr realIncidence( format.fromString( QString::fromUtf8( icalFile.readAll() ) ) );
+//
+// // fix up the converted incidence for comparisson
+// normalizeIncidence(convertedIncidence);
+// normalizeIncidence(realIncidence);
+//
+// // recurrence objects are created on demand, but KCalCore::Incidence::operator==() doesn't take that into account
+// // so make sure both incidences have one
+// realIncidence->recurrence();
+// convertedIncidence->recurrence();
+//
+// realIncidence->setLastModified(convertedIncidence->lastModified());
+//
+// //The following test is just for debugging and not really relevant
+// if ( *(realIncidence.data()) != *(convertedIncidence.data()) ) {
+// showDiff(format.toString( realIncidence ), format.toString( convertedIncidence ));
+// }
+// QVERIFY( *(realIncidence.data()) == *(convertedIncidence.data()) );
+// }
void TimezoneTest::testFindLegacyTimezone()
{
diff --git a/tests/timezonetest.h b/tests/timezonetest.h
index 280e2cc..6bd0c97 100644
--- a/tests/timezonetest.h
+++ b/tests/timezonetest.h
@@ -32,7 +32,7 @@ private slots:
void testFromHardcodedList_data();
void testFromHardcodedList();
void testKolabObjectWriter();
- void testKolabObjectReader();
+ // void testKolabObjectReader();
void testFindLegacyTimezone();
void testIgnoreInvalidTimezone();
void testTimezoneDaemonAvailable();
commit d791d67133f750a18abf851986a449c9dddbb15c
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Sun Aug 24 15:07:53 2014 +0200
Adapted distlist test to recent change of it's X-Kolab-Type
diff --git a/tests/testfiles/v3/contacts/distlist.vcf.mime b/tests/testfiles/v3/contacts/distlist.vcf.mime
index 372728e..e5c272c 100644
--- a/tests/testfiles/v3/contacts/distlist.vcf.mime
+++ b/tests/testfiles/v3/contacts/distlist.vcf.mime
@@ -1,5 +1,5 @@
Date: Mon, 23 Apr 2012 12:46:37 +0200
-X-Kolab-Type: application/x-vnd.kolab.contact.distlist
+X-Kolab-Type: application/x-vnd.kolab.distribution-list
X-Kolab-Mime-Version: 3.0
User-Agent: Libkolab-0.1.0
Content-Type: multipart/mixed; boundary="nextPart1365947.WmFcbPlLFA"
More information about the commits
mailing list