From 32ebc44249a2ce81bfa3eff39f31e9ae8eb28ef9 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 2 Jun 2015 16:12:13 +1200 Subject: Build against libecal 3.16 --- CMakeLists.txt | 2 +- debian/control | 2 +- src/engine-eds.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d2fd95..e01cd0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ pkg_check_modules (SERVICE_DEPS REQUIRED glib-2.0>=2.36 gio-unix-2.0>=2.36 libical>=0.48 - libecal-1.2>=3.5 + libecal-1.2>=3.16 libedataserver-1.2>=3.5 gstreamer-1.0>=1.2 libnotify>=0.7.6 diff --git a/debian/control b/debian/control index e9f14ec..c2bc3a9 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: cmake, libglib2.0-dev (>= 2.35.4), libnotify-dev (>= 0.7.6), libgstreamer1.0-dev, - libecal1.2-dev (>= 3.5), + libecal1.2-dev (>= 3.16), libical-dev (>= 1.0), libedataserver1.2-dev (>= 3.5), liburl-dispatcher1-dev, diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 474bac5..f1c691e 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -263,6 +263,7 @@ private: g_debug("%s connecting a client to source %s", G_STRFUNC, source_uid); e_cal_client_connect(source, source_type, + -1, self->m_cancellable, on_client_connected, gself); -- cgit v1.2.3 From b3d51b5e7c88766c166a384db6497bc33b8e1e67 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 18 Jun 2015 17:10:05 +0100 Subject: Update D-Bus interface versions for the testsuite --- tests/CMakeLists.txt | 2 +- tests/run-eds-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8b6ec5d..1332529 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -75,7 +75,7 @@ find_program(EVOLUTION_SOURCE_REGISTRY evolution-source-registry PATHS /usr/lib/ find_program(GVFSD gvfsd PATHS /usr/lib/gvfs/) OPTION(EVOLUTION_SOURCE_SERVICE_NAME "DBus name for source registry") if(NOT EVOLUTION_SOURCE_SERVICE_NAME) - set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3") + set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4") endif() function(add_eds_test_by_name name) diff --git a/tests/run-eds-test.sh b/tests/run-eds-test.sh index 0183350..1fa28a3 100755 --- a/tests/run-eds-test.sh +++ b/tests/run-eds-test.sh @@ -43,7 +43,7 @@ fi # run dbus-test-runner $1 --keep-env --max-wait=90 \ ---task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4 \ +--task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar7 \ --task $4 --task-name "evolution" --wait-until-complete -r #--task $6 --task-name "source-registry" --wait-for=org.gtk.vfs.Daemon -r \ #--task $7 --task-name "gvfsd" -r -- cgit v1.2.3 From e1205e09efa7bed564d1d1a1e8c5951c7984ea85 Mon Sep 17 00:00:00 2001 From: CI Train Bot Date: Thu, 18 Jun 2015 19:25:41 +0000 Subject: Releasing 13.10.0+15.04.20150618-0ubuntu1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 385a391..543caf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (13.10.0+15.04.20150618-0ubuntu1) vivid; urgency=medium + + [ Charles Kerr ] + * Fix invalid valarms in older clock-app alarms. (LP: #1465806) + + -- CI Train Bot Thu, 18 Jun 2015 19:25:41 +0000 + indicator-datetime (13.10.0+15.04.20150521-0ubuntu1) vivid; urgency=medium [ Charles Kerr ] -- cgit v1.2.3 From 61189fa59ce4e366e5761f0444cd5ead42f78e77 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 9 Jul 2015 14:14:32 -0500 Subject: add failing test for timezone issue in bug #1473068 --- tests/CMakeLists.txt | 1 + tests/test-eds-ics-tzids.cpp | 87 ++++++++++++++++++++++++++++++++++++++++++++ tests/test-eds-ics-tzids.ics | 56 ++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 tests/test-eds-ics-tzids.cpp create mode 100644 tests/test-eds-ics-tzids.ics diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 123aa9a..743cea8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -99,6 +99,7 @@ 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) # disabling the timezone unit tests because they require 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 . + * + * Authors: + * Charles Kerr + */ + +#include + +#include +#include +#include +#include + +#include + +#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(); + + // we need a consistent timezone for the planner and our local DateTimes + constexpr char const * zone_str {"Europe/Berlin"}; + auto tz = std::make_shared(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(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& 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 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 Date: Thu, 9 Jul 2015 14:16:42 -0500 Subject: make the EDS EngineImpl's GCancellable a shared pointer, since we're about to start passing it around to subtasks --- src/engine-eds.cpp | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index b6b4f5e..0e5bec6 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -47,16 +47,21 @@ class EdsEngine::Impl { public: - Impl(): - m_cancellable(g_cancellable_new()) + Impl() { - e_source_registry_new(m_cancellable, on_source_registry_ready, this); + auto cancellable_deleter = [](GCancellable * c) { + g_cancellable_cancel(c); + g_clear_object(&c); + }; + + m_cancellable = std::shared_ptr(g_cancellable_new(), cancellable_deleter); + + e_source_registry_new(m_cancellable.get(), on_source_registry_ready, this); } ~Impl() { - g_cancellable_cancel(m_cancellable); - g_clear_object(&m_cancellable); + m_cancellable.reset(); while(!m_sources.empty()) remove_source(*m_sources.begin()); @@ -131,7 +136,7 @@ public: e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), on_alarm_component_list_ready, new ClientSubtask(main_task, client, color)); g_clear_pointer(&sexp, g_free); @@ -142,7 +147,7 @@ public: e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), on_event_component_list_ready, new ClientSubtask(main_task, client, color)); g_clear_pointer(&sexp, g_free); @@ -160,7 +165,7 @@ public: e_cal_client_get_object(kv.second, appointment.uid.c_str(), nullptr, - m_cancellable, + m_cancellable.get(), on_object_ready_for_disable, this); } @@ -271,7 +276,7 @@ private: g_debug("%s connecting a client to source %s", G_STRFUNC, source_uid); e_cal_client_connect(source, source_type, - self->m_cancellable, + self->m_cancellable.get(), on_client_connected, gself); } @@ -306,7 +311,7 @@ private: // now create a view for it so that we can listen for changes e_cal_client_get_view (ecc, "#t", // match all - self->m_cancellable, + self->m_cancellable.get(), on_client_view_ready, self); @@ -429,7 +434,7 @@ private: e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), ensure_client_alarms_have_triggers_async_cb, this); @@ -510,7 +515,7 @@ private: e_cal_client_modify_objects(client, modify_slist, E_CAL_OBJ_MOD_ALL, - m_cancellable, + m_cancellable.get(), ensure_canonical_alarms_have_triggers_async_cb, this); @@ -839,7 +844,7 @@ private: ClientSubtask * subtask, GTimeZone * gtz) { - // events with alarms are covered by add_alarm_to_subtask(), + // events with alarms are covered by add_alarms_to_subtask(), // so skip them here auto auids = e_cal_component_get_alarm_uids(component); const bool has_alarms = auids != nullptr; @@ -958,7 +963,7 @@ private: e_cal_client_modify_object(E_CAL_CLIENT(client), e_cal_component_get_icalcomponent(ecc), E_CAL_OBJ_MOD_THIS, - static_cast(gself)->m_cancellable, + static_cast(gself)->m_cancellable.get(), on_disable_done, nullptr); @@ -990,7 +995,7 @@ private: std::set m_sources; std::map m_clients; std::map m_views; - GCancellable* m_cancellable {}; + std::shared_ptr m_cancellable; ESourceRegistry* m_source_registry {}; guint m_rebuild_tag {}; time_t m_rebuild_deadline {}; -- cgit v1.2.3 From a08215ada9d1e9cae475ba4df5121c2b09ad1d13 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 9 Jul 2015 14:18:08 -0500 Subject: when possible, ask the ECalClient for the icaltimezone to use --- src/engine-eds.cpp | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 0e5bec6..9a54b74 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -138,7 +138,7 @@ public: sexp, m_cancellable.get(), on_alarm_component_list_ready, - new ClientSubtask(main_task, client, color)); + new ClientSubtask(main_task, client, m_cancellable, color)); g_clear_pointer(&sexp, g_free); // ask EDS about events that occur in this window... @@ -149,7 +149,7 @@ public: sexp, m_cancellable.get(), on_event_component_list_ready, - new ClientSubtask(main_task, client, color)); + new ClientSubtask(main_task, client, m_cancellable, color)); g_clear_pointer(&sexp, g_free); g_clear_pointer(&sexp_fmt, g_free); @@ -585,13 +585,16 @@ private: { std::shared_ptr task; ECalClient* client; + std::shared_ptr cancellable; std::string color; ClientSubtask(const std::shared_ptr& task_in, ECalClient* client_in, + const std::shared_ptr& cancellable_in, const char* color_in): task(task_in), - client(client_in) + client(client_in), + cancellable(cancellable_in) { if (color_in) color = color_in; @@ -725,15 +728,33 @@ private: } static DateTime - datetime_from_component_date_time(const ECalComponentDateTime & in, - GTimeZone * default_timezone) + datetime_from_component_date_time(ECalClient * client, + std::shared_ptr & cancellable, + const ECalComponentDateTime & in, + GTimeZone * default_timezone) { DateTime out; - g_return_val_if_fail(in.value != nullptr, out); - auto gtz = in.tzid == nullptr ? g_time_zone_ref(default_timezone) - : g_time_zone_new(in.tzid); + GTimeZone * gtz {}; + if (in.tzid != nullptr) + { + const char * tzid {}; + icaltimezone * itz {}; // owned by client + + if (e_cal_client_get_timezone_sync(client, in.tzid, &itz, cancellable.get(), nullptr)) + { + tzid = icaltimezone_get_location(itz); + } + + gtz = g_time_zone_new(tzid); + g_debug("%s eccdt.tzid -> offset is %d", G_STRLOC, in.tzid, (int)g_time_zone_get_offset(gtz,0)); + } + else + { + gtz = g_time_zone_ref(default_timezone); + } + out = DateTime(gtz, in.value->year, in.value->month, @@ -778,7 +799,10 @@ private: } static Appointment - get_appointment(ECalComponent * component, GTimeZone * gtz) + get_appointment(ECalClient * client, + std::shared_ptr & cancellable, + ECalComponent * component, + GTimeZone * gtz) { Appointment baseline; @@ -797,13 +821,13 @@ private: // get appointment.begin ECalComponentDateTime eccdt_tmp {}; e_cal_component_get_dtstart(component, &eccdt_tmp); - baseline.begin = datetime_from_component_date_time(eccdt_tmp, gtz); + baseline.begin = datetime_from_component_date_time(client, cancellable, eccdt_tmp, gtz); e_cal_component_free_datetime(&eccdt_tmp); // get appointment.end e_cal_component_get_dtend(component, &eccdt_tmp); baseline.end = eccdt_tmp.value != nullptr - ? datetime_from_component_date_time(eccdt_tmp, gtz) + ? datetime_from_component_date_time(client, cancellable, eccdt_tmp, gtz) : baseline.begin; e_cal_component_free_datetime(&eccdt_tmp); @@ -855,7 +879,7 @@ private: // add it. simple, eh? if (is_component_interesting(component)) { - Appointment appointment = get_appointment(component, gtz); + Appointment appointment = get_appointment(subtask->client, subtask->cancellable, component, gtz); appointment.color = subtask->color; subtask->task->appointments.push_back(appointment); } @@ -871,7 +895,7 @@ private: if (!is_component_interesting(component)) return; - Appointment baseline = get_appointment(component, gtz); + Appointment baseline = get_appointment(subtask->client, subtask->cancellable, component, gtz); baseline.color = subtask->color; /** -- cgit v1.2.3 From 42bd1c1066978afa3040266f243a0582a73f453a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 9 Jul 2015 15:33:18 -0500 Subject: avoid the round trip to EDS if we can figure out the tzid from libical first --- src/engine-eds.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 9a54b74..746b9af 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -740,12 +740,18 @@ private: if (in.tzid != nullptr) { const char * tzid {}; - icaltimezone * itz {}; // owned by client + icaltimezone * itz {}; - if (e_cal_client_get_timezone_sync(client, in.tzid, &itz, cancellable.get(), nullptr)) - { + itz = icaltimezone_get_builtin_timezone_from_tzid(in.tzid); // usually works + + if (itz == nullptr) // fallback + itz = icaltimezone_get_builtin_timezone(in.tzid); + + if (itz == nullptr) // ok, I give up... make a round trip on the bus to ask EDS to look it up in VTIMEZONES + e_cal_client_get_timezone_sync(client, in.tzid, &itz, cancellable.get(), nullptr); + + if (itz != nullptr) tzid = icaltimezone_get_location(itz); - } gtz = g_time_zone_new(tzid); g_debug("%s eccdt.tzid -> offset is %d", G_STRLOC, in.tzid, (int)g_time_zone_get_offset(gtz,0)); -- cgit v1.2.3 From b68ecc1533f50871271234708bcbf419d8fc29c4 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 9 Jul 2015 15:46:09 -0500 Subject: add dobey's test case that has 'TZID:Pacific Time (US & Canada)' --- tests/CMakeLists.txt | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 743cea8..2f91a81 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -45,21 +45,21 @@ function(add_test_by_name name) add_test (${TEST_NAME} ${TEST_NAME}) target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS}) endfunction() -add_test_by_name(test-datetime) -add_test_by_name(test-snap) -add_test_by_name(test-actions) -add_test_by_name(test-alarm-queue) -add_test(NAME dear-reader-the-next-test-takes-60-seconds COMMAND true) -add_test_by_name(test-clock) -add_test_by_name(test-exporter) -add_test_by_name(test-formatter) -add_test_by_name(test-live-actions) -add_test_by_name(test-locations) -add_test_by_name(test-menus) -add_test_by_name(test-planner) -add_test_by_name(test-settings) -add_test_by_name(test-timezone-file) -add_test_by_name(test-utils) +#add_test_by_name(test-datetime) +#add_test_by_name(test-snap) +#add_test_by_name(test-actions) +#add_test_by_name(test-alarm-queue) +#add_test(NAME dear-reader-the-next-test-takes-60-seconds COMMAND true) +#add_test_by_name(test-clock) +#add_test_by_name(test-exporter) +#add_test_by_name(test-formatter) +#add_test_by_name(test-live-actions) +#add_test_by_name(test-locations) +#add_test_by_name(test-menus) +#add_test_by_name(test-planner) +#add_test_by_name(test-settings) +#add_test_by_name(test-timezone-file) +#add_test_by_name(test-utils) set (TEST_NAME manual-test-snap) add_executable (${TEST_NAME} ${TEST_NAME}.cpp) @@ -94,12 +94,13 @@ function(add_eds_ics_test_by_name name) ${CMAKE_CURRENT_SOURCE_DIR}/test-eds-ics-config-files # arg8: base directory for config file template ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics) # arg9: the ical file for this test endfunction() -add_eds_ics_test_by_name(test-eds-ics-all-day-events) -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-all-day-events) +#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 -- cgit v1.2.3 From 6031f62f02d1e76fe5fb53957533b958a979bd8e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 9 Jul 2015 15:51:10 -0500 Subject: oops, disabling the other tests was only supposed to be to speed up local tests & wasn't supposed to be pushed --- tests/CMakeLists.txt | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2f91a81..8196654 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -45,21 +45,21 @@ function(add_test_by_name name) add_test (${TEST_NAME} ${TEST_NAME}) target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS}) endfunction() -#add_test_by_name(test-datetime) -#add_test_by_name(test-snap) -#add_test_by_name(test-actions) -#add_test_by_name(test-alarm-queue) -#add_test(NAME dear-reader-the-next-test-takes-60-seconds COMMAND true) -#add_test_by_name(test-clock) -#add_test_by_name(test-exporter) -#add_test_by_name(test-formatter) -#add_test_by_name(test-live-actions) -#add_test_by_name(test-locations) -#add_test_by_name(test-menus) -#add_test_by_name(test-planner) -#add_test_by_name(test-settings) -#add_test_by_name(test-timezone-file) -#add_test_by_name(test-utils) +add_test_by_name(test-datetime) +add_test_by_name(test-snap) +add_test_by_name(test-actions) +add_test_by_name(test-alarm-queue) +add_test(NAME dear-reader-the-next-test-takes-60-seconds COMMAND true) +add_test_by_name(test-clock) +add_test_by_name(test-exporter) +add_test_by_name(test-formatter) +add_test_by_name(test-live-actions) +add_test_by_name(test-locations) +add_test_by_name(test-menus) +add_test_by_name(test-planner) +add_test_by_name(test-settings) +add_test_by_name(test-timezone-file) +add_test_by_name(test-utils) set (TEST_NAME manual-test-snap) add_executable (${TEST_NAME} ${TEST_NAME}.cpp) @@ -94,12 +94,12 @@ function(add_eds_ics_test_by_name name) ${CMAKE_CURRENT_SOURCE_DIR}/test-eds-ics-config-files # arg8: base directory for config file template ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics) # arg9: the ical file for this test endfunction() -#add_eds_ics_test_by_name(test-eds-ics-all-day-events) -#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-all-day-events) +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) -- cgit v1.2.3 From b6bdb4e57cfed4d75e8d3b4bf0c738c969929763 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 9 Jul 2015 15:56:13 -0500 Subject: add dobey's tests --- tests/test-eds-ics-tzids-2.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++ tests/test-eds-ics-tzids-2.ics | 38 ++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 tests/test-eds-ics-tzids-2.cpp create mode 100644 tests/test-eds-ics-tzids-2.ics 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 . + * + * Authors: + * Charles Kerr + */ + +#include + +#include +#include +#include +#include + +#include + +#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(); + + // 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(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(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& 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 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({"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 Date: Thu, 9 Jul 2015 16:04:19 -0500 Subject: add a g_warning() if we can't suss out the tzid --- src/engine-eds.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 746b9af..d9efa5f 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -739,19 +739,24 @@ private: GTimeZone * gtz {}; if (in.tzid != nullptr) { - const char * tzid {}; - icaltimezone * itz {}; - - itz = icaltimezone_get_builtin_timezone_from_tzid(in.tzid); // usually works + auto itz = icaltimezone_get_builtin_timezone_from_tzid(in.tzid); // usually works if (itz == nullptr) // fallback itz = icaltimezone_get_builtin_timezone(in.tzid); - if (itz == nullptr) // ok, I give up... make a round trip on the bus to ask EDS to look it up in VTIMEZONES + if (itz == nullptr) // ok we have a strange tzid... ask EDS to look it up in VTIMEZONES e_cal_client_get_timezone_sync(client, in.tzid, &itz, cancellable.get(), nullptr); + const char * tzid; if (itz != nullptr) + { tzid = icaltimezone_get_location(itz); + } + else + { + g_warning("Unrecognized TZID: '%s'", in.tzid); + tzid = nullptr; + } gtz = g_time_zone_new(tzid); g_debug("%s eccdt.tzid -> offset is %d", G_STRLOC, in.tzid, (int)g_time_zone_get_offset(gtz,0)); -- cgit v1.2.3 From 55e0db0b04fb8209e71bd26b73564d4a7cba12e7 Mon Sep 17 00:00:00 2001 From: CI Train Bot Date: Fri, 10 Jul 2015 20:35:47 +0000 Subject: Releasing 13.10.0+15.10.20150710.1-0ubuntu1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index de3f46c..2c5e1d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (13.10.0+15.10.20150710.1-0ubuntu1) wily; urgency=medium + + * New rebuild forced. + + -- CI Train Bot Fri, 10 Jul 2015 20:35:47 +0000 + indicator-datetime (13.10.0+15.10.20150624-0ubuntu1) wily; urgency=medium [ Charles Kerr ] -- cgit v1.2.3