Merge with 15.04 branch which is what got uploaded to the archive

5 files changed, 271 insertions, 0 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f3ee612..9d26484 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -88,6 +88,8 @@ add_eds_ics_test_by_name(test-eds-ics-repeating-events)
 add_eds_ics_test_by_name(test-eds-ics-nonrepeating-events)
 add_eds_ics_test_by_name(test-eds-ics-repeating-valarms)
 add_eds_ics_test_by_name(test-eds-ics-missing-trigger)
+add_eds_ics_test_by_name(test-eds-ics-tzids)
+add_eds_ics_test_by_name(test-eds-ics-tzids-2)
 
 
 # disabling the timezone unit tests because they require
diff --git a/tests/test-eds-ics-tzids-2.cpp b/tests/test-eds-ics-tzids-2.cpp
new file mode 100644
index 0000000..8b4e80b
--- /dev/null
+++ b/tests/test-eds-ics-tzids-2.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#include <algorithm>
+
+#include <datetime/alarm-queue-simple.h>
+#include <datetime/clock-mock.h>
+#include <datetime/engine-eds.h>
+#include <datetime/planner-range.h>
+
+#include <gtest/gtest.h>
+
+#include "glib-fixture.h"
+#include "print-to.h"
+#include "timezone-mock.h"
+#include "wakeup-timer-mock.h"
+
+using namespace unity::indicator::datetime;
+using VAlarmFixture = GlibFixture;
+
+/***
+****
+***/
+
+TEST_F(VAlarmFixture, MultipleAppointments)
+{
+    // start the EDS engine
+    auto engine = std::make_shared<EdsEngine>();
+
+    // we need a consistent timezone for the planner and our local DateTimes
+    constexpr char const * zone_str {"America/Los_Angeles"};
+    auto tz = std::make_shared<MockTimezone>(zone_str);
+    auto gtz = g_time_zone_new(zone_str);
+
+    // make a planner that looks at the first half of 2015 in EDS
+    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
+    const DateTime range_begin {gtz, 2006,1, 1, 0, 0, 0.0};
+    const DateTime range_end   {gtz, 2015,12,31,23,59,59.5};
+    planner->range().set(std::make_pair(range_begin, range_end));
+
+    // give EDS a moment to load
+    if (planner->appointments().get().empty()) {
+        g_message("waiting a moment for EDS to load...");
+        auto on_appointments_changed = [this](const std::vector<Appointment>& appointments){
+            g_message("ah, they loaded");
+            if (!appointments.empty())
+                g_main_loop_quit(loop);
+        };
+        core::ScopedConnection conn(planner->appointments().changed().connect(on_appointments_changed));
+        constexpr int max_wait_sec = 10;
+        wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND);
+    }
+
+    // what we expect to get...
+    std::array<Appointment,1> expected_appts;
+    auto appt = &expected_appts[0];
+    appt->uid = "109264742";
+    appt->color = "#becedd";
+    appt->summary = "National Incubator Initiative for Clean Energy (NIICE) FOA: Pre-Concept Paper Informational Webinar";
+    appt->begin = DateTime{gtz,2014,1,21,11,0,0};
+    appt->end = DateTime{gtz,2014,1,21,13,0,0};
+    appt->alarms = std::vector<Alarm>{ Alarm({"Reminder", "", DateTime(gtz,2014,1,21,10,45,0)}) };
+
+    // compare it to what we actually loaded...
+    const auto appts = planner->appointments().get();
+    EXPECT_EQ(expected_appts.size(), appts.size());
+    for (size_t i=0, n=std::min(appts.size(),expected_appts.size()); i<n; i++)
+        EXPECT_EQ(expected_appts[i], appts[i]);
+
+    // cleanup
+    g_time_zone_unref(gtz);
+}
diff --git a/tests/test-eds-ics-tzids-2.ics b/tests/test-eds-ics-tzids-2.ics
new file mode 100644
index 0000000..f82334c
--- /dev/null
+++ b/tests/test-eds-ics-tzids-2.ics
@@ -0,0 +1,38 @@
+BEGIN:VCALENDAR

+CALSCALE:GREGORIAN

+PRODID:-//Ximian//NONSGML Evolution Calendar//EN

+VERSION:2.0

+X-EVOLUTION-DATA-REVISION:2015-07-09T19:41:50.123217Z(3)

+BEGIN:VTIMEZONE

+TZID:Pacific Time (US & Canada)

+BEGIN:STANDARD

+DTSTART:20061105T020000

+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11

+TZOFFSETFROM:-0700

+TZOFFSETTO:-0800

+END:STANDARD

+BEGIN:DAYLIGHT

+DTSTART:20070311T020000

+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3

+TZOFFSETFROM:-0800

+TZOFFSETTO:-0700

+TZNAME:Daylight Savings Time

+END:DAYLIGHT

+END:VTIMEZONE

+BEGIN:VEVENT

+DTSTART;TZID=Pacific Time (US & Canada):20140121T110000

+DTEND;TZID=Pacific Time (US & Canada):20140121T130000

+UID:109264742

+DTSTAMP:20140120T000718Z

+DESCRIPTION: Event description

+SUMMARY;ENCODING=QUOTED-PRINTABLE:National Incubator Initiative for Clean 

+ Energy (NIICE) FOA: Pre-Concept Paper Informational Webinar

+CREATED:20140120T000741Z

+LAST-MODIFIED:20140120T000741Z

+BEGIN:VALARM

