[glib/wip/pwithnall/network-address-test-fixes: 3/4] tests: Use g_assert_*() rather than g_assert() in network-address.c
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/pwithnall/network-address-test-fixes: 3/4] tests: Use g_assert_*() rather than g_assert() in network-address.c
- Date: Tue, 22 Feb 2022 11:23:32 +0000 (UTC)
commit f13267dba0d54cdf8489635ad7a3743a4ac9f24f
Author: Philip Withnall <pwithnall endlessos org>
Date: Tue Feb 22 10:05:52 2022 +0000
tests: Use g_assert_*() rather than g_assert() in network-address.c
`g_assert()` is compiled out with `G_DISABLE_ASSERT`.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
gio/tests/network-address.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gio/tests/network-address.c b/gio/tests/network-address.c
index 828d33c1b..da4d7f7e0 100644
--- a/gio/tests/network-address.c
+++ b/gio/tests/network-address.c
@@ -20,7 +20,7 @@ test_basic (void)
g_object_get (address, "hostname", &hostname, "port", &port, "scheme", &scheme, NULL);
g_assert_cmpstr (hostname, ==, "www.gnome.org");
g_assert_cmpint (port, ==, 8080);
- g_assert (scheme == NULL);
+ g_assert_null (scheme);
g_free (hostname);
g_object_unref (address);
@@ -284,8 +284,8 @@ test_scope_id (GSocketConnectable *addr)
saddr = g_socket_address_enumerator_next (addr_enum, NULL, &error);
g_assert_no_error (error);
- g_assert (saddr != NULL);
- g_assert (G_IS_INET_SOCKET_ADDRESS (saddr));
+ g_assert_nonnull (saddr);
+ g_assert_true (G_IS_INET_SOCKET_ADDRESS (saddr));
isaddr = G_INET_SOCKET_ADDRESS (saddr);
g_assert_cmpint (g_inet_socket_address_get_scope_id (isaddr), ==, SCOPE_ID_TEST_INDEX);
@@ -299,7 +299,7 @@ test_scope_id (GSocketConnectable *addr)
g_object_unref (saddr);
saddr = g_socket_address_enumerator_next (addr_enum, NULL, &error);
g_assert_no_error (error);
- g_assert (saddr == NULL);
+ g_assert_null (saddr);
g_object_unref (addr_enum);
#else
@@ -377,7 +377,7 @@ assert_socket_address_matches (GSocketAddress *a,
GInetSocketAddress *sa;
gchar *str; /* owned */
- g_assert (G_IS_INET_SOCKET_ADDRESS (a));
+ g_assert_true (G_IS_INET_SOCKET_ADDRESS (a));
sa = G_INET_SOCKET_ADDRESS (a);
g_assert_cmpint (g_inet_socket_address_get_port (sa), ==, expected_port);
@@ -593,7 +593,7 @@ got_addr (GObject *source_object,
}
else
{
- g_assert (G_IS_INET_SOCKET_ADDRESS (a));
+ g_assert_true (G_IS_INET_SOCKET_ADDRESS (a));
data->addrs = g_list_prepend (data->addrs, a);
if (!data->delay_ms)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]