summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2014-08-24 13:11:01 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2014-08-26 11:48:31 (GMT)
commitc72cb55fb58393d1e7b94c3f73d86fa2e61038c5 (patch)
tree9e83ab7dcf3c74c3a8dd6d4a1dd4c51569695222
parentd791d67133f750a18abf851986a449c9dddbb15c (diff)
downloadlibkolab-c72cb55fb58393d1e7b94c3f73d86fa2e61038c5.tar.gz
This test started failing becaue we had to disable windows timezone conversion (since it wasn't working).
-rw-r--r--tests/timezonetest.cpp86
-rw-r--r--tests/timezonetest.h2
2 files changed, 44 insertions, 44 deletions
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();