From 8bd6bf4dbb9072a33d3f5d91cbffd1fd8172fcf3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 23 Jun 2015 08:00:28 -0500 Subject: remove unnecessary pieces from the EDS test scaffolding. clean up script variable names. --- tests/CMakeLists.txt | 21 +++++-------------- tests/run-eds-ics-test.sh | 51 +++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 42 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 123aa9a..f3ee612 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -70,13 +70,6 @@ target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${SERVICE_DEP ## find_program(DBUS_RUNNER dbus-test-runner) -find_program(EVOLUTION_CALENDAR_FACTORY evolution-calendar-factory PATHS /usr/lib/evolution/) -find_program(EVOLUTION_SOURCE_REGISTRY evolution-source-registry PATHS /usr/lib/evolution/) -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") -endif() function(add_eds_ics_test_by_name name) set (TEST_NAME ${name}) @@ -84,15 +77,11 @@ function(add_eds_ics_test_by_name name) target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS}) add_test (${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-ics-test.sh - ${DBUS_RUNNER} # arg1: dbus-test-runner exec - ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} # arg2: test executable path - ${TEST_NAME} # arg3: test name - ${EVOLUTION_CALENDAR_FACTORY} # arg4: evolution-calendar-factory exec - ${EVOLUTION_SOURCE_SERVICE_NAME} # arg5: dbus name for source registry - ${EVOLUTION_SOURCE_REGISTRY} # arg6: evolution-source-registry exec - ${GVFSD} # arg7: gvfsd exec - ${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 + ${DBUS_RUNNER} # arg1: dbus-test-runner exec + ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} # arg2: test executable path + ${TEST_NAME} # arg3: test name + ${CMAKE_CURRENT_SOURCE_DIR}/test-eds-ics-config-files # arg4: base directory for config file template + ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics) # arg5: 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) diff --git a/tests/run-eds-ics-test.sh b/tests/run-eds-ics-test.sh index a257de4..63fc6bc 100755 --- a/tests/run-eds-ics-test.sh +++ b/tests/run-eds-ics-test.sh @@ -1,19 +1,22 @@ #!/bin/sh -echo ARG0=$0 # this script -echo ARG1=$1 # full executable path of dbus-test-runner -echo ARG2=$2 # full executable path of test app -echo ARG3=$3 # test name -echo ARG4=$4 # full executable path of evolution-calendar-factory -echo ARG5=$5 # bus service name of calendar factory -echo ARG6=$6 # full exectuable path of evolution-source-registry -echo ARG7=$7 # full executable path of gvfs -echo ARG8=$8 # config files -echo ARG8=$9 # ics file +SELF=$0 # this script +TEST_RUNNER=$1 # full executable path of dbus-test-runner +TEST_EXEC=$2 # full executable path of test app +TEST_NAME=$3 # test name +CONFIG_DIR=$4 # config files +ICS_FILE=$5 # ical file holding test data -# set up the tmpdir and tell the shell to purge it when we exit -export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d $3-XXXXXXXXXX) || exit 1 -echo "running test '$3' in ${TEST_TMP_DIR}" +echo "this script: ${SELF}" +echo "test-runner: ${TEST_RUNNER}" +echo "test-exec: ${TEST_EXEC}" +echo "test-name: ${TEST_NAME}" +echo "config-dir: ${CONFIG_DIR}" +echo "ics-file: ${ICS_FILE}" + +# set up the tmpdir +export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d ${TEST_NAME}-XXXXXXXXXX) || exit 1 +echo "running test '${TEST_NAME}' in ${TEST_TMP_DIR}" # set up the environment variables export QT_QPA_PLATFORM=minimal @@ -40,23 +43,19 @@ echo HOMEDIR=${HOME} rm -rf ${XDG_DATA_HOME} # if there are canned config files for this test, move them into place now -if [ -d $8 ]; then - echo "copying files from $8 to $HOME" - cp --verbose --archive $8/. $HOME +if [ -d ${CONFIG_DIR} ]; then + echo "copying files from ${CONFIG_DIR} to $HOME" + cp --verbose --archive ${CONFIG_DIR}/. $HOME fi -# if there's a specific ics file to test, copy it on top of the canned confilg files -if [ -e $9 ]; then - echo "copying $9 into $HOME" - cp --verbose --archive $9 ${XDG_DATA_HOME}/evolution/tasks/system/tasks.ics +# if there's a specific ics file to test, copy it on top of the canned config files +if [ -e ${ICS_FILE} ]; then + echo "copying ${ICS_FILE} into $HOME" + cp --verbose --archive ${ICS_FILE} ${XDG_DATA_HOME}/evolution/tasks/system/tasks.ics 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 $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 +# run the test +${TEST_RUNNER} --keep-env --max-wait=90 --task ${TEST_EXEC} --task-name ${TEST_NAME} --wait-until-complete rv=$? # if the test passed, blow away the tmpdir -- 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 (limited to 'tests') 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 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(-) (limited to 'tests') 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(-) (limited to 'tests') 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 (limited to 'tests') 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