From 38a39c03d5b44c825afe0d10f67cc0802dcf2573 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sun, 5 Apr 2015 21:12:01 -0500
Subject: remove some new bits that turned out to be unneeded after all

---
 include/datetime/appointment.h |  2 --
 tests/test-eds-valarms.cpp     | 24 ++----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/include/datetime/appointment.h b/include/datetime/appointment.h
index e9c1bc2..e323c9c 100644
--- a/include/datetime/appointment.h
+++ b/include/datetime/appointment.h
@@ -22,9 +22,7 @@
 
 #include <datetime/date-time.h>
 
-#include <chrono>
 #include <string>
-#include <utility>
 #include <vector>
 
 namespace unity {
diff --git a/tests/test-eds-valarms.cpp b/tests/test-eds-valarms.cpp
index f30539a..e9e07d8 100644
--- a/tests/test-eds-valarms.cpp
+++ b/tests/test-eds-valarms.cpp
@@ -19,8 +19,6 @@
 
 #include <algorithm>
 
-#include <core/connection.h>
-
 #include <datetime/alarm-queue-simple.h>
 #include <datetime/clock-mock.h>
 #include <datetime/engine-eds.h>
@@ -32,27 +30,8 @@
 #include "timezone-mock.h"
 #include "wakeup-timer-mock.h"
 
-
 using namespace unity::indicator::datetime;
-
-class VAlarmFixture: public GlibFixture
-{
-private:
-
-    typedef GlibFixture super;
-
-protected:
-
-    void SetUp()
-    {
-        super::SetUp();
-    }
-
-    void TearDown()
-    {
-        super::TearDown();
-    }
-};
+using VAlarmFixture = GlibFixture;
 
 /***
 ****
@@ -83,6 +62,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
         wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND);
     }
 
+    // the planner should match what we've got in the calendar.ics file
     const auto appts = planner->appointments().get();
     ASSERT_EQ(1, appts.size());
     const auto& appt = appts.front();
-- 
cgit v1.2.3