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 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'tests/test-clock.cpp') 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())); -- cgit v1.2.3