luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-09 18:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

test_posix_parse: PST8PDT passes on Unix because it names an IANA zone.

Browse Source
This commit is contained in:
John Ralls
2012-12-18 15:40:43 -08:00
parent bdab372379
commit 0f0404af21
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
glib/tests/gdatetime.c
View File

@@ -886,7 +886,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
TEST_PRINTF ("%9", NULL); TEST_PRINTF ("%9", NULL);
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
TEST_PRINTF ("%Z", dst); TEST_PRINTF ("%Z", dst);
#elsif defined G_OS_WIN32 #elif defined G_OS_WIN32
TEST_PRINTF ("%Z", "Pacific Standard Time") TEST_PRINTF ("%Z", "Pacific Standard Time")
#endif #endif
} }
@@ -1365,24 +1365,18 @@ test_posix_parse (void)
g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST"); g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST");
g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, - 8 * 3600); g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, - 8 * 3600);
g_assert (!g_time_zone_is_dst (tz, 0)); g_assert (!g_time_zone_is_dst (tz, 0));
/* g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 1), ==, "PST");
g_assert_cmpint (g_time_zone_get_offset (tz, 1), ==, - 7 * 3600);
g_assert (g_time_zone_is_dst (tz, 1)); */
g_time_zone_unref (tz); g_time_zone_unref (tz);
/* This fails rules_from_identifier on Unix (though not on Windows)
* but passes anyway because PST8PDT is a zone name.
*/
tz = g_time_zone_new ("PST8PDT"); tz = g_time_zone_new ("PST8PDT");
#ifdef G_OS_WIN32
g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST"); g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST");
g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, - 8 * 3600); g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, - 8 * 3600);
g_assert (!g_time_zone_is_dst (tz, 0)); g_assert (!g_time_zone_is_dst (tz, 0));
g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 1), ==, "PDT"); g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 1), ==, "PDT");
g_assert_cmpint (g_time_zone_get_offset (tz, 1), ==,- 7 * 3600); g_assert_cmpint (g_time_zone_get_offset (tz, 1), ==,- 7 * 3600);
g_assert (g_time_zone_is_dst (tz, 1)); g_assert (g_time_zone_is_dst (tz, 1));
#else
g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "UTC");
g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, 0);
g_assert (g_time_zone_is_dst (tz, 0));
#endif
g_time_zone_unref (tz); g_time_zone_unref (tz);
tz = g_time_zone_new ("PST8PDT6:32:15"); tz = g_time_zone_new ("PST8PDT6:32:15");