diff options
Diffstat (limited to 'tests/test-eds-ics-repeating-events.cpp')
| -rw-r--r-- | tests/test-eds-ics-repeating-events.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/tests/test-eds-ics-repeating-events.cpp b/tests/test-eds-ics-repeating-events.cpp index 4125623..701f8da 100644 --- a/tests/test-eds-ics-repeating-events.cpp +++ b/tests/test-eds-ics-repeating-events.cpp @@ -1,6 +1,6 @@ /* * Copyright 2015 Canonical Ltd. - * Copyright 2021 Robert Tari + * Copyright 2021-2025 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 @@ -20,7 +20,7 @@ */ #include <algorithm> - +#include <array> #include <datetime/alarm-queue-simple.h> #include <datetime/clock-mock.h> #include <datetime/engine-eds.h> @@ -30,7 +30,6 @@ #include <gtest/gtest.h> #include "glib-fixture.h" -#include "print-to.h" #include "timezone-mock.h" #include "wakeup-timer-mock.h" @@ -81,8 +80,11 @@ TEST_F(VAlarmFixture, MultipleAppointments) // what we expect to get... Appointment expected_appt; +#ifndef LOMIRI_FEATURES_ENABLED expected_appt.uid = "20150507T211449Z-4262-32011-1418-1@lomiri-phablet"; - expected_appt.color = "#becedd"; +#else + expected_appt.uid = "840ab899-1b0e-4697-9514-dcd336a5e125"; +#endif expected_appt.summary = "Alarm"; std::array<Alarm,8> expected_alarms = { Alarm({"Alarm", "file://" ALARM_DEFAULT_SOUND, DateTime(gtz,2015,5, 8,16,40,0)}), @@ -101,10 +103,18 @@ TEST_F(VAlarmFixture, MultipleAppointments) 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]); + + EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2) + { + return sColourIn == sColourExpected1 || sColourIn == sColourExpected2; + #ifndef LOMIRI_FEATURES_ENABLED + }, appt.color, "#becedd", "#62a0ea"); + #else + }, appt.color, "#0000FF", ""); + #endif } // cleanup |