support for ubuntu-clock-app's alarms Fixes: 1233176, 1237752, 1255716

8 files changed, 248 insertions, 12 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3dcd151..7d590c9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -42,6 +42,7 @@ function(add_test_by_name name)
 endfunction()
 add_test_by_name(test-actions)
 add_test_by_name(test-clock)
+add_test_by_name(test-clock-watcher)
 add_test_by_name(test-exporter)
 add_test_by_name(test-formatter)
 add_test_by_name(test-live-actions)
@@ -52,6 +53,10 @@ 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)
+add_dependencies (${TEST_NAME} libindicatordatetimeservice)
+target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
 
 # 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/geoclue-fixture.h b/tests/geoclue-fixture.h
index 7e29018..0c597d3 100644
--- a/tests/geoclue-fixture.h
+++ b/tests/geoclue-fixture.h
@@ -95,7 +95,7 @@ class GeoclueFixture : public GlibFixture
 
       // I've looked and can't find where this extra ref is coming from.
       // is there an unbalanced ref to the bus in the test harness?!
-      while (bus != NULL)
+      while (bus != nullptr)
         {
           g_object_unref (bus);
           wait_msec (1000);
diff --git a/tests/manual-test-snap.cpp b/tests/manual-test-snap.cpp
new file mode 100644
index 0000000..51556cd
--- /dev/null
+++ b/tests/manual-test-snap.cpp
@@ -0,0 +1,63 @@
+
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ *
+ * 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/>.
+ */
+
+#include <datetime/appointment.h>
+#include <datetime/snap.h>
+
+#include <glib.h>
+
+using namespace unity::indicator::datetime;
+
+/***
+****
+***/
+
+int main()
+{
+    Appointment a;
+    a.color = "green";
+    a.summary = "Alarm";
+    a.url = "alarm:///hello-world";
+    a.uid = "D4B57D50247291478ED31DED17FF0A9838DED402";
+    a.is_event = false;
+    a.is_daily = false;
+    a.has_alarms = true;
+    auto begin = g_date_time_new_local(2014,12,25,0,0,0);
+    auto end = g_date_time_add_full(begin,0,0,1,0,0,-1);
+    a.begin = begin;
+    a.end = end;
+    g_date_time_unref(end);
+    g_date_time_unref(begin);
+
+    auto loop = g_main_loop_new(nullptr, false);
+    auto show = [loop](const Appointment& appt){
+        g_message("You clicked 'show' for appt url '%s'", appt.url.c_str());
+        g_main_loop_quit(loop);
+    };
+    auto dismiss = [loop](const Appointment&){
+        g_message("You clicked 'dismiss'");
+        g_main_loop_quit(loop);
+    };
+    
+    Snap snap;
+    snap(a, show, dismiss);
+    g_main_loop_run(loop);
+    return 0;
+}
diff --git a/tests/test-clock-watcher.cpp b/tests/test-clock-watcher.cpp
new file mode 100644
index 0000000..79b8485
--- /dev/null
+++ b/tests/test-clock-watcher.cpp
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2014 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 <datetime/clock-watcher.h>
+
+#include <gtest/gtest.h>
+
+#include "state-fixture.h"
+
+using namespace unity::indicator::datetime;
+
+class ClockWatcherFixture: public StateFixture
+{
+private:
+
+    typedef StateFixture super;
+
+protected:
+
+    std::vector<std::string> m_triggered;
+    std::unique_ptr<ClockWatcher> m_watcher;
+
+    void SetUp()
+    {
+        super::SetUp();
+
+        m_watcher.reset(new ClockWatcherImpl(m_state));
+        m_watcher->alarm_reached().connect([this](const Appointment& appt){
+            m_triggered.push_back(appt.uid);
+        });
+
+        EXPECT_TRUE(m_triggered.empty());
+    }
+
+    void TearDown()
+    {
+        m_triggered.clear();
+        m_watcher.reset();
+
+        super::TearDown();
+    }
+
+    std::vector<Appointment> build_some_appointments()
+    {
+        const auto now = m_state->clock->localtime();
+        auto tomorrow = g_date_time_add_days (now.get(), 1);
+        auto tomorrow_begin = g_date_time_add_full (tomorrow, 0, 0, 0,
+                                                    -g_date_time_get_hour(tomorrow),
+                                                    -g_date_time_get_minute(tomorrow),
+                                                    -g_date_time_get_seconds(tomorrow));
+        auto tomorrow_end = g_date_time_add_full (tomorrow_begin, 0, 0, 1, 0, 0, -1);
+
+        Appointment a1; // an alarm clock appointment
+        a1.color = "red";
+        a1.summary = "Alarm";
+        a1.summary = "http://www.example.com/";
+        a1.uid = "example";
+        a1.has_alarms = true;
+        a1.begin = tomorrow_begin;
+        a1.end = tomorrow_end;
+
+        auto ubermorgen_begin = g_date_time_add_days (tomorrow, 1);
+        auto ubermorgen_end = g_date_time_add_full (tomorrow_begin, 0, 0, 1, 0, 0, -1);
+
+        Appointment a2; // a non-alarm appointment
+        a2.color = "green";
+        a2.summary = "Other Text";
+        a2.summary = "http://www.monkey.com/";
+        a2.uid = "monkey";
+        a2.has_alarms = false;
+        a2.begin = ubermorgen_begin;
+        a2.end = ubermorgen_end;
+
+        // cleanup
+        g_date_time_unref(ubermorgen_end);
+        g_date_time_unref(ubermorgen_begin);
+        g_date_time_unref(tomorrow_end);
+        g_date_time_unref(tomorrow_begin);
+        g_date_time_unref(tomorrow);
+
+        return std::vector<Appointment>({a1, a2});
+    }
+};
+
+/***
+****
+***/
+
+TEST_F(ClockWatcherFixture, AppointmentsChanged)
+{
+    // Add some appointments to the planner.
+    // One of these matches our state's localtime, so that should get triggered.
+    std::vector<Appointment> a = build_some_appointments();
+    a[0].begin = m_state->clock->localtime();
+    m_state->planner->upcoming.set(a);
+
+    // Confirm that it got fired
+    EXPECT_EQ(1, m_triggered.size());
+    EXPECT_EQ(a[0].uid, m_triggered[0]);
+}
+
+
+TEST_F(ClockWatcherFixture, TimeChanged)
+{
+    // Add some appointments to the planner.
+    // Neither of these match the state's localtime, so nothing should be triggered.
+    std::vector<Appointment> a = build_some_appointments();
+    m_state->planner->upcoming.set(a);
+    EXPECT_TRUE(m_triggered.empty());
+
+    // Set the state's clock to a time that matches one of the appointments.
+    // That appointment should get triggered.
+    m_mock_state->mock_clock->set_localtime(a[1].begin);
+    EXPECT_EQ(1, m_triggered.size());
+    EXPECT_EQ(a[1].uid, m_triggered[0]);
+}
+
+
+TEST_F(ClockWatcherFixture, MoreThanOne)
+{
+    const auto now = m_state->clock->localtime();
+    std::vector<Appointment> a = build_some_appointments();
+    a[0].begin = a[1].begin = now;
+    m_state->planner->upcoming.set(a);
+
+    EXPECT_EQ(2, m_triggered.size());
+    EXPECT_EQ(a[0].uid, m_triggered[0]);
+    EXPECT_EQ(a[1].uid, m_triggered[1]);
+}
+
+
+TEST_F(ClockWatcherFixture, NoDuplicates)
+{
+    // Setup: add an appointment that gets triggered.
+    const auto now = m_state->clock->localtime();
+    const std::vector<Appointment> appointments = build_some_appointments();
+    std::vector<Appointment> a;
+    a.push_back(appointments[0]);
+    a[0].begin = now;
+    m_state->planner->upcoming.set(a);
+    EXPECT_EQ(1, m_triggered.size());
+    EXPECT_EQ(a[0].uid, m_triggered[0]);
+
+    // Now change the appointment vector by adding one to it.
+    // Confirm that the ClockWatcher doesn't re-trigger a[0]
+    a.push_back(appointments[1]);
+    m_state->planner->upcoming.set(a);
+    EXPECT_EQ(1, m_triggered.size());
+    EXPECT_EQ(a[0].uid, m_triggered[0]);
+}
diff --git a/tests/test-clock.cpp b/tests/test-clock.cpp
index 4287e1c..a4924b3 100644
--- a/tests/test-clock.cpp
+++ b/tests/test-clock.cpp
@@ -37,12 +37,12 @@ class ClockFixture: public TestDBusFixture
     void emitPrepareForSleep()
     {
       g_dbus_connection_emit_signal(g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, nullptr),
-                                    NULL,
+                                    nullptr,
                                     "/org/freedesktop/login1", // object path
                                     "org.freedesktop.login1.Manager", // interface
                                     "PrepareForSleep", // signal name
                                     g_variant_new("(b)", FALSE),
-                                    NULL);
+                                    nullptr);
     }
 };
 
