Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
d6317167
Commit
d6317167
authored
May 05, 2020
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tests: Replace g_assert (memcmp) with g_assert_cmpmem()
This makes for clearer reports in the CI
parent
8eeb7936
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
12 deletions
+12
-12
tests/test-address.c
tests/test-address.c
+1
-1
tests/test-bsd.c
tests/test-bsd.c
+1
-1
tests/test-gstreamer.c
tests/test-gstreamer.c
+1
-1
tests/test-io-stream-pollable.c
tests/test-io-stream-pollable.c
+1
-1
tests/test-io-stream-thread.c
tests/test-io-stream-thread.c
+2
-1
tests/test-send-recv.c
tests/test-send-recv.c
+2
-3
tests/test-thread.c
tests/test-thread.c
+2
-2
tests/test-udp-turn-fragmentation.c
tests/test-udp-turn-fragmentation.c
+2
-2
No files found.
tests/test-address.c
View file @
d6317167
...
@@ -130,7 +130,7 @@ test_ipv6 (void)
...
@@ -130,7 +130,7 @@ test_ipv6 (void)
nice_address_to_string
(
&
addr
,
str
);
nice_address_to_string
(
&
addr
,
str
);
nice_address_to_string
(
&
other
,
str
);
nice_address_to_string
(
&
other
,
str
);
g_assert
(
memcmp
(
&
sin
,
&
sin2
,
sizeof
(
sin
))
==
0
);
g_assert
_cmpmem
(
&
sin
,
sizeof
(
sin
),
&
sin2
,
sizeof
(
sin2
)
);
/* private IPv6 address */
/* private IPv6 address */
nice_address_set_ipv6
(
&
addr
,
(
guchar
*
)
nice_address_set_ipv6
(
&
addr
,
(
guchar
*
)
...
...
tests/test-bsd.c
View file @
d6317167
...
@@ -210,7 +210,7 @@ test_multi_buffer_recv (void)
...
@@ -210,7 +210,7 @@ test_multi_buffer_recv (void)
g_assert_cmpuint
(
bufs
[
6
].
size
,
==
,
0
);
g_assert_cmpuint
(
bufs
[
6
].
size
,
==
,
0
);
g_assert_cmpint
(
strncmp
((
gchar
*
)
buf
,
"hello-world"
,
11
),
==
,
0
);
g_assert_cmpint
(
strncmp
((
gchar
*
)
buf
,
"hello-world"
,
11
),
==
,
0
);
g_assert_cmp
int
(
memcmp
(
buf
+
11
,
dummy_buf
,
9
),
==
,
0
);
g_assert_cmp
mem
(
buf
+
11
,
9
,
dummy_buf
,
9
);
}
}
nice_socket_free
(
client
);
nice_socket_free
(
client
);
...
...
tests/test-gstreamer.c
View file @
d6317167
...
@@ -158,7 +158,7 @@ print_candidate (gpointer data, gpointer user_data)
...
@@ -158,7 +158,7 @@ print_candidate (gpointer data, gpointer user_data)
gchar
str_addr
[
INET6_ADDRSTRLEN
];
gchar
str_addr
[
INET6_ADDRSTRLEN
];
nice_address_to_string
(
&
cand
->
addr
,
str_addr
);
nice_address_to_string
(
&
cand
->
addr
,
str_addr
);
g_debug
(
"Cadidate: %s:%d"
,
str_addr
,
nice_address_get_port
(
&
cand
->
addr
));
g_debug
(
"Ca
n
didate: %s:%d"
,
str_addr
,
nice_address_get_port
(
&
cand
->
addr
));
}
}
static
void
static
void
...
...
tests/test-io-stream-pollable.c
View file @
d6317167
...
@@ -79,7 +79,7 @@ read_stream_cb (GObject *pollable_stream, gpointer _user_data)
...
@@ -79,7 +79,7 @@ read_stream_cb (GObject *pollable_stream, gpointer _user_data)
g_assert_cmpint
(
len
,
==
,
MESSAGE_SIZE
);
g_assert_cmpint
(
len
,
==
,
MESSAGE_SIZE
);
memset
(
expected_data
,
user_data
->
recv_count
+
'1'
,
sizeof
(
expected_data
));
memset
(
expected_data
,
user_data
->
recv_count
+
'1'
,
sizeof
(
expected_data
));
g_assert
(
memcmp
(
buf
,
expected_data
,
sizeof
(
expected_data
))
==
0
);
g_assert
_cmpmem
(
buf
,
sizeof
(
expected_data
),
expected_data
,
sizeof
(
expected_data
)
);
user_data
->
recv_count
++
;
user_data
->
recv_count
++
;
...
...
tests/test-io-stream-thread.c
View file @
d6317167
...
@@ -75,7 +75,8 @@ read_thread_cb (GInputStream *input_stream, TestIOStreamThreadData *data)
...
@@ -75,7 +75,8 @@ read_thread_cb (GInputStream *input_stream, TestIOStreamThreadData *data)
g_assert_cmpint
(
len
,
==
,
sizeof
(
buf
));
g_assert_cmpint
(
len
,
==
,
sizeof
(
buf
));
memset
(
expected_data
,
user_data
->
recv_count
+
'1'
,
sizeof
(
expected_data
));
memset
(
expected_data
,
user_data
->
recv_count
+
'1'
,
sizeof
(
expected_data
));
g_assert
(
memcmp
(
buf
,
expected_data
,
sizeof
(
expected_data
))
==
0
);
g_assert_cmpmem
(
buf
,
sizeof
(
expected_data
),
expected_data
,
sizeof
(
expected_data
));
}
}
check_for_termination
(
data
,
&
user_data
->
recv_count
,
check_for_termination
(
data
,
&
user_data
->
recv_count
,
...
...
tests/test-send-recv.c
View file @
d6317167
...
@@ -428,7 +428,7 @@ validate_received_buffer (TestIOStreamThreadData *data, gsize buffer_offset,
...
@@ -428,7 +428,7 @@ validate_received_buffer (TestIOStreamThreadData *data, gsize buffer_offset,
memset
(
expected_buf
,
0xaa
,
buf_len
);
memset
(
expected_buf
,
0xaa
,
buf_len
);
generate_buffer_data
(
test_data
->
buffer_data_strategy
,
buffer_offset
,
generate_buffer_data
(
test_data
->
buffer_data_strategy
,
buffer_offset
,
expected_buf
,
len
);
expected_buf
,
len
);
g_assert
(
memcmp
(
*
buf
,
expected_buf
,
len
)
==
0
);
g_assert
_cmpmem
(
*
buf
,
len
,
expected_buf
,
len
);
g_free
(
expected_buf
);
g_free
(
expected_buf
);
test_data
->
received_bytes
+=
len
;
test_data
->
received_bytes
+=
len
;
...
@@ -481,8 +481,7 @@ validate_received_messages (TestIOStreamThreadData *data, gsize buffer_offset,
...
@@ -481,8 +481,7 @@ validate_received_messages (TestIOStreamThreadData *data, gsize buffer_offset,
memset
(
expected_buf
,
0xaa
,
buffer
->
size
);
memset
(
expected_buf
,
0xaa
,
buffer
->
size
);
generate_buffer_data
(
test_data
->
buffer_data_strategy
,
buffer_offset
,
generate_buffer_data
(
test_data
->
buffer_data_strategy
,
buffer_offset
,
expected_buf
,
valid_len
);
expected_buf
,
valid_len
);
g_assert_cmpint
(
memcmp
(
buffer
->
buffer
,
expected_buf
,
valid_len
),
==
,
g_assert_cmpmem
(
buffer
->
buffer
,
valid_len
,
expected_buf
,
valid_len
);
0
);
g_free
(
expected_buf
);
g_free
(
expected_buf
);
buffer_offset
+=
valid_len
;
buffer_offset
+=
valid_len
;
message_len_remaining
-=
valid_len
;
message_len_remaining
-=
valid_len
;
...
...
tests/test-thread.c
View file @
d6317167
...
@@ -148,11 +148,11 @@ static void cb_nice_recv (NiceAgent *agent, guint stream_id, guint component_id,
...
@@ -148,11 +148,11 @@ static void cb_nice_recv (NiceAgent *agent, guint stream_id, guint component_id,
if
(
*
count
==
10
)
if
(
*
count
==
10
)
return
;
return
;
g_assert_cmpuint
(
len
,
==
,
10
);
memset
(
data
,
*
count
+
'1'
,
10
);
memset
(
data
,
*
count
+
'1'
,
10
);
g_assert
(
memcmp
(
buf
,
data
,
10
)
==
0
);
g_assert_cmpmem
(
buf
,
len
,
data
,
10
);
g_assert_cmpuint
(
len
,
==
,
10
);
(
*
count
)
++
;
(
*
count
)
++
;
...
...
tests/test-udp-turn-fragmentation.c
View file @
d6317167
...
@@ -186,8 +186,8 @@ tcp_turn_fragmentation (void)
...
@@ -186,8 +186,8 @@ tcp_turn_fragmentation (void)
continue
;
continue
;
}
}
g_assert
(
message
->
length
==
vec
->
size
);
g_assert
(
message
->
length
==
vec
->
size
);
g_assert
(
!
memcmp
(
message
->
buffers
->
buffer
,
vec
->
buffer
,
g_assert
_cmpmem
(
message
->
buffers
->
buffer
,
message
->
length
,
message
->
length
)
);
vec
->
buffer
,
message
->
length
);
li
=
li
->
next
;
li
=
li
->
next
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment