maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testing: relax SyncEvo::IcalTest::testTimezone 

The test started to fail in 2015 because the VTIMEZONE generated by
the code copied from libical has a minor dependency on the current
time: it finds the transitions for the current year, then pretends
that the same rule applied since 1970. While doing that, it uses this
years transition date and just replaces the year. Because the exact
date varies between years, the result depends on the current year.

The test now simply ignores the day of the month, while still checking
year and month. Those should always be the same.
This commit is contained in:
Patrick Ohly 2015-02-19 17:37:01 +01:00
parent 4e60b67c27
commit a8e39070d6
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/IcalTest.cpp
View File

@ -25,6 +25,7 @@
#include <syncevo/eds_abi_wrapper.h>
#include <syncevo/icalstrdup.h>
#include <syncevo/SmartPtr.h>
#include <pcrecpp.h>
SE_BEGIN_CXX
@ -34,6 +35,18 @@ class IcalTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE_END();
protected:
/**
* Ignore exact day in DTSTART because icaltz-util.c uses the
* transition day of the *current* year, instead of the one from
* the (arbitrary) 1970 year. The value is wrong either way,
* so fixing that bug is not important.
*/
void patchDTSTART(std::string &vtimezone)
{
static const pcrecpp::RE re("(DTSTART:1970..)..");
re.GlobalReplace("\\1XX", &vtimezone);
}
/**
* Ensures that we get VTIMEZONE with RRULE from libical.
*
@ -59,9 +72,8 @@ protected:
CPPUNIT_ASSERT(comp);
SyncEvo::eptr<char> str(ical_strdup(icalcomponent_as_ical_string(comp)));
CPPUNIT_ASSERT(str);
// We are very specific here. This'll work until we change our
// code or the zone data from Europe/Paris changes (not likely).
CPPUNIT_ASSERT_EQUAL(std::string(str), std::string(
// 2014 version of the VTIMEZONE
std::string expected =
"BEGIN:VTIMEZONE\r\n"
"TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Paris\r\n"
"X-LIC-LOCATION:Europe/Paris\r\n"
@ -80,7 +92,13 @@ protected:
"TZOFFSETTO:+0200\r\n"
"END:DAYLIGHT\r\n"
"END:VTIMEZONE\r\n"
));
;
patchDTSTART(expected);
std::string actual(str);
patchDTSTART(actual);
// We are very specific here. This'll work until we change our
// code or the zone data from Europe/Paris changes (not likely).
CPPUNIT_ASSERT_EQUAL(expected, actual);
}
};