From 17aa86ab53e3e49cd47116f9640c89484167abcd Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 18 Jun 2021 02:48:29 +0200 Subject: If possible, avoid deprecated g_time_zone_new fixes https://github.com/AyatanaIndicators/ayatana-indicator-datetime/issues/34 --- tests/test-clock.cpp | 22 ++++++++++++++++++++-- tests/test-datetime.cpp | 2 ++ tests/test-eds-ics-all-day-events.cpp | 11 +++++++++++ tests/test-eds-ics-missing-trigger.cpp | 11 +++++++++++ tests/test-eds-ics-nonrepeating-events.cpp | 11 +++++++++++ tests/test-eds-ics-repeating-events.cpp | 11 +++++++++++ tests/test-eds-ics-repeating-valarms.cpp | 11 +++++++++++ tests/test-eds-ics-tzids-2.cpp | 11 +++++++++++ tests/test-eds-ics-tzids.cpp | 11 +++++++++++ 9 files changed, 99 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/test-clock.cpp b/tests/test-clock.cpp index 44f9be0..54ff229 100644 --- a/tests/test-clock.cpp +++ b/tests/test-clock.cpp @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -77,8 +79,16 @@ TEST_F(ClockFixture, TimezoneChangeTriggersSkew) auto timezone_ = std::make_shared(); timezone_->timezone.set("America/New_York"); LiveClock clock(timezone_); - + #if GLIB_CHECK_VERSION(2, 68, 0) + auto tz_nyc = g_time_zone_new_identifier("America/New_York"); + + if (tz_nyc == NULL) + { + tz_nyc = g_time_zone_new_utc(); + } + #else auto tz_nyc = g_time_zone_new("America/New_York"); + #endif auto now_nyc = g_date_time_new_now(tz_nyc); auto now = clock.localtime(); EXPECT_EQ(g_date_time_get_utc_offset(now_nyc), g_date_time_get_utc_offset(now.get())); @@ -95,8 +105,16 @@ TEST_F(ClockFixture, TimezoneChangeTriggersSkew) return G_SOURCE_REMOVE; }, timezone_.get()); g_main_loop_run(loop); - + #if GLIB_CHECK_VERSION(2, 68, 0) + auto tz_la = g_time_zone_new_identifier("America/Los_Angeles"); + + if (tz_la == NULL) + { + tz_la = g_time_zone_new_utc(); + } + #else auto tz_la = g_time_zone_new("America/Los_Angeles"); + #endif auto now_la = g_date_time_new_now(tz_la); now = clock.localtime(); EXPECT_EQ(g_date_time_get_utc_offset(now_la), g_date_time_get_utc_offset(now.get())); diff --git a/tests/test-datetime.cpp b/tests/test-datetime.cpp index 665f861..d2fb6c1 100644 --- a/tests/test-datetime.cpp +++ b/tests/test-datetime.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include diff --git a/tests/test-eds-ics-all-day-events.cpp b/tests/test-eds-ics-all-day-events.cpp index c327f1a..68a3c95 100644 --- a/tests/test-eds-ics-all-day-events.cpp +++ b/tests/test-eds-ics-all-day-events.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MultipleAppointments) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"America/Chicago"}; auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared(engine, tz); diff --git a/tests/test-eds-ics-missing-trigger.cpp b/tests/test-eds-ics-missing-trigger.cpp index b45836f..0aa00c6 100644 --- a/tests/test-eds-ics-missing-trigger.cpp +++ b/tests/test-eds-ics-missing-trigger.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MissingTriggers) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"America/Chicago"}; auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared(engine, tz); diff --git a/tests/test-eds-ics-nonrepeating-events.cpp b/tests/test-eds-ics-nonrepeating-events.cpp index 55fce6c..e79ab1a 100644 --- a/tests/test-eds-ics-nonrepeating-events.cpp +++ b/tests/test-eds-ics-nonrepeating-events.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MultipleAppointments) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"America/Chicago"}; auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared(engine, tz); diff --git a/tests/test-eds-ics-repeating-events.cpp b/tests/test-eds-ics-repeating-events.cpp index 6c021f7..d4f0026 100644 --- a/tests/test-eds-ics-repeating-events.cpp +++ b/tests/test-eds-ics-repeating-events.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MultipleAppointments) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"America/Chicago"}; auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared(engine, tz); diff --git a/tests/test-eds-ics-repeating-valarms.cpp b/tests/test-eds-ics-repeating-valarms.cpp index d4b8b83..2132b71 100644 --- a/tests/test-eds-ics-repeating-valarms.cpp +++ b/tests/test-eds-ics-repeating-valarms.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MultipleAppointments) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"America/Chicago"}; auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared(engine, tz); diff --git a/tests/test-eds-ics-tzids-2.cpp b/tests/test-eds-ics-tzids-2.cpp index c0572d0..c8b0370 100644 --- a/tests/test-eds-ics-tzids-2.cpp +++ b/tests/test-eds-ics-tzids-2.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MultipleAppointments) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"America/Los_Angeles"}; auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared(engine, tz); diff --git a/tests/test-eds-ics-tzids.cpp b/tests/test-eds-ics-tzids.cpp index 41d8214..c80feb2 100644 --- a/tests/test-eds-ics-tzids.cpp +++ b/tests/test-eds-ics-tzids.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2021 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 @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MultipleAppointments) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"Europe/Berlin"}; auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared(engine, tz); -- cgit v1.2.3