From ead1ffd9bc5571c76210cd457db131984569cc46 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 5 Sep 2017 10:31:56 +0200 Subject: core/trivial: rename test functions _nmtst_nm_ip*_config_*() to _nmtst_ip*_config_*() --- src/dhcp/tests/test-dhcp-dhclient.c | 4 ++-- src/dhcp/tests/test-dhcp-utils.c | 14 +++++++------- src/nm-ip4-config.c | 12 ++++++------ src/nm-ip4-config.h | 8 ++++---- src/nm-ip6-config.c | 8 ++++---- src/nm-ip6-config.h | 6 +++--- src/tests/test-ip4-config.c | 24 ++++++++++++------------ src/tests/test-ip6-config.c | 24 ++++++++++++------------ 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c index 2e68a6e081..7a6bcb5426 100644 --- a/src/dhcp/tests/test-dhcp-dhclient.c +++ b/src/dhcp/tests/test-dhcp-dhclient.c @@ -922,7 +922,7 @@ test_read_lease_ip4_config_basic (void) /* Address */ g_assert_cmpint (nm_ip4_config_get_num_addresses (config), ==, 1); expected_addr = nmtst_inet4_from_string ("192.168.1.180"); - addr = _nmtst_nm_ip4_config_get_address (config, 0); + addr = _nmtst_ip4_config_get_address (config, 0); g_assert_cmpint (addr->address, ==, expected_addr); g_assert_cmpint (addr->peer_address, ==, expected_addr); g_assert_cmpint (addr->plen, ==, 24); @@ -945,7 +945,7 @@ test_read_lease_ip4_config_basic (void) /* Address */ g_assert_cmpint (nm_ip4_config_get_num_addresses (config), ==, 1); expected_addr = nmtst_inet4_from_string ("10.77.52.141"); - addr = _nmtst_nm_ip4_config_get_address (config, 0); + addr = _nmtst_ip4_config_get_address (config, 0); g_assert_cmpint (addr->address, ==, expected_addr); g_assert_cmpint (addr->peer_address, ==, expected_addr); g_assert_cmpint (addr->plen, ==, 8); diff --git a/src/dhcp/tests/test-dhcp-utils.c b/src/dhcp/tests/test-dhcp-utils.c index f31d7d6456..a03c684fa2 100644 --- a/src/dhcp/tests/test-dhcp-utils.c +++ b/src/dhcp/tests/test-dhcp-utils.c @@ -105,7 +105,7 @@ test_generic_options (void) /* IP4 address */ g_assert_cmpint (nm_ip4_config_get_num_addresses (ip4_config), ==, 1); - address = _nmtst_nm_ip4_config_get_address (ip4_config, 0); + address = _nmtst_ip4_config_get_address (ip4_config, 0); g_assert (inet_pton (AF_INET, expected_addr, &tmp) > 0); g_assert (address->address == tmp); g_assert (address->peer_address == tmp); @@ -135,7 +135,7 @@ test_generic_options (void) g_assert_cmpint (nm_ip4_config_get_num_routes (ip4_config), ==, 2); /* Route #1 */ - route = _nmtst_nm_ip4_config_get_route (ip4_config, 0); + route = _nmtst_ip4_config_get_route (ip4_config, 0); g_assert (inet_pton (AF_INET, expected_route1_dest, &tmp) > 0); g_assert (route->network == tmp); g_assert (inet_pton (AF_INET, expected_route1_gw, &tmp) > 0); @@ -144,7 +144,7 @@ test_generic_options (void) g_assert_cmpint (route->metric, ==, 0); /* Route #2 */ - route = _nmtst_nm_ip4_config_get_route (ip4_config, 1); + route = _nmtst_ip4_config_get_route (ip4_config, 1); g_assert (inet_pton (AF_INET, expected_route2_dest, &tmp) > 0); g_assert (route->network == tmp); g_assert (inet_pton (AF_INET, expected_route2_gw, &tmp) > 0); @@ -175,7 +175,7 @@ test_wins_options (void) /* IP4 address */ g_assert_cmpint (nm_ip4_config_get_num_addresses (ip4_config), ==, 1); - address = _nmtst_nm_ip4_config_get_address (ip4_config, 0); + address = _nmtst_ip4_config_get_address (ip4_config, 0); g_assert (address); g_assert_cmpint (nm_ip4_config_get_num_wins (ip4_config), ==, 2); g_assert (inet_pton (AF_INET, expected_wins1, &tmp) > 0); @@ -221,7 +221,7 @@ ip4_test_route (NMIP4Config *ip4_config, g_assert (expected_prefix <= 32); - route = _nmtst_nm_ip4_config_get_route (ip4_config, route_num); + route = _nmtst_ip4_config_get_route (ip4_config, route_num); g_assert (inet_pton (AF_INET, expected_dest, &tmp) > 0); g_assert (route->network == tmp); g_assert (inet_pton (AF_INET, expected_gw, &tmp) > 0); @@ -624,7 +624,7 @@ test_ip4_missing_prefix (const char *ip, guint32 expected_prefix) ip4_config = _ip4_config_from_options (1, "eth0", options, 0); g_assert_cmpint (nm_ip4_config_get_num_addresses (ip4_config), ==, 1); - address = _nmtst_nm_ip4_config_get_address (ip4_config, 0); + address = _nmtst_ip4_config_get_address (ip4_config, 0); g_assert (address); g_assert_cmpint (address->plen, ==, expected_prefix); @@ -668,7 +668,7 @@ test_ip4_prefix_classless (void) ip4_config = _ip4_config_from_options (1, "eth0", options, 0); g_assert_cmpint (nm_ip4_config_get_num_addresses (ip4_config), ==, 1); - address = _nmtst_nm_ip4_config_get_address (ip4_config, 0); + address = _nmtst_ip4_config_get_address (ip4_config, 0); g_assert (address); g_assert_cmpint (address->plen, ==, 22); diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 1e0083ed0f..bffa50167a 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -2020,12 +2020,12 @@ nm_ip4_config_add_address (NMIP4Config *self, const NMPlatformIP4Address *new) } void -_nmtst_nm_ip4_config_del_address (NMIP4Config *self, guint i) +_nmtst_ip4_config_del_address (NMIP4Config *self, guint i) { NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self); const NMPlatformIP4Address *a; - a = _nmtst_nm_ip4_config_get_address (self, i); + a = _nmtst_ip4_config_get_address (self, i); g_return_if_fail (a); if (nm_dedup_multi_index_remove_obj (priv->multi_idx, @@ -2057,7 +2057,7 @@ nm_ip4_config_get_first_address (const NMIP4Config *self) } const NMPlatformIP4Address * -_nmtst_nm_ip4_config_get_address (const NMIP4Config *self, guint i) +_nmtst_ip4_config_get_address (const NMIP4Config *self, guint i) { NMDedupMultiIter iter; const NMPlatformIP4Address *a = NULL; @@ -2161,12 +2161,12 @@ nm_ip4_config_add_route (NMIP4Config *self, const NMPlatformIP4Route *new) } void -_nmtst_nm_ip4_config_del_route (NMIP4Config *self, guint i) +_nmtst_ip4_config_del_route (NMIP4Config *self, guint i) { NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self); const NMPlatformIP4Route *r; - r = _nmtst_nm_ip4_config_get_route (self, i); + r = _nmtst_ip4_config_get_route (self, i); g_return_if_fail (r); if (nm_dedup_multi_index_remove_obj (priv->multi_idx, @@ -2188,7 +2188,7 @@ nm_ip4_config_get_num_routes (const NMIP4Config *self) } const NMPlatformIP4Route * -_nmtst_nm_ip4_config_get_route (const NMIP4Config *self, guint i) +_nmtst_ip4_config_get_route (const NMIP4Config *self, guint i) { NMDedupMultiIter iter; const NMPlatformIP4Route *r = NULL; diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index cd1392ce6d..f786ef5e74 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -165,18 +165,18 @@ gint64 nm_ip4_config_get_route_metric (const NMIP4Config *self); const NMDedupMultiHeadEntry *nm_ip4_config_lookup_addresses (const NMIP4Config *self); void nm_ip4_config_reset_addresses (NMIP4Config *self); void nm_ip4_config_add_address (NMIP4Config *self, const NMPlatformIP4Address *address); -void _nmtst_nm_ip4_config_del_address (NMIP4Config *self, guint i); +void _nmtst_ip4_config_del_address (NMIP4Config *self, guint i); guint nm_ip4_config_get_num_addresses (const NMIP4Config *self); const NMPlatformIP4Address *nm_ip4_config_get_first_address (const NMIP4Config *self); -const NMPlatformIP4Address *_nmtst_nm_ip4_config_get_address (const NMIP4Config *self, guint i); +const NMPlatformIP4Address *_nmtst_ip4_config_get_address (const NMIP4Config *self, guint i); gboolean nm_ip4_config_address_exists (const NMIP4Config *self, const NMPlatformIP4Address *address); const NMDedupMultiHeadEntry *nm_ip4_config_lookup_routes (const NMIP4Config *self); void nm_ip4_config_reset_routes (NMIP4Config *self); void nm_ip4_config_add_route (NMIP4Config *self, const NMPlatformIP4Route *route); -void _nmtst_nm_ip4_config_del_route (NMIP4Config *self, guint i); +void _nmtst_ip4_config_del_route (NMIP4Config *self, guint i); guint nm_ip4_config_get_num_routes (const NMIP4Config *self); -const NMPlatformIP4Route *_nmtst_nm_ip4_config_get_route (const NMIP4Config *self, guint i); +const NMPlatformIP4Route *_nmtst_ip4_config_get_route (const NMIP4Config *self, guint i); const NMPlatformIP4Route *nm_ip4_config_get_direct_route_for_host (const NMIP4Config *self, guint32 host); diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index cbba554c87..3179c72a46 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -364,7 +364,7 @@ sort_captured_addresses (const CList *lst_a, const CList *lst_b, gconstpointer u } gboolean -_nmtst_nm_ip6_config_addresses_sort (NMIP6Config *self) +_nmtst_ip6_config_addresses_sort (NMIP6Config *self) { NMIP6ConfigPrivate *priv; const NMDedupMultiHeadEntry *head_entry; @@ -1624,12 +1624,12 @@ nm_ip6_config_add_address (NMIP6Config *self, const NMPlatformIP6Address *new) } void -_nmtst_nm_ip6_config_del_address (NMIP6Config *self, guint i) +_nmtst_ip6_config_del_address (NMIP6Config *self, guint i) { NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (self); const NMPlatformIP6Address *a; - a = _nmtst_nm_ip6_config_get_address (self, i); + a = _nmtst_ip6_config_get_address (self, i); g_return_if_fail (a); if (nm_dedup_multi_index_remove_obj (priv->multi_idx, @@ -1661,7 +1661,7 @@ nm_ip6_config_get_first_address (const NMIP6Config *self) } const NMPlatformIP6Address * -_nmtst_nm_ip6_config_get_address (const NMIP6Config *self, guint i) +_nmtst_ip6_config_get_address (const NMIP6Config *self, guint i) { NMDedupMultiIter iter; const NMPlatformIP6Address *a = NULL; diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index e3da0eca9e..779f1099f1 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -130,15 +130,15 @@ gint64 nm_ip6_config_get_route_metric (const NMIP6Config *self); const NMDedupMultiHeadEntry *nm_ip6_config_lookup_addresses (const NMIP6Config *self); void nm_ip6_config_reset_addresses (NMIP6Config *self); void nm_ip6_config_add_address (NMIP6Config *self, const NMPlatformIP6Address *address); -void _nmtst_nm_ip6_config_del_address (NMIP6Config *self, guint i); +void _nmtst_ip6_config_del_address (NMIP6Config *self, guint i); guint nm_ip6_config_get_num_addresses (const NMIP6Config *self); const NMPlatformIP6Address *nm_ip6_config_get_first_address (const NMIP6Config *self); -const NMPlatformIP6Address *_nmtst_nm_ip6_config_get_address (const NMIP6Config *self, guint i); +const NMPlatformIP6Address *_nmtst_ip6_config_get_address (const NMIP6Config *self, guint i); const NMPlatformIP6Address *nm_ip6_config_get_address_first_nontentative (const NMIP6Config *self, gboolean linklocal); gboolean nm_ip6_config_address_exists (const NMIP6Config *self, const NMPlatformIP6Address *address); const NMPlatformIP6Address *nm_ip6_config_lookup_address (const NMIP6Config *self, const struct in6_addr *addr); -gboolean _nmtst_nm_ip6_config_addresses_sort (NMIP6Config *self); +gboolean _nmtst_ip6_config_addresses_sort (NMIP6Config *self); gboolean nm_ip6_config_has_any_dad_pending (const NMIP6Config *self, const NMIP6Config *candidates); diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index d47ff2e643..f5620d95c7 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -112,7 +112,7 @@ test_subtract (void) /* ensure what's left is what we expect */ g_assert_cmpuint (nm_ip4_config_get_num_addresses (dst), ==, 1); - test_addr = _nmtst_nm_ip4_config_get_address (dst, 0); + test_addr = _nmtst_ip4_config_get_address (dst, 0); g_assert (test_addr != NULL); g_assert_cmpuint (test_addr->address, ==, nmtst_inet4_from_string (expected_addr)); g_assert_cmpuint (test_addr->peer_address, ==, test_addr->address); @@ -121,7 +121,7 @@ test_subtract (void) g_assert_cmpuint (nm_ip4_config_get_gateway (dst), ==, 0); g_assert_cmpuint (nm_ip4_config_get_num_routes (dst), ==, 1); - test_route = _nmtst_nm_ip4_config_get_route (dst, 0); + test_route = _nmtst_ip4_config_get_route (dst, 0); g_assert (test_route != NULL); g_assert_cmpuint (test_route->network, ==, nmtst_inet4_from_string (expected_route_dest)); g_assert_cmpuint (test_route->plen, ==, expected_route_plen); @@ -196,27 +196,27 @@ test_add_address_with_source (void) addr.addr_source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_address (a, &addr); - test_addr = _nmtst_nm_ip4_config_get_address (a, 0); + test_addr = _nmtst_ip4_config_get_address (a, 0); g_assert_cmpint (test_addr->addr_source, ==, NM_IP_CONFIG_SOURCE_USER); addr.addr_source = NM_IP_CONFIG_SOURCE_VPN; nm_ip4_config_add_address (a, &addr); - test_addr = _nmtst_nm_ip4_config_get_address (a, 0); + test_addr = _nmtst_ip4_config_get_address (a, 0); g_assert_cmpint (test_addr->addr_source, ==, NM_IP_CONFIG_SOURCE_USER); /* Test that a lower priority address source is overwritten */ - _nmtst_nm_ip4_config_del_address (a, 0); + _nmtst_ip4_config_del_address (a, 0); addr.addr_source = NM_IP_CONFIG_SOURCE_KERNEL; nm_ip4_config_add_address (a, &addr); - test_addr = _nmtst_nm_ip4_config_get_address (a, 0); + test_addr = _nmtst_ip4_config_get_address (a, 0); g_assert_cmpint (test_addr->addr_source, ==, NM_IP_CONFIG_SOURCE_KERNEL); addr.addr_source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_address (a, &addr); - test_addr = _nmtst_nm_ip4_config_get_address (a, 0); + test_addr = _nmtst_ip4_config_get_address (a, 0); g_assert_cmpint (test_addr->addr_source, ==, NM_IP_CONFIG_SOURCE_USER); g_object_unref (a); @@ -236,27 +236,27 @@ test_add_route_with_source (void) route.rt_source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_route (a, &route); - test_route = _nmtst_nm_ip4_config_get_route (a, 0); + test_route = _nmtst_ip4_config_get_route (a, 0); g_assert_cmpint (test_route->rt_source, ==, NM_IP_CONFIG_SOURCE_USER); route.rt_source = NM_IP_CONFIG_SOURCE_VPN; nm_ip4_config_add_route (a, &route); - test_route = _nmtst_nm_ip4_config_get_route (a, 0); + test_route = _nmtst_ip4_config_get_route (a, 0); g_assert_cmpint (test_route->rt_source, ==, NM_IP_CONFIG_SOURCE_USER); /* Test that a lower priority address source is overwritten */ - _nmtst_nm_ip4_config_del_route (a, 0); + _nmtst_ip4_config_del_route (a, 0); route.rt_source = NM_IP_CONFIG_SOURCE_KERNEL; nm_ip4_config_add_route (a, &route); - test_route = _nmtst_nm_ip4_config_get_route (a, 0); + test_route = _nmtst_ip4_config_get_route (a, 0); g_assert_cmpint (test_route->rt_source, ==, NM_IP_CONFIG_SOURCE_KERNEL); route.rt_source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_route (a, &route); - test_route = _nmtst_nm_ip4_config_get_route (a, 0); + test_route = _nmtst_ip4_config_get_route (a, 0); g_assert_cmpint (test_route->rt_source, ==, NM_IP_CONFIG_SOURCE_USER); g_object_unref (a); diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c index 9eb4d35fd4..32eaeb6f8b 100644 --- a/src/tests/test-ip6-config.c +++ b/src/tests/test-ip6-config.c @@ -88,7 +88,7 @@ test_subtract (void) /* ensure what's left is what we expect */ g_assert_cmpuint (nm_ip6_config_get_num_addresses (dst), ==, 1); - test_addr = _nmtst_nm_ip6_config_get_address (dst, 0); + test_addr = _nmtst_ip6_config_get_address (dst, 0); g_assert (test_addr != NULL); tmp = *nmtst_inet6_from_string (expected_addr); g_assert (memcmp (&test_addr->address, &tmp, sizeof (tmp)) == 0); @@ -167,27 +167,27 @@ test_add_address_with_source (void) addr.addr_source = NM_IP_CONFIG_SOURCE_USER; nm_ip6_config_add_address (a, &addr); - test_addr = _nmtst_nm_ip6_config_get_address (a, 0); + test_addr = _nmtst_ip6_config_get_address (a, 0); g_assert_cmpint (test_addr->addr_source, ==, NM_IP_CONFIG_SOURCE_USER); addr.addr_source = NM_IP_CONFIG_SOURCE_VPN; nm_ip6_config_add_address (a, &addr); - test_addr = _nmtst_nm_ip6_config_get_address (a, 0); + test_addr = _nmtst_ip6_config_get_address (a, 0); g_assert_cmpint (test_addr->addr_source, ==, NM_IP_CONFIG_SOURCE_USER); /* Test that a lower priority address source is overwritten */ - _nmtst_nm_ip6_config_del_address (a, 0); + _nmtst_ip6_config_del_address (a, 0); addr.addr_source = NM_IP_CONFIG_SOURCE_KERNEL; nm_ip6_config_add_address (a, &addr); - test_addr = _nmtst_nm_ip6_config_get_address (a, 0); + test_addr = _nmtst_ip6_config_get_address (a, 0); g_assert_cmpint (test_addr->addr_source, ==, NM_IP_CONFIG_SOURCE_KERNEL); addr.addr_source = NM_IP_CONFIG_SOURCE_USER; nm_ip6_config_add_address (a, &addr); - test_addr = _nmtst_nm_ip6_config_get_address (a, 0); + test_addr = _nmtst_ip6_config_get_address (a, 0); g_assert_cmpint (test_addr->addr_source, ==, NM_IP_CONFIG_SOURCE_USER); g_object_unref (a); @@ -256,18 +256,18 @@ test_nm_ip6_config_addresses_sort_check (NMIP6Config *config, NMSettingIP6Config int j = g_rand_int_range (nmtst_get_rand (), i, addr_count); NMTST_SWAP (idx[i], idx[j]); - nm_ip6_config_add_address (copy, _nmtst_nm_ip6_config_get_address (config, idx[i])); + nm_ip6_config_add_address (copy, _nmtst_ip6_config_get_address (config, idx[i])); } /* reorder them again */ - _nmtst_nm_ip6_config_addresses_sort (copy); + _nmtst_ip6_config_addresses_sort (copy); /* check equality using nm_ip6_config_equal() */ if (!nm_ip6_config_equal (copy, config)) { g_message ("%s", "SORTING yields unexpected output:"); for (i = 0; i < addr_count; i++) { - g_message (" >> [%d] = %s", i, nm_platform_ip6_address_to_string (_nmtst_nm_ip6_config_get_address (config, i), NULL, 0)); - g_message (" << [%d] = %s", i, nm_platform_ip6_address_to_string (_nmtst_nm_ip6_config_get_address (copy, i), NULL, 0)); + g_message (" >> [%d] = %s", i, nm_platform_ip6_address_to_string (_nmtst_ip6_config_get_address (config, i), NULL, 0)); + g_message (" << [%d] = %s", i, nm_platform_ip6_address_to_string (_nmtst_ip6_config_get_address (copy, i), NULL, 0)); } g_assert_not_reached (); } @@ -398,8 +398,8 @@ test_replace (gconstpointer user_data) nm_ip6_config_replace (dst_conf, src_conf, NULL); for (i = 0; i < addrs_n; i++) { - const NMPlatformIP6Address *a = _nmtst_nm_ip6_config_get_address (dst_conf, i); - const NMPlatformIP6Address *b = _nmtst_nm_ip6_config_get_address (src_conf, i); + const NMPlatformIP6Address *a = _nmtst_ip6_config_get_address (dst_conf, i); + const NMPlatformIP6Address *b = _nmtst_ip6_config_get_address (src_conf, i); g_assert (nm_platform_ip6_address_cmp (&addrs[i], a) == 0); g_assert (nm_platform_ip6_address_cmp (&addrs[i], b) == 0); -- cgit v1.2.1