aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2015-05-20 18:23:32 -0500
committerCharles Kerr <charles.kerr@canonical.com>2015-05-20 18:23:32 -0500
commit7577ad720a9183b1a56217aeaaef01f763c11bc7 (patch)
tree294ba83581e82b13817696a50f9a3d98c800b717
parent45122eb294b281fb939aea315fa35ddb96cf44d1 (diff)
downloadayatana-indicator-datetime-7577ad720a9183b1a56217aeaaef01f763c11bc7.tar.gz
ayatana-indicator-datetime-7577ad720a9183b1a56217aeaaef01f763c11bc7.tar.bz2
ayatana-indicator-datetime-7577ad720a9183b1a56217aeaaef01f763c11bc7.zip
Add an EDS test for nonrepeating alarms. Refactor the EDS testing structure slightly so that more of the basic config setup can be shared.
-rw-r--r--tests/CMakeLists.txt28
-rwxr-xr-xtests/run-eds-ics-test.sh (renamed from tests/run-eds-test.sh)7
-rw-r--r--tests/test-eds-ics-config-files/.config/evolution/sources/system-proxy.source (renamed from tests/test-eds-tasks-config-files/.config/evolution/sources/system-proxy.source)0
-rw-r--r--tests/test-eds-ics-nonrepeating-events.cpp93
-rw-r--r--tests/test-eds-ics-nonrepeating-events.ics27
-rw-r--r--tests/test-eds-ics-repeating-events.cpp (renamed from tests/test-eds-tasks.cpp)0
-rw-r--r--tests/test-eds-ics-repeating-events.ics (renamed from tests/test-eds-tasks-config-files/.local/share/evolution/tasks/system/tasks.ics)0
-rw-r--r--tests/test-eds-ics-repeating-valarms.cpp (renamed from tests/test-eds-valarms.cpp)0
-rw-r--r--tests/test-eds-ics-repeating-valarms.ics (renamed from tests/test-eds-valarms-config-files/.local/share/evolution/calendar/system/calendar.ics)0
-rw-r--r--tests/test-eds-valarms-config-files/.config/evolution/sources/system-proxy.source21
10 files changed, 141 insertions, 35 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ecbda42..d0b88b2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -78,25 +78,25 @@ if(NOT EVOLUTION_SOURCE_SERVICE_NAME)
set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3")
endif()
-function(add_eds_test_by_name name)
+function(add_eds_ics_test_by_name name)
set (TEST_NAME ${name})
add_executable(${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
add_test (${TEST_NAME}
- ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-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_NAME}-config-files) # arg8: canned config files
+ ${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
endfunction()
-add_eds_test_by_name(test-eds-tasks)
-#add_eds_test_by_name(test-eds-valarms)
-
-
+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)
# disabling the timezone unit tests because they require
diff --git a/tests/run-eds-test.sh b/tests/run-eds-ics-test.sh
index a9eceed..0eeafad 100755
--- a/tests/run-eds-test.sh
+++ b/tests/run-eds-ics-test.sh
@@ -9,6 +9,7 @@ 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
# 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
@@ -44,6 +45,12 @@ if [ -d $8 ]; then
cp --verbose --archive $8/. $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 $HOME/.local/share/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 \
diff --git a/tests/test-eds-tasks-config-files/.config/evolution/sources/system-proxy.source b/tests/test-eds-ics-config-files/.config/evolution/sources/system-proxy.source
index 4b2f666..4b2f666 100644
--- a/tests/test-eds-tasks-config-files/.config/evolution/sources/system-proxy.source
+++ b/tests/test-eds-ics-config-files/.config/evolution/sources/system-proxy.source
diff --git a/tests/test-eds-ics-nonrepeating-events.cpp b/tests/test-eds-ics-nonrepeating-events.cpp
new file mode 100644
index 0000000..a244f1e
--- /dev/null
+++ b/tests/test-eds-ics-nonrepeating-events.cpp
@@ -0,0 +1,93 @@
+/*
+ * 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/Chicago"};
+ 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,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<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...
+ Appointment expected_appt;
+ expected_appt.uid = "20150520T000726Z-3878-32011-1770-81@ubuntu-phablet";
+ expected_appt.color = "#becedd";
+ expected_appt.summary = "Alarm";
+ std::array<Alarm,1> expected_alarms = {
+ Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,20,20,00,0)})
+ };
+
+ // compare it to what we actually loaded...
+ const auto appts = planner->appointments().get();
+ EXPECT_EQ(expected_alarms.size(), appts.size());
+ for (size_t i=0, n=expected_alarms.size(); i<n; i++) {
+ const auto& appt = appts[i];
+ EXPECT_EQ(expected_appt.uid, appt.uid);
+ EXPECT_EQ(expected_appt.color, appt.color);
+ EXPECT_EQ(expected_appt.summary, appt.summary);
+ EXPECT_EQ(1, appt.alarms.size());
+ EXPECT_EQ(expected_alarms[i], appt.alarms[0]);
+ }
+
+ // cleanup
+ g_time_zone_unref(gtz);
+}
diff --git a/tests/test-eds-ics-nonrepeating-events.ics b/tests/test-eds-ics-nonrepeating-events.ics
new file mode 100644
index 0000000..f41fba3
--- /dev/null
+++ b/tests/test-eds-ics-nonrepeating-events.ics
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+X-EVOLUTION-DATA-REVISION:2015-05-20T22:39:32.685099Z(1)
+BEGIN:VTODO
+UID:20150520T000726Z-3878-32011-1770-81@ubuntu-phablet
+DTSTAMP:20150520T223932Z
+DTSTART:20150520T200000
+SUMMARY:Alarm
+CATEGORIES:x-canonical-alarm
+SEQUENCE:1
+LAST-MODIFIED:20150520T223932Z
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20150520T223932Z-22506-32011-1771-2@ubuntu-phablet
+ACTION:AUDIO
+ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg
+TRIGGER;VALUE=DURATION;RELATED=START:PT0S
+END:VALARM
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20150520T223932Z-22506-32011-1771-3@ubuntu-phablet
+ACTION:DISPLAY
+DESCRIPTION:Alarm
+TRIGGER;VALUE=DURATION;RELATED=START:PT0S
+END:VALARM
+END:VTODO
+END:VCALENDAR
diff --git a/tests/test-eds-tasks.cpp b/tests/test-eds-ics-repeating-events.cpp
index 526dcc6..526dcc6 100644
--- a/tests/test-eds-tasks.cpp
+++ b/tests/test-eds-ics-repeating-events.cpp
diff --git a/tests/test-eds-tasks-config-files/.local/share/evolution/tasks/system/tasks.ics b/tests/test-eds-ics-repeating-events.ics
index efde5f7..efde5f7 100644
--- a/tests/test-eds-tasks-config-files/.local/share/evolution/tasks/system/tasks.ics
+++ b/tests/test-eds-ics-repeating-events.ics
diff --git a/tests/test-eds-valarms.cpp b/tests/test-eds-ics-repeating-valarms.cpp
index 47f29e7..47f29e7 100644
--- a/tests/test-eds-valarms.cpp
+++ b/tests/test-eds-ics-repeating-valarms.cpp
diff --git a/tests/test-eds-valarms-config-files/.local/share/evolution/calendar/system/calendar.ics b/tests/test-eds-ics-repeating-valarms.ics
index fe526f4..fe526f4 100644
--- a/tests/test-eds-valarms-config-files/.local/share/evolution/calendar/system/calendar.ics
+++ b/tests/test-eds-ics-repeating-valarms.ics
diff --git a/tests/test-eds-valarms-config-files/.config/evolution/sources/system-proxy.source b/tests/test-eds-valarms-config-files/.config/evolution/sources/system-proxy.source
deleted file mode 100644
index 4b2f666..0000000
--- a/tests/test-eds-valarms-config-files/.config/evolution/sources/system-proxy.source
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[Data Source]
-DisplayName=Default Proxy Settings
-Enabled=true
-Parent=
-
-[Proxy]
-Method=default
-IgnoreHosts=localhost;127.0.0.0/8;::1;
-AutoconfigUrl=
-FtpHost=
-FtpPort=0
-HttpAuthPassword=
-HttpAuthUser=
-HttpHost=
-HttpPort=8080
-HttpUseAuth=false
-HttpsHost=
-HttpsPort=0
-SocksHost=
-SocksPort=0