summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-05-30 08:33:14 +0200
committerThomas Haller <thaller@redhat.com>2019-06-11 08:25:10 +0200
commitd7932ee5f196690af87f32bf8a88cee7e91c4958 (patch)
tree6c2a9f12a80e3daac75d79573f58e15f22855d29 /src/tests
parent7440c0c5648bca01597d2d6a245b6a213416958c (diff)
downloadNetworkManager-d7932ee5f196690af87f32bf8a88cee7e91c4958.tar.gz
tests/trivial: rename nmtst_get_rand_int() to nmtst_get_rand_uint32()
nmtst_get_rand_int() was originally named that way, because it calls g_rand_int(). But I think if a function returns an uint32, it should also be named that way. Rename.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/test-core-with-expect.c2
-rw-r--r--src/tests/test-core.c20
-rw-r--r--src/tests/test-systemd.c10
3 files changed, 16 insertions, 16 deletions
diff --git a/src/tests/test-core-with-expect.c b/src/tests/test-core-with-expect.c
index 8339fa5d43..e4b30db8a3 100644
--- a/src/tests/test-core-with-expect.c
+++ b/src/tests/test-core-with-expect.c
@@ -541,7 +541,7 @@ test_nm_utils_new_vlan_name (void)
guint vlan_id;
/* Create a random VLAN id between 0 and 4094 */
- vlan_id = nmtst_get_rand_int () % 4095;
+ vlan_id = nmtst_get_rand_uint32 () % 4095;
vlan_id_s = g_strdup_printf (".%d", vlan_id);
diff --git a/src/tests/test-core.c b/src/tests/test-core.c
index cedf5b8a9a..f5d42e6d4f 100644
--- a/src/tests/test-core.c
+++ b/src/tests/test-core.c
@@ -147,7 +147,7 @@ test_nm_utils_ip6_address_same_prefix (void)
nmtst_rand_buf (NULL, a.ptr, sizeof (a));
nmtst_rand_buf (NULL, b.ptr, sizeof (b));
again_plen:
- plen = nmtst_get_rand_int () % 129;
+ plen = nmtst_get_rand_uint32 () % 129;
if (!is_same && NM_IN_SET (plen, 0, 128))
goto again_plen;
@@ -181,7 +181,7 @@ again_plen:
for (n = 0; n < N; n++) {
nmtst_rand_buf (NULL, a.ptr, sizeof (a));
nmtst_rand_buf (NULL, b.ptr, sizeof (b));
- plen = nmtst_get_rand_int () % 129;
+ plen = nmtst_get_rand_uint32 () % 129;
memset (addrmask.ptr, 0xFF, sizeof (addrmask));
nm_utils_ip6_address_clear_host_address (&addrmask.val, &addrmask.val, plen);
@@ -198,7 +198,7 @@ again_plen:
nmtst_rand_buf (NULL, a.ptr, sizeof (a));
nmtst_rand_buf (NULL, b.ptr, sizeof (b));
- plen = nmtst_get_rand_int () % 129;
+ plen = nmtst_get_rand_uint32 () % 129;
if (!plen)
continue;
@@ -1456,7 +1456,7 @@ test_nm_utils_strbuf_append (void)
const char *_str_iter; \
gs_free char *_str = NULL; \
\
- switch (nmtst_get_rand_int () % 4) { \
+ switch (nmtst_get_rand_uint32 () % 4) { \
case 0: \
nm_utils_strbuf_append (_buf, _len, (format), __VA_ARGS__); \
break; \
@@ -1484,7 +1484,7 @@ test_nm_utils_strbuf_append (void)
gsize *_len = (len); \
const char *_str = (str); \
\
- switch (nmtst_get_rand_int () % 4) { \
+ switch (nmtst_get_rand_uint32 () % 4) { \
case 0: \
nm_utils_strbuf_append (_buf, _len, "%s", _str ?: ""); \
break; \
@@ -1509,7 +1509,7 @@ test_nm_utils_strbuf_append (void)
gsize *_len = (len); \
char _ch = (ch); \
\
- switch (nmtst_get_rand_int () % 4) { \
+ switch (nmtst_get_rand_uint32 () % 4) { \
case 0: \
nm_utils_strbuf_append (_buf, _len, "%c", _ch); \
break; \
@@ -1527,7 +1527,7 @@ test_nm_utils_strbuf_append (void)
for (buf_len = 0; buf_len < 10; buf_len++) {
for (rep = 0; rep < 50; rep++) {
- const int s_len = nmtst_get_rand_int () % (sizeof (str) - 5);
+ const int s_len = nmtst_get_rand_uint32 () % (sizeof (str) - 5);
char *t_buf;
gsize t_len;
int test_mode;
@@ -1543,7 +1543,7 @@ test_nm_utils_strbuf_append (void)
t_buf = buf;
t_len = buf_len;
- test_mode = nmtst_get_rand_int () % 5;
+ test_mode = nmtst_get_rand_uint32 () % 5;
switch (test_mode) {
case 0:
@@ -1568,7 +1568,7 @@ test_nm_utils_strbuf_append (void)
g_snprintf (t_buf, t_len, "%s", str);
if ( t_len > 0
&& strlen (str) >= buf_len
- && (nmtst_get_rand_int () % 2)) {
+ && (nmtst_get_rand_uint32 () % 2)) {
/* the string was truncated by g_snprintf(). That means, at the last position in the
* buffer is now NUL.
* Replace the NUL by the actual character, and check that nm_utils_strbuf_seek_end()
@@ -1688,7 +1688,7 @@ test_duplicate_decl_specifier (void)
(_a > _b ? _a : _b); \
})
- v_result[0] = TEST_MAX (v_const[0], nmtst_get_rand_int () % 5) + v2;
+ v_result[0] = TEST_MAX (v_const[0], nmtst_get_rand_uint32 () % 5) + v2;
NM_PRAGMA_WARNING_REENABLE
}
diff --git a/src/tests/test-systemd.c b/src/tests/test-systemd.c
index 20cbd50efd..4f6809ab63 100644
--- a/src/tests/test-systemd.c
+++ b/src/tests/test-systemd.c
@@ -157,7 +157,7 @@ test_sd_event (void)
g_assert_cmpint (sd_event_default (NULL), ==, 0);
- for (i = 0, n = (nmtst_get_rand_int () % (G_N_ELEMENTS (other_events) + 1)); i < n; i++) {
+ for (i = 0, n = (nmtst_get_rand_uint32 () % (G_N_ELEMENTS (other_events) + 1)); i < n; i++) {
r = sd_event_default (&other_events[i]);
g_assert (r >= 0 && other_events[i]);
}
@@ -177,7 +177,7 @@ test_sd_event (void)
g_assert (!user_data.event_source);
event = sd_event_unref (event);
- for (i = 0, n = (nmtst_get_rand_int () % (G_N_ELEMENTS (other_events) + 1)); i < n; i++)
+ for (i = 0, n = (nmtst_get_rand_uint32 () % (G_N_ELEMENTS (other_events) + 1)); i < n; i++)
other_events[i] = sd_event_unref (other_events[i]);
nm_clear_g_source (&sd_id);
for (i = 0, n = G_N_ELEMENTS (other_events); i < n; i++)
@@ -311,15 +311,15 @@ test_nm_sd_utils_unbase64mem (void)
_test_unbase64mem ("YQ==", "a");
_test_unbase64mem_inval ("YQ==a");
- rnd_len = nmtst_get_rand_int () % sizeof (rnd_buf);
+ rnd_len = nmtst_get_rand_uint32 () % sizeof (rnd_buf);
for (i = 0; i < rnd_len; i++)
- rnd_buf[i] = nmtst_get_rand_int () % 256;
+ rnd_buf[i] = nmtst_get_rand_uint32 () % 256;
rnd_base64 = g_base64_encode (rnd_buf, rnd_len);
_test_unbase64mem_mem (rnd_base64, rnd_buf, rnd_len);
_test_unbase64char ('=', FALSE);
for (i = 0; i < 10; i++) {
- char ch = nmtst_get_rand_int () % 256;
+ char ch = nmtst_get_rand_uint32 () % 256;
if (ch != '=')
_test_unbase64char (ch, TRUE);