Merge branch 'tari01-pr/fix-tests'

Attributes GH PR #111: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/111

3 files changed, 9 insertions, 11 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 81eeb5d..a0687f4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -45,8 +45,7 @@ add_test_by_name(test-datetime)
 
 if (ENABLE_LOMIRI_FEATURES)
     add_test_by_name(test-sound)
-    # This one only succeeds on Lomiri because it needs hfd-service
-    # add_test_by_name(test-notification)
+    add_test_by_name(test-notification)
     add_test_by_name(test-notification-response)
 endif()
 
@@ -54,14 +53,12 @@ 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)
-# This one is fine, but hangs on Travis CI
-# add_test_by_name(test-exporter)
+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-menu-appointments)
-# This one is fine, but hangs on Travis CI
-# add_test_by_name(test-menus)
+add_test_by_name(test-menus)
 add_test_by_name(test-planner)
 add_test_by_name(test-settings)
 add_test_by_name(test-timezone-timedated)
diff --git a/tests/test-eds-ics-missing-trigger.cpp b/tests/test-eds-ics-missing-trigger.cpp
index 5d98f81..71a7707 100644
--- a/tests/test-eds-ics-missing-trigger.cpp
+++ b/tests/test-eds-ics-missing-trigger.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
- * Copyright 2021-2022 Robert Tari
+ * Copyright 2021-2023 Robert Tari
  *
  * 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
@@ -62,7 +62,7 @@ TEST_F(VAlarmFixture, MissingTriggers)
     // 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,7,1,23,59,59.5};
+    const DateTime range_end   {gtz, 2015,6,30,23,59,59.5};
     planner->range().set(std::make_pair(range_begin, range_end));
 
     // give EDS a moment to load
diff --git a/tests/test-eds-ics-non-attending-alarms.cpp b/tests/test-eds-ics-non-attending-alarms.cpp
index ca1c8ed..629c1fc 100644
--- a/tests/test-eds-ics-non-attending-alarms.cpp
+++ b/tests/test-eds-ics-non-attending-alarms.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2015 Canonical Ltd.
- * Copyright 2021 Robert Tari
+ * Copyright 2021-2023 Robert Tari
  *
  * 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
@@ -81,9 +81,10 @@ TEST_F(VAlarmFixture, NonAttendingEvent)
 
     // the planner should match what we've got in the calendar.ics file
     const auto appts = planner->appointments().get();
-    EXPECT_EQ(2, appts.size());
+    EXPECT_EQ(3, appts.size());
     EXPECT_EQ(appts[0].begin, DateTime(gtz, 2016, 4, 4, 16, 0, 0));
-    EXPECT_EQ(appts[1].begin, DateTime(gtz, 2016, 4, 6, 16, 0, 0));
+    EXPECT_EQ(appts[1].begin, DateTime(gtz, 2016, 4, 5, 16, 0, 0));
+    EXPECT_EQ(appts[2].begin, DateTime(gtz, 2016, 4, 6, 16, 0, 0));
 
     // cleanup
     g_time_zone_unref(gtz);