+TRIGGER;VALUE=DURATION:-PT15M

+ACTION:DISPLAY

+DESCRIPTION:Reminder

+END:VALARM

+END:VEVENT

+END:VCALENDAR

diff --git a/tests/test-eds-ics-tzids.cpp b/tests/test-eds-ics-tzids.cpp
new file mode 100644
index 0000000..02a152b
--- /dev/null
+++ b/tests/test-eds-ics-tzids.cpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#include <algorithm>
+
+#include <datetime/alarm-queue-simple.h>
+#include <datetime/clock-mock.h>
+#include <datetime/engine-eds.h>
+#include <datetime/planner-range.h>
+
+#include <gtest/gtest.h>
+
+#include "glib-fixture.h"
+#include "print-to.h"
+#include "timezone-mock.h"
+#include "wakeup-timer-mock.h"
+
+using namespace unity::indicator::datetime;
+using VAlarmFixture = GlibFixture;
+
+/***
+****
+***/
+
+TEST_F(VAlarmFixture, MultipleAppointments)
+{
+    // start the EDS engine
+    auto engine = std::make_shared<EdsEngine>();
+
+    // we need a consistent timezone for the planner and our local DateTimes
+    constexpr char const * zone_str {"Europe/Berlin"};
+    auto tz = std::make_shared<MockTimezone>(zone_str);
+    auto gtz = g_time_zone_new(zone_str);
+
+    // make a planner that looks at the first half of 2015 in EDS
+    auto planner = std::make_shared<SimpleRangePlanner>(engine, tz);
+    const DateTime range_begin {gtz, 2015,7, 1, 0, 0, 0.0};
+    const DateTime range_end   {gtz, 2015,7,31,23,59,59.5};
+    planner->range().set(std::make_pair(range_begin, range_end));
+
+    // give EDS a moment to load
+    if (planner->appointments().get().empty()) {
+        g_message("waiting a moment for EDS to load...");
+        auto on_appointments_changed = [this](const std::vector<Appointment>& appointments){
+            g_message("ah, they loaded");
+            if (!appointments.empty())
+                g_main_loop_quit(loop);
+        };
+        core::ScopedConnection conn(planner->appointments().changed().connect(on_appointments_changed));
+        constexpr int max_wait_sec = 10;
+        wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND);
+    }
+
+    // what we expect to get...
+    std::array<Appointment,1> expected_appts;
+    auto appt = &expected_appts[0];
+    appt->uid = "8ggc30kh89qql8vjumgtug7l14@google.com";
+    appt->color = "#becedd";
+    appt->summary = "Hello";
+    appt->begin = DateTime{gtz,2015,7,1,20,0,0};
+    appt->end = DateTime{gtz,2015,7,1,22,0,0};
+
+    // compare it to what we actually loaded...
+    const auto appts = planner->appointments().get();
+    EXPECT_EQ(expected_appts.size(), appts.size());
+    for (size_t i=0, n=std::min(appts.size(),expected_appts.size()); i<n; i++)
+        EXPECT_EQ(expected_appts[i], appts[i]);
+
+    // cleanup
+    g_time_zone_unref(gtz);
+}
diff --git a/tests/test-eds-ics-tzids.ics b/tests/test-eds-ics-tzids.ics
new file mode 100644
index 0000000..708bda7
--- /dev/null
+++ b/tests/test-eds-ics-tzids.ics
@@ -0,0 +1,56 @@
+BEGIN:VCALENDAR

+CALSCALE:GREGORIAN

+PRODID:-//Ximian//NONSGML Evolution Calendar//EN

+VERSION:2.0

+X-EVOLUTION-DATA-REVISION:2015-07-09T17:27:58.908570Z(0)

+BEGIN:VTIMEZONE

+TZID:/freeassociation.sourceforge.net/Tzfile/America/Sao_Paulo

+X-LIC-LOCATION:America/Sao_Paulo

+BEGIN:STANDARD

+TZNAME:BRT

+DTSTART:19700222T000000

+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=2

+TZOFFSETFROM:-0200

+TZOFFSETTO:-0300

+END:STANDARD

+BEGIN:DAYLIGHT

+TZNAME:BRST

+DTSTART:19701018T000000

+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10

+TZOFFSETFROM:-0300

+TZOFFSETTO:-0200

+END:DAYLIGHT

+END:VTIMEZONE

+BEGIN:VTIMEZONE

+TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Berlin

+X-LIC-LOCATION:Europe/Berlin

+BEGIN:STANDARD

+TZNAME:CET

+DTSTART:19701025T030000

+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10

+TZOFFSETFROM:+0200

+TZOFFSETTO:+0100

+END:STANDARD

+BEGIN:DAYLIGHT

+TZNAME:CEST

+DTSTART:19700329T020000

+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3

+TZOFFSETFROM:+0100

+TZOFFSETTO:+0200

+END:DAYLIGHT

+END:VTIMEZONE

+BEGIN:VEVENT

+STATUS:CONFIRMED

+DTSTAMP:20150708T095820Z

+CREATED:20150708T095820Z

+UID:8ggc30kh89qql8vjumgtug7l14@google.com

+SEQUENCE:0

+TRANSP:OPAQUE

+SUMMARY:Hello

+DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/Europe/Berlin:

+ 20150701T200000

+DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/Europe/Berlin:

+ 20150701T220000

+LAST-MODIFIED:20150708T095820Z

+END:VEVENT

+END:VCALENDAR