diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-02-01 19:11:49 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-02-01 19:11:49 +0100 |
commit | 6d67f7b458911833e72e0b4a162b1d823609d6f8 (patch) | |
tree | bb39fcf3f5051bec3e78d92974403571778e351a /tests/test-eds-ics-nonrepeating-events.cpp | |
parent | 0692cc58d1046b79671491866294692a48b05554 (diff) | |
parent | d77ad890a0bb3b8e366c6dea23ca93f71e35d5d5 (diff) | |
download | ayatana-indicator-datetime-6d67f7b458911833e72e0b4a162b1d823609d6f8.tar.gz ayatana-indicator-datetime-6d67f7b458911833e72e0b4a162b1d823609d6f8.tar.bz2 ayatana-indicator-datetime-6d67f7b458911833e72e0b4a162b1d823609d6f8.zip |
Merge branch 'tari01-pr/fix-colour-tests'
Attributes GH PR #124: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/124
Diffstat (limited to 'tests/test-eds-ics-nonrepeating-events.cpp')
-rw-r--r-- | tests/test-eds-ics-nonrepeating-events.cpp | 9 |
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 |