diff --git a/tests/test-planner.cpp b/tests/test-planner.cpp
index b476ee8..1923ba1 100644
--- a/tests/test-planner.cpp
+++ b/tests/test-planner.cpp
@@ -28,9 +28,7 @@
 #include <langinfo.h>
 #include <locale.h>
 
-using unity::indicator::datetime::Appointment;
-using unity::indicator::datetime::DateTime;
-using unity::indicator::datetime::PlannerEds;
+using namespace unity::indicator::datetime;
 
 /***
 ****
@@ -40,11 +38,15 @@ typedef GlibFixture PlannerFixture;
 
 TEST_F(PlannerFixture, EDS)
 {
-    PlannerEds planner;
+    auto tmp = g_date_time_new_now_local();
+    const auto now = DateTime(tmp);
+    g_date_time_unref(tmp);
+
+    std::shared_ptr<Clock> clock(new MockClock(now));
+    PlannerEds planner(clock);
     wait_msec(100);
 
-    auto now = g_date_time_new_now_local();
-    planner.time.set(DateTime(now));
+    planner.time.set(now);
     wait_msec(2500);
 
     std::vector<Appointment> this_month = planner.this_month.get();
diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp
index 980e7fa..707247d 100644
--- a/tests/test-settings.cpp
+++ b/tests/test-settings.cpp
@@ -167,8 +167,8 @@ TEST_F(SettingsFixture, Locations)
 {
     const auto key = SETTINGS_LOCATIONS_S;
 
-    const gchar* astrv[] = {"America/Los_Angeles Oakland", "America/Chicago Oklahoma City", "Europe/London London", NULL};
-    const gchar* bstrv[] = {"America/Denver", "Europe/London London", "Europe/Berlin Berlin", NULL};
+    const gchar* astrv[] = {"America/Los_Angeles Oakland", "America/Chicago Oklahoma City", "Europe/London London", nullptr};
+    const gchar* bstrv[] = {"America/Denver", "Europe/London London", "Europe/Berlin Berlin", nullptr};
     const std::vector<std::string> av = strv_to_vector(astrv);
     const std::vector<std::string> bv = strv_to_vector(bstrv);
     
diff --git a/tests/test-utils.cpp b/tests/test-utils.cpp
index 036c13f..97f07ed 100644
--- a/tests/test-utils.cpp
+++ b/tests/test-utils.cpp
@@ -59,7 +59,7 @@ namespace
         const char* location;
         const char* expected_name;
     } beautify_timezone_test_cases[] = {
-        { "America/Chicago", NULL, "Chicago" },
+        { "America/Chicago", nullptr, "Chicago" },
         { "America/Chicago", "America/Chicago", "Chicago" },
         { "America/Chicago", "America/Chigago Chicago", "Chicago" },
         { "America/Chicago", "America/Chicago Oklahoma City", "Oklahoma City" },