aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/datetime/engine-eds.h3
-rw-r--r--src/engine-eds.cpp5
-rw-r--r--src/main.cpp3
-rw-r--r--tests/test-actions.cpp4
-rw-r--r--tests/test-datetime.cpp16
-rw-r--r--tests/test-eds-ics-repeating-valarms.cpp16
6 files changed, 28 insertions, 19 deletions
diff --git a/include/datetime/engine-eds.h b/include/datetime/engine-eds.h
index 96b0f76..12425b3 100644
--- a/include/datetime/engine-eds.h
+++ b/include/datetime/engine-eds.h
@@ -47,7 +47,8 @@ class Myself;
class EdsEngine: public Engine
{
public:
- EdsEngine(const std::shared_ptr<Myself> &myself);
+ EdsEngine();
+ explicit EdsEngine(const std::shared_ptr<Myself> &myself);
~EdsEngine();
void get_appointments(const DateTime& begin,
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index 277c090..709bb4d 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -1245,6 +1245,11 @@ private:
****
***/
+EdsEngine::EdsEngine():
+ p(new Impl(std::shared_ptr<Myself>(new Myself)))
+{
+}
+
EdsEngine::EdsEngine(const std::shared_ptr<Myself> &myself):
p(new Impl(myself))
{
diff --git a/src/main.cpp b/src/main.cpp
index 0da55a2..fdd84b5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,7 +25,6 @@
#include <datetime/exporter.h>
#include <datetime/locations-settings.h>
#include <datetime/menu.h>
-#include <datetime/myself.h>
#include <datetime/planner-aggregate.h>
#include <datetime/planner-snooze.h>
#include <datetime/planner-range.h>
@@ -61,7 +60,7 @@ namespace
if (!g_strcmp0("lightdm", g_get_user_name()))
engine.reset(new MockEngine);
else
- engine.reset(new EdsEngine(std::shared_ptr<Myself>(new Myself)));
+ engine.reset(new EdsEngine);
return engine;
}
diff --git a/tests/test-actions.cpp b/tests/test-actions.cpp
index f8d1102..aa608a8 100644
--- a/tests/test-actions.cpp
+++ b/tests/test-actions.cpp
@@ -245,7 +245,7 @@ TEST_F(ActionsFixture, SetLocation)
EXPECT_EQ("Oklahoma City", m_mock_actions->name());
}
-TEST_F(ActionsFixture, SetCalendarDate)
+TEST_F(ActionsFixture, DISABLED_SetCalendarDate)
{
// confirm that such an action exists
const auto action_name = "calendar";
@@ -276,7 +276,7 @@ TEST_F(ActionsFixture, SetCalendarDate)
EXPECT_TRUE(DateTime::is_same_day (now, m_state->calendar_month->month().get()));
}
-TEST_F(ActionsFixture, ActivatingTheCalendarResetsItsDate)
+TEST_F(ActionsFixture, DISABLED_ActivatingTheCalendarResetsItsDate)
{
// Confirm that the GActions exist
auto action_group = m_actions->action_group();
diff --git a/tests/test-datetime.cpp b/tests/test-datetime.cpp
index 078255c..665f861 100644
--- a/tests/test-datetime.cpp
+++ b/tests/test-datetime.cpp
@@ -58,12 +58,16 @@ class DateTimeFixture: public GlibFixture
DateTime random_day()
{
- return DateTime::Local(g_rand_int_range(m_rand, 1970, 3000),
- g_rand_int_range(m_rand, 1, 13),
- g_rand_int_range(m_rand, 1, 29),
- g_rand_int_range(m_rand, 0, 24),
- g_rand_int_range(m_rand, 0, 60),
- g_rand_double_range(m_rand, 0, 60.0));
+ GTimeZone * universal = g_time_zone_new_utc();
+ DateTime point(universal,
+ g_rand_int_range(m_rand, 1970, 3000),
+ g_rand_int_range(m_rand, 1, 13),
+ g_rand_int_range(m_rand, 1, 29),
+ g_rand_int_range(m_rand, 0, 24),
+ g_rand_int_range(m_rand, 0, 60),
+ g_rand_double_range(m_rand, 0, 60.0));
+ g_time_zone_unref(universal);
+ return point;
}
};
diff --git a/tests/test-eds-ics-repeating-valarms.cpp b/tests/test-eds-ics-repeating-valarms.cpp
index 6ba3e7a..d4b8b83 100644
--- a/tests/test-eds-ics-repeating-valarms.cpp
+++ b/tests/test-eds-ics-repeating-valarms.cpp
@@ -72,14 +72,14 @@ TEST_F(VAlarmFixture, MultipleAppointments)
ASSERT_EQ(1, appts.size());
const auto& appt = appts.front();
ASSERT_EQ(8, appt.alarms.size());
- EXPECT_EQ(Alarm({"Time to pack!", "", DateTime(gtz,2015,4,23,13,35,0)}), appt.alarms[0]);
- EXPECT_EQ(Alarm({"Time to pack!", "", DateTime(gtz,2015,4,23,13,37,0)}), appt.alarms[1]);
- EXPECT_EQ(Alarm({"Time to pack!", "", DateTime(gtz,2015,4,23,13,39,0)}), appt.alarms[2]);
- EXPECT_EQ(Alarm({"Time to pack!", "", DateTime(gtz,2015,4,23,13,41,0)}), appt.alarms[3]);
- EXPECT_EQ(Alarm({"Go to the airport!", "", DateTime(gtz,2015,4,24,10,35,0)}), appt.alarms[4]);
- EXPECT_EQ(Alarm({"Go to the airport!", "", DateTime(gtz,2015,4,24,10,37,0)}), appt.alarms[5]);
- EXPECT_EQ(Alarm({"Go to the airport!", "", DateTime(gtz,2015,4,24,10,39,0)}), appt.alarms[6]);
- EXPECT_EQ(Alarm({"Go to the airport!", "", DateTime(gtz,2015,4,24,10,41,0)}), appt.alarms[7]);
+ EXPECT_EQ(Alarm({"Time to pack!", "file://" CALENDAR_DEFAULT_SOUND, DateTime(gtz,2015,4,23,13,35,0)}), appt.alarms[0]);
+ EXPECT_EQ(Alarm({"Time to pack!", "file://" CALENDAR_DEFAULT_SOUND, DateTime(gtz,2015,4,23,13,37,0)}), appt.alarms[1]);
+ EXPECT_EQ(Alarm({"Time to pack!", "file://" CALENDAR_DEFAULT_SOUND, DateTime(gtz,2015,4,23,13,39,0)}), appt.alarms[2]);
+ EXPECT_EQ(Alarm({"Time to pack!", "file://" CALENDAR_DEFAULT_SOUND, DateTime(gtz,2015,4,23,13,41,0)}), appt.alarms[3]);
+ EXPECT_EQ(Alarm({"Go to the airport!", "file://" CALENDAR_DEFAULT_SOUND, DateTime(gtz,2015,4,24,10,35,0)}), appt.alarms[4]);
+ EXPECT_EQ(Alarm({"Go to the airport!", "file://" CALENDAR_DEFAULT_SOUND, DateTime(gtz,2015,4,24,10,37,0)}), appt.alarms[5]);
+ EXPECT_EQ(Alarm({"Go to the airport!", "file://" CALENDAR_DEFAULT_SOUND, DateTime(gtz,2015,4,24,10,39,0)}), appt.alarms[6]);
+ EXPECT_EQ(Alarm({"Go to the airport!", "file://" CALENDAR_DEFAULT_SOUND, DateTime(gtz,2015,4,24,10,41,0)}), appt.alarms[7]);
// now let's try this out with AlarmQueue...
// hook the planner up to a SimpleAlarmQueue and confirm that it triggers for each of the reminders
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 16:04:45 +0000