luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-17 19:21:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'timer-tests' into 'master'

Browse Source 
Minor additions to gtimer.c tests

See merge request GNOME/glib!231
This commit is contained in:
Xavier Claessens 2018-08-07 14:43:43 +00:00
commit ba30f45d9a
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdbusmessage.c
View File

@ -1994,7 +1994,7 @@ g_dbus_message_bytes_needed (guchar *blob,
/** /**
* g_dbus_message_new_from_blob: * g_dbus_message_new_from_blob:
* @blob: (array length=blob_len) (element-type guint8): A blob represent a binary D-Bus message. * @blob: (array length=blob_len) (element-type guint8): A blob representing a binary D-Bus message.
* @blob_len: The length of @blob. * @blob_len: The length of @blob.
* @capabilities: A #GDBusCapabilityFlags describing what protocol features are supported. * @capabilities: A #GDBusCapabilityFlags describing what protocol features are supported.
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.

25
glib/tests/timer.c
View File

@ -115,6 +115,14 @@ test_timeval_add (void)
g_time_val_add (&time, 1000); g_time_val_add (&time, 1000);
g_assert_cmpint (time.tv_sec, ==, 1); g_assert_cmpint (time.tv_sec, ==, 1);
g_assert_cmpint (time.tv_usec, ==, 510); g_assert_cmpint (time.tv_usec, ==, 510);
g_time_val_add (&time, 0);
g_assert_cmpint (time.tv_sec, ==, 1);
g_assert_cmpint (time.tv_usec, ==, 510);
g_time_val_add (&time, -210);
g_assert_cmpint (time.tv_sec, ==, 1);
g_assert_cmpint (time.tv_usec, ==, 300);
} }
typedef struct { typedef struct {
@ -230,6 +238,22 @@ test_timeval_to_iso8601 (void)
} }
} }
/* Test error handling for g_time_val_to_iso8601() on dates which are too large. */
static void
test_timeval_to_iso8601_overflow (void)
{
GTimeVal val;
gchar *out = NULL;
g_unsetenv ("TZ");
val.tv_sec = G_MAXLONG;
val.tv_usec = G_USEC_PER_SEC - 1;
out = g_time_val_to_iso8601 (&val);
g_assert_null (out);
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -242,6 +266,7 @@ main (int argc, char *argv[])
g_test_add_func ("/timeval/add", test_timeval_add); g_test_add_func ("/timeval/add", test_timeval_add);
g_test_add_func ("/timeval/from-iso8601", test_timeval_from_iso8601); g_test_add_func ("/timeval/from-iso8601", test_timeval_from_iso8601);
g_test_add_func ("/timeval/to-iso8601", test_timeval_to_iso8601); g_test_add_func ("/timeval/to-iso8601", test_timeval_to_iso8601);
g_test_add_func ("/timeval/to-iso8601/overflow", test_timeval_to_iso8601_overflow);
return g_test_run (); return g_test_run ();
} }