aboutsummaryrefslogtreecommitdiff
path: root/tests/test-eds-ics-nonrepeating-events.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-eds-ics-nonrepeating-events.cpp')
-rw-r--r--tests/test-eds-ics-nonrepeating-events.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/test-eds-ics-nonrepeating-events.cpp b/tests/test-eds-ics-nonrepeating-events.cpp
index 06b6b95..49fc9be 100644
--- a/tests/test-eds-ics-nonrepeating-events.cpp
+++ b/tests/test-eds-ics-nonrepeating-events.cpp
@@ -1,6 +1,6 @@
/*
* Copyright 2015 Canonical Ltd.
- * Copyright 2021-2022 Robert Tari
+ * Copyright 2021-2024 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,7 +81,6 @@ TEST_F(VAlarmFixture, MultipleAppointments)
// what we expect to get...
Appointment expected_appt;
expected_appt.uid = "20150520T000726Z-3878-32011-1770-81@lomiri-phablet";
- expected_appt.color = "#becedd";
expected_appt.summary = "Alarm";
std::array<Alarm,1> expected_alarms = {
Alarm({"Alarm", "file://" ALARM_DEFAULT_SOUND, DateTime(gtz,2015,5,20,20,00,0)})
@@ -93,10 +92,14 @@ 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;
+ }, appt.color, "#becedd", "#62a0ea");
}
// cleanup