From 58efd72df90047765721c6e931da22abdb3a956a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 May 2015 07:47:24 -0500 Subject: in eds-engine, add a occur-in-time-range sexp to handle events that are interesting but don't require user notification alarms --- tests/CMakeLists.txt | 1 + tests/print-to.h | 11 ++++- tests/test-eds-ics-all-day-events.cpp | 91 +++++++++++++++++++++++++++++++++++ tests/test-eds-ics-all-day-events.ics | 19 ++++++++ 4 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 tests/test-eds-ics-all-day-events.cpp create mode 100644 tests/test-eds-ics-all-day-events.ics (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4530ff7..1e22100 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -94,6 +94,7 @@ 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) diff --git a/tests/print-to.h b/tests/print-to.h index 78cf574..f4af2f7 100644 --- a/tests/print-to.h +++ b/tests/print-to.h @@ -32,10 +32,19 @@ namespace datetime { **** PrintTo() functions for GTest to represent objects as strings ***/ +void +PrintTo(const DateTime& datetime, std::ostream* os) +{ + *os << "{time:'" << datetime.format("%F %T %z") << '}'; +} + void PrintTo(const Alarm& alarm, std::ostream* os) { - *os << "{text:'" << alarm.text << "', audio_url:'" << alarm.audio_url << "', time:'"<. + * + * 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/Chicago"}; + 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,1, 1, 0, 0, 0.0}; + const DateTime range_end {gtz, 2015,6,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.uid = "20150521T111538Z-7449-1000-3572-0@ghidorah"; + expected_appt.color = "#becedd"; + expected_appt.summary = "Memorial Day"; + expected_appt.begin = DateTime{gtz,2015,5,25,0,0,0}; + expected_appt.end = DateTime{gtz,2015,5,26,0,0,0}; + + // compare it to what we actually loaded... + const auto appts = planner->appointments().get(); + ASSERT_EQ(1, appts.size()); + const auto& appt = appts[0]; + EXPECT_EQ(expected_appt.begin, appt.begin); + EXPECT_EQ(expected_appt.end, appt.end); + EXPECT_EQ(expected_appt.uid, appt.uid); + EXPECT_EQ(expected_appt.color, appt.color); + EXPECT_EQ(expected_appt.summary, appt.summary); + EXPECT_EQ(0, appt.alarms.size()); + + // cleanup + g_time_zone_unref(gtz); +} diff --git a/tests/test-eds-ics-all-day-events.ics b/tests/test-eds-ics-all-day-events.ics new file mode 100644 index 0000000..0cf7dab --- /dev/null +++ b/tests/test-eds-ics-all-day-events.ics @@ -0,0 +1,19 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Ximian//NONSGML Evolution Calendar//EN +VERSION:2.0 +X-EVOLUTION-DATA-REVISION:2015-05-07T21:14:49.315443Z(0) +BEGIN:VEVENT +UID:20150521T111538Z-7449-1000-3572-0@ghidorah +DTSTAMP:20150521T001128Z +DTSTART;VALUE=DATE:20150525 +DTEND;VALUE=DATE:20150526 +TRANSP:TRANSPARENT +SEQUENCE:2 +SUMMARY:Memorial Day +DESCRIPTION:Today is Memorial Day +CLASS:PUBLIC +CREATED:20150521T111638Z +LAST-MODIFIED:20150521T111638Z +END:VEVENT +END:VCALENDAR -- cgit v1.2.3