From 4024e2c53f51878c7b3c6d222adb460cf4ca8a33 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Tue, 28 Jun 2016 10:26:17 -0300 Subject: Fixed typos; Updated code based on review requests. --- tests/CMakeLists.txt | 2 +- ...ds-ics-repeating-events-with-indival-change.cpp | 110 --- ...ics-repeating-events-with-indival-change.ics.in | 969 --------------------- ...ics-repeating-events-with-individual-change.cpp | 110 +++ ...-repeating-events-with-individual-change.ics.in | 969 +++++++++++++++++++++ 5 files changed, 1080 insertions(+), 1080 deletions(-) delete mode 100644 tests/test-eds-ics-repeating-events-with-indival-change.cpp delete mode 100644 tests/test-eds-ics-repeating-events-with-indival-change.ics.in create mode 100644 tests/test-eds-ics-repeating-events-with-individual-change.cpp create mode 100644 tests/test-eds-ics-repeating-events-with-individual-change.ics.in (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 74d16c9..b7f60bb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -102,7 +102,7 @@ add_eds_ics_test_by_name(test-eds-ics-tzids) add_eds_ics_test_by_name(test-eds-ics-tzids-2) add_eds_ics_test_by_name(test-eds-ics-tzids-utc) add_eds_ics_test_by_name(test-eds-ics-non-attending-alarms) -add_eds_ics_test_by_name(test-eds-ics-repeating-events-with-indival-change) +add_eds_ics_test_by_name(test-eds-ics-repeating-events-with-individual-change) # disabling the timezone unit tests because they require # https://code.launchpad.net/~ted/dbus-test-runner/multi-interface-test/+merge/199724 diff --git a/tests/test-eds-ics-repeating-events-with-indival-change.cpp b/tests/test-eds-ics-repeating-events-with-indival-change.cpp deleted file mode 100644 index a4a85c0..0000000 --- a/tests/test-eds-ics-repeating-events-with-indival-change.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2016 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: - * Renato Araujo Oliveira Filho - */ - -#include - -#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 ayatana::indicator::datetime; -using VAlarmFixture = GlibFixture; - -/*** -**** -***/ - -TEST_F(VAlarmFixture, RepeatingEventsWithIndividualChange) -{ - // start the EDS engine - auto engine = std::make_shared(std::make_shared()); - - // we need a consistent timezone for the planner and our local DateTimes - constexpr char const * zone_str {"America/Recife"}; - auto tz = std::make_shared(zone_str); - #if GLIB_CHECK_VERSION(2, 68, 0) - auto gtz = g_time_zone_new_identifier(zone_str); - - if (gtz == NULL) - { - gtz = g_time_zone_new_utc(); - } - #else - auto gtz = g_time_zone_new(zone_str); - #endif - - // make a planner that looks at the year of 2016 in EDS - auto planner = std::make_shared(engine, tz); - const DateTime range_begin {gtz, 2016,1, 1, 0, 0, 0.0}; - const DateTime range_end {gtz, 2016,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... - Appointment expected_appt; - expected_appt.summary = "Alarm"; - std::array expected_times = { - DateTime(gtz,2016,6, 20,10,00,0), - DateTime(gtz,2016,6, 21,10,00,0), - DateTime(gtz,2016,6, 22,10,00,0), - DateTime(gtz,2016,6, 23,10,00,0), - DateTime(gtz,2016,6, 24,20,00,0), - DateTime(gtz,2016,6, 25,10,00,0), - DateTime(gtz,2016,6, 26,10,00,0), - DateTime(gtz,2016,6, 27,10,00,0), - DateTime(gtz,2016,6, 28,10,00,0), - DateTime(gtz,2016,6, 29,10,00,0) - }; - - // compare it to what we actually loaded... - const auto appts = planner->appointments().get(); - EXPECT_EQ(expected_times.size(), appts.size()); - for (size_t i=0, n=expected_times.size(); i. + * + * Authors: + * Renato Araujo Oliveira Filho + */ + +#include + +#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 ayatana::indicator::datetime; +using VAlarmFixture = GlibFixture; + +/*** +**** +***/ + +TEST_F(VAlarmFixture, RepeatingEventsWithIndividualChange) +{ + // start the EDS engine + auto engine = std::make_shared(std::make_shared()); + + // we need a consistent timezone for the planner and our local DateTimes + constexpr char const * zone_str {"America/Recife"}; + auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else + auto gtz = g_time_zone_new(zone_str); + #endif + + // make a planner that looks at the year of 2016 in EDS + auto planner = std::make_shared(engine, tz); + const DateTime range_begin {gtz, 2016,1, 1, 0, 0, 0.0}; + const DateTime range_end {gtz, 2016,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... + Appointment expected_appt; + expected_appt.summary = "Alarm"; + std::array expected_times = { + DateTime(gtz,2016,6, 20,10,00,0), + DateTime(gtz,2016,6, 21,10,00,0), + DateTime(gtz,2016,6, 22,10,00,0), + DateTime(gtz,2016,6, 23,10,00,0), + DateTime(gtz,2016,6, 24,20,00,0), + DateTime(gtz,2016,6, 25,10,00,0), + DateTime(gtz,2016,6, 26,10,00,0), + DateTime(gtz,2016,6, 27,10,00,0), + DateTime(gtz,2016,6, 28,10,00,0), + DateTime(gtz,2016,6, 29,10,00,0) + }; + + // compare it to what we actually loaded... + const auto appts = planner->appointments().get(); + EXPECT_EQ(expected_times.size(), appts.size()); + for (size_t i=0, n=expected_times.size(); i