Commit 69c2015c authored by Olivier Crête's avatar Olivier Crête

Remove g_assert_cmp* macros outside of the unit tests

parent 01e2de64
...@@ -4407,7 +4407,7 @@ agent_recv_message_unlocked ( ...@@ -4407,7 +4407,7 @@ agent_recv_message_unlocked (
retval = sockret; retval = sockret;
} }
g_assert_cmpint (retval, !=, RECV_OOB); g_assert (retval != RECV_OOB);
if (message->length == 0) { if (message->length == 0) {
retval = RECV_OOB; retval = RECV_OOB;
nice_debug_verbose ("%s: Agent %p: message handled out-of-band", G_STRFUNC, nice_debug_verbose ("%s: Agent %p: message handled out-of-band", G_STRFUNC,
...@@ -4800,7 +4800,7 @@ pending_io_messages_recv_messages (NiceComponent *component, gboolean reliable, ...@@ -4800,7 +4800,7 @@ pending_io_messages_recv_messages (NiceComponent *component, gboolean reliable,
IOCallbackData *data; IOCallbackData *data;
NiceInputMessage *message = &messages[iter->message]; NiceInputMessage *message = &messages[iter->message];
g_assert_cmpuint (component->io_callback_id, ==, 0); g_assert (component->io_callback_id == 0);
data = g_queue_peek_head (&component->pending_io_messages); data = g_queue_peek_head (&component->pending_io_messages);
if (data == NULL) if (data == NULL)
...@@ -5079,7 +5079,7 @@ done: ...@@ -5079,7 +5079,7 @@ done:
if (messages_orig) { if (messages_orig) {
for (i = 0; i < n_messages; i++) { for (i = 0; i < n_messages; i++) {
if (messages[i].buffers != messages_orig[i].buffers) { if (messages[i].buffers != messages_orig[i].buffers) {
g_assert_cmpint (messages[i].n_buffers, ==, 1); g_assert (messages[i].n_buffers == 1);
memcpy_buffer_to_input_message (&messages_orig[i], memcpy_buffer_to_input_message (&messages_orig[i],
messages[i].buffers[0].buffer, messages[i].length); messages[i].buffers[0].buffer, messages[i].length);
...@@ -5360,7 +5360,7 @@ nice_agent_send_messages_nonblocking_internal ( ...@@ -5360,7 +5360,7 @@ nice_agent_send_messages_nonblocking_internal (
g_set_error (&child_error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (&child_error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Error writing data to socket."); "Error writing data to socket.");
} else if (n_sent > 0 && allow_partial) { } else if (n_sent > 0 && allow_partial) {
g_assert_cmpuint (n_messages, ==, 1); g_assert (n_messages == 1);
n_sent = output_message_get_size (messages); n_sent = output_message_get_size (messages);
} }
} }
...@@ -5381,7 +5381,7 @@ nice_agent_send_messages_nonblocking_internal ( ...@@ -5381,7 +5381,7 @@ nice_agent_send_messages_nonblocking_internal (
done: done:
g_assert ((child_error != NULL) == (n_sent == -1)); g_assert ((child_error != NULL) == (n_sent == -1));
g_assert_cmpint (n_sent, !=, 0); g_assert (n_sent != 0);
g_assert (n_sent < 0 || g_assert (n_sent < 0 ||
(!allow_partial && (guint) n_sent <= n_messages) || (!allow_partial && (guint) n_sent <= n_messages) ||
(allow_partial && n_messages == 1 && (allow_partial && n_messages == 1 &&
...@@ -5781,7 +5781,7 @@ component_io_cb (GSocket *gsocket, GIOCondition condition, gpointer user_data) ...@@ -5781,7 +5781,7 @@ component_io_cb (GSocket *gsocket, GIOCondition condition, gpointer user_data)
/* Don’t expect any valid messages to escape pseudo_tcp_socket_readable() /* Don’t expect any valid messages to escape pseudo_tcp_socket_readable()
* when in reliable mode. */ * when in reliable mode. */
g_assert_cmpint (retval, !=, RECV_SUCCESS); g_assert (retval != RECV_SUCCESS);
if (retval == RECV_WOULD_BLOCK) { if (retval == RECV_WOULD_BLOCK) {
/* EWOULDBLOCK. */ /* EWOULDBLOCK. */
...@@ -5839,8 +5839,8 @@ component_io_cb (GSocket *gsocket, GIOCondition condition, gpointer user_data) ...@@ -5839,8 +5839,8 @@ component_io_cb (GSocket *gsocket, GIOCondition condition, gpointer user_data)
RecvStatus retval; RecvStatus retval;
/* Don’t want to trample over partially-valid buffers. */ /* Don’t want to trample over partially-valid buffers. */
g_assert_cmpuint (component->recv_messages_iter.buffer, ==, 0); g_assert (component->recv_messages_iter.buffer == 0);
g_assert_cmpint (component->recv_messages_iter.offset, ==, 0); g_assert (component->recv_messages_iter.offset == 0);
while (!nice_input_message_iter_is_at_end (&component->recv_messages_iter, while (!nice_input_message_iter_is_at_end (&component->recv_messages_iter,
component->recv_messages, component->n_recv_messages)) { component->recv_messages, component->n_recv_messages)) {
......
...@@ -148,9 +148,9 @@ nice_candidate_ice_local_preference_full (guint direction_preference, ...@@ -148,9 +148,9 @@ nice_candidate_ice_local_preference_full (guint direction_preference,
* 9-12: <unused> * 9-12: <unused>
* 13-15: direction_preference * 13-15: direction_preference
*/ */
g_assert_cmpuint (other_preference, <, NICE_CANDIDATE_MAX_LOCAL_ADDRESSES); g_assert (other_preference < NICE_CANDIDATE_MAX_LOCAL_ADDRESSES);
g_assert_cmpuint (turn_preference, <, NICE_CANDIDATE_MAX_TURN_SERVERS); g_assert (turn_preference < NICE_CANDIDATE_MAX_TURN_SERVERS);
g_assert_cmpuint (direction_preference, <, 8); g_assert (direction_preference < 8);
return (direction_preference << 13) + return (direction_preference << 13) +
(turn_preference << 6) + (turn_preference << 6) +
...@@ -255,10 +255,10 @@ nice_candidate_ms_ice_local_preference_full (guint transport_preference, ...@@ -255,10 +255,10 @@ nice_candidate_ms_ice_local_preference_full (guint transport_preference,
* 9-11: direction_preference * 9-11: direction_preference
* 12-15: transport_preference * 12-15: transport_preference
*/ */
g_assert_cmpuint (other_preference, <, NICE_CANDIDATE_MAX_LOCAL_ADDRESSES); g_assert (other_preference < NICE_CANDIDATE_MAX_LOCAL_ADDRESSES);
g_assert_cmpuint (turn_preference, <, NICE_CANDIDATE_MAX_TURN_SERVERS); g_assert (turn_preference < NICE_CANDIDATE_MAX_TURN_SERVERS);
g_assert_cmpuint (direction_preference, <, 8); g_assert (direction_preference < 8);
g_assert_cmpuint (transport_preference, <, 16); g_assert (transport_preference < 16);
return (transport_preference << 12) + return (transport_preference << 12) +
(direction_preference << 9) + (direction_preference << 9) +
......
...@@ -953,8 +953,8 @@ nice_component_emit_io_callback (NiceAgent *agent, NiceComponent *component, ...@@ -953,8 +953,8 @@ nice_component_emit_io_callback (NiceAgent *agent, NiceComponent *component,
return; return;
g_assert (NICE_IS_AGENT (agent)); g_assert (NICE_IS_AGENT (agent));
g_assert_cmpuint (stream_id, >, 0); g_assert (stream_id > 0);
g_assert_cmpuint (component_id, >, 0); g_assert (component_id > 0);
g_assert (io_callback != NULL); g_assert (io_callback != NULL);
/* Only allocate a closure if the callback is being deferred to an idle /* Only allocate a closure if the callback is being deferred to an idle
......
...@@ -977,10 +977,10 @@ priv_conn_check_tick_stream_nominate (NiceAgent *agent, NiceStream *stream) ...@@ -977,10 +977,10 @@ priv_conn_check_tick_stream_nominate (NiceAgent *agent, NiceStream *stream)
* to test its parent pair instead. * to test its parent pair instead.
*/ */
if (p->succeeded_pair != NULL) { if (p->succeeded_pair != NULL) {
g_assert_cmpint (p->state, ==, NICE_CHECK_DISCOVERED); g_assert (p->state == NICE_CHECK_DISCOVERED);
p = p->succeeded_pair; p = p->succeeded_pair;
} }
g_assert_cmpint (p->state, ==, NICE_CHECK_SUCCEEDED); g_assert (p->state == NICE_CHECK_SUCCEEDED);
if (this_component_pair == NULL) if (this_component_pair == NULL)
/* highest priority pair */ /* highest priority pair */
...@@ -2137,7 +2137,7 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, NiceStre ...@@ -2137,7 +2137,7 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, NiceStre
for (i = stream->conncheck_list; i; i = i->next) { for (i = stream->conncheck_list; i; i = i->next) {
CandidateCheckPair *p = i->data; CandidateCheckPair *p = i->data;
g_assert_cmpuint (p->stream_id, ==, stream->id); g_assert (p->stream_id == stream->id);
if (p->component_id == (c + 1)) { if (p->component_id == (c + 1)) {
if (p->nominated) if (p->nominated)
...@@ -2243,7 +2243,7 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice ...@@ -2243,7 +2243,7 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
if (pair->state == NICE_CHECK_SUCCEEDED && if (pair->state == NICE_CHECK_SUCCEEDED &&
pair->discovered_pair != NULL) { pair->discovered_pair != NULL) {
pair = pair->discovered_pair; pair = pair->discovered_pair;
g_assert_cmpint (pair->state, ==, NICE_CHECK_DISCOVERED); g_assert (pair->state == NICE_CHECK_DISCOVERED);
} }
/* If the received Binding request triggered a new check to be /* If the received Binding request triggered a new check to be
...@@ -3102,7 +3102,7 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str ...@@ -3102,7 +3102,7 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
* use the parent succeeded pair instead */ * use the parent succeeded pair instead */
if (p->succeeded_pair != NULL) { if (p->succeeded_pair != NULL) {
g_assert_cmpint (p->state, ==, NICE_CHECK_DISCOVERED); g_assert (p->state == NICE_CHECK_DISCOVERED);
p = p->succeeded_pair; p = p->succeeded_pair;
} }
......
...@@ -466,7 +466,7 @@ nice_output_stream_write (GOutputStream *stream, const void *buffer, gsize count ...@@ -466,7 +466,7 @@ nice_output_stream_write (GOutputStream *stream, const void *buffer, gsize count
write_data_unref (write_data); write_data_unref (write_data);
g_object_unref (agent); g_object_unref (agent);
g_assert_cmpint (len, !=, 0); g_assert (len != 0);
return len; return len;
} }
......
...@@ -328,7 +328,7 @@ pseudo_tcp_fifo_set_capacity (PseudoTcpFifo *b, gsize size) ...@@ -328,7 +328,7 @@ pseudo_tcp_fifo_set_capacity (PseudoTcpFifo *b, gsize size)
static void static void
pseudo_tcp_fifo_consume_read_data (PseudoTcpFifo *b, gsize size) pseudo_tcp_fifo_consume_read_data (PseudoTcpFifo *b, gsize size)
{ {
g_assert_cmpint (size, <=, b->data_length); g_assert (size <= b->data_length);
b->read_position = (b->read_position + size) % b->buffer_length; b->read_position = (b->read_position + size) % b->buffer_length;
b->data_length -= size; b->data_length -= size;
...@@ -337,7 +337,7 @@ pseudo_tcp_fifo_consume_read_data (PseudoTcpFifo *b, gsize size) ...@@ -337,7 +337,7 @@ pseudo_tcp_fifo_consume_read_data (PseudoTcpFifo *b, gsize size)
static void static void
pseudo_tcp_fifo_consume_write_buffer (PseudoTcpFifo *b, gsize size) pseudo_tcp_fifo_consume_write_buffer (PseudoTcpFifo *b, gsize size)
{ {
g_assert_cmpint (size, <=, b->buffer_length - b->data_length); g_assert (size <= b->buffer_length - b->data_length);
b->data_length += size; b->data_length += size;
} }
...@@ -1073,14 +1073,14 @@ pseudo_tcp_socket_notify_message (PseudoTcpSocket *self, ...@@ -1073,14 +1073,14 @@ pseudo_tcp_socket_notify_message (PseudoTcpSocket *self,
{ {
gboolean retval; gboolean retval;
g_assert_cmpuint (message->n_buffers, >, 0); g_assert (message->n_buffers > 0);
if (message->n_buffers == 1) if (message->n_buffers == 1)
return pseudo_tcp_socket_notify_packet (self, message->buffers[0].buffer, return pseudo_tcp_socket_notify_packet (self, message->buffers[0].buffer,
message->buffers[0].size); message->buffers[0].size);
g_assert_cmpuint (message->n_buffers, ==, 2); g_assert (message->n_buffers == 2);
g_assert_cmpuint (message->buffers[0].size, ==, HEADER_SIZE); g_assert (message->buffers[0].size == HEADER_SIZE);
if (message->length > MAX_PACKET) { if (message->length > MAX_PACKET) {
//LOG_F(WARNING) << "packet too large"; //LOG_F(WARNING) << "packet too large";
...@@ -1376,7 +1376,7 @@ queue (PseudoTcpSocket *self, const gchar * data, guint32 len, TcpFlags flags) ...@@ -1376,7 +1376,7 @@ queue (PseudoTcpSocket *self, const gchar * data, guint32 len, TcpFlags flags)
available_space = pseudo_tcp_fifo_get_write_remaining (&priv->sbuf); available_space = pseudo_tcp_fifo_get_write_remaining (&priv->sbuf);
if (len > available_space) { if (len > available_space) {
g_assert_cmpint (flags, ==, FLAG_NONE); g_assert (flags == FLAG_NONE);
len = available_space; len = available_space;
} }
...@@ -1422,7 +1422,7 @@ packet(PseudoTcpSocket *self, guint32 seq, TcpFlags flags, ...@@ -1422,7 +1422,7 @@ packet(PseudoTcpSocket *self, guint32 seq, TcpFlags flags,
} buffer; } buffer;
PseudoTcpWriteResult wres = WR_SUCCESS; PseudoTcpWriteResult wres = WR_SUCCESS;
g_assert_cmpuint (HEADER_SIZE + len, <=, MAX_PACKET); g_assert (HEADER_SIZE + len <= MAX_PACKET);
*buffer.u32 = htonl(priv->conv); *buffer.u32 = htonl(priv->conv);
*(buffer.u32 + 1) = htonl(seq); *(buffer.u32 + 1) = htonl(seq);
...@@ -1441,7 +1441,7 @@ packet(PseudoTcpSocket *self, guint32 seq, TcpFlags flags, ...@@ -1441,7 +1441,7 @@ packet(PseudoTcpSocket *self, guint32 seq, TcpFlags flags,
bytes_read = pseudo_tcp_fifo_read_offset (&priv->sbuf, buffer.u8 + HEADER_SIZE, bytes_read = pseudo_tcp_fifo_read_offset (&priv->sbuf, buffer.u8 + HEADER_SIZE,
len, offset); len, offset);
g_assert_cmpint (bytes_read, ==, len); g_assert (bytes_read == len);
} }
DEBUG (PSEUDO_TCP_DEBUG_VERBOSE, "Sending <CONV=%u><FLG=%u><SEQ=%u:%u><ACK=%u>" DEBUG (PSEUDO_TCP_DEBUG_VERBOSE, "Sending <CONV=%u><FLG=%u><SEQ=%u:%u><ACK=%u>"
...@@ -1713,7 +1713,7 @@ process(PseudoTcpSocket *self, Segment *seg) ...@@ -1713,7 +1713,7 @@ process(PseudoTcpSocket *self, Segment *seg)
for (nFree = nAcked; nFree > 0; ) { for (nFree = nAcked; nFree > 0; ) {
SSegment *data; SSegment *data;
g_assert_cmpuint (g_queue_get_length (&priv->slist), !=, 0); g_assert (g_queue_get_length (&priv->slist) != 0);
data = (SSegment *) g_queue_peek_head (&priv->slist); data = (SSegment *) g_queue_peek_head (&priv->slist);
if (nFree < data->len) { if (nFree < data->len) {
...@@ -1995,7 +1995,7 @@ process(PseudoTcpSocket *self, Segment *seg) ...@@ -1995,7 +1995,7 @@ process(PseudoTcpSocket *self, Segment *seg)
res = pseudo_tcp_fifo_write_offset (&priv->rbuf, (guint8 *) seg->data, res = pseudo_tcp_fifo_write_offset (&priv->rbuf, (guint8 *) seg->data,
seg->len, nOffset); seg->len, nOffset);
g_assert_cmpint (res, ==, seg->len); g_assert (res == seg->len);
if (seg->seq == priv->rcv_nxt) { if (seg->seq == priv->rcv_nxt) {
GList *iter = NULL; GList *iter = NULL;
...@@ -2077,7 +2077,7 @@ transmit(PseudoTcpSocket *self, SSegment *segment, guint32 now) ...@@ -2077,7 +2077,7 @@ transmit(PseudoTcpSocket *self, SSegment *segment, guint32 now)
PseudoTcpWriteResult wres; PseudoTcpWriteResult wres;
/* The packet must not have already been acknowledged. */ /* The packet must not have already been acknowledged. */
g_assert_cmpuint (segment->seq - priv->snd_una, <=, 1024 * 1024 * 64); g_assert (segment->seq - priv->snd_una <= 1024 * 1024 * 64);
/* Write out the packet. */ /* Write out the packet. */
wres = packet(self, seq, flags, wres = packet(self, seq, flags,
...@@ -2091,7 +2091,7 @@ transmit(PseudoTcpSocket *self, SSegment *segment, guint32 now) ...@@ -2091,7 +2091,7 @@ transmit(PseudoTcpSocket *self, SSegment *segment, guint32 now)
return ECONNABORTED; /* FIXME: This error code doesn’t quite seem right */ return ECONNABORTED; /* FIXME: This error code doesn’t quite seem right */
} }
g_assert_cmpint (wres, ==, WR_TOO_LARGE); g_assert (wres == WR_TOO_LARGE);
while (TRUE) { while (TRUE) {
if (PACKET_MAXIMUMS[priv->msslevel + 1] == 0) { if (PACKET_MAXIMUMS[priv->msslevel + 1] == 0) {
......
...@@ -226,7 +226,7 @@ fill_vectors (GOutputVector * vecs, GstMapInfo * maps, guint n, GstBuffer * buf) ...@@ -226,7 +226,7 @@ fill_vectors (GOutputVector * vecs, GstMapInfo * maps, guint n, GstBuffer * buf)
gsize size = 0; gsize size = 0;
guint i; guint i;
g_assert_cmpuint (gst_buffer_n_memory (buf), ==, n); g_assert (gst_buffer_n_memory (buf) == n);
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
mem = gst_buffer_peek_memory (buf, i); mem = gst_buffer_peek_memory (buf, i);
......
...@@ -203,7 +203,7 @@ socket_close (NiceSocket *sock) ...@@ -203,7 +203,7 @@ socket_close (NiceSocket *sock)
static void static void
assert_ring_buffer_valid (HttpPriv *priv) assert_ring_buffer_valid (HttpPriv *priv)
{ {
g_assert_cmpint (priv->recv_buf_fill, <=, priv->recv_buf_length); g_assert (priv->recv_buf_fill <= priv->recv_buf_length);
g_assert (priv->recv_buf_pos == 0 || g_assert (priv->recv_buf_pos == 0 ||
priv->recv_buf_pos < priv->recv_buf_length); priv->recv_buf_pos < priv->recv_buf_length);
g_assert (priv->recv_buf_length == 0 || priv->recv_buf != NULL); g_assert (priv->recv_buf_length == 0 || priv->recv_buf != NULL);
......
...@@ -333,7 +333,7 @@ nice_socket_queue_send (GQueue *send_queue, const NiceAddress *to, ...@@ -333,7 +333,7 @@ nice_socket_queue_send (GQueue *send_queue, const NiceAddress *to,
offset += len; offset += len;
} }
g_assert_cmpint (offset, ==, tbs->length); g_assert (offset == tbs->length);
} }
} }
......
...@@ -671,10 +671,10 @@ _socket_send_messages_wrapped (NiceSocket *sock, const NiceAddress *to, ...@@ -671,10 +671,10 @@ _socket_send_messages_wrapped (NiceSocket *sock, const NiceAddress *to,
guint i; guint i;
gint ret; gint ret;
g_assert_cmpuint (n_messages, ==, 1); g_assert (n_messages == 1);
message = &messages[0]; message = &messages[0];
message_len = output_message_get_size (message); message_len = output_message_get_size (message);
g_assert_cmpint (message_len, <=, G_MAXUINT16); g_assert (message_len <= G_MAXUINT16);
/* ICE-TCP requires that all packets be framed with RFC4571 */ /* ICE-TCP requires that all packets be framed with RFC4571 */
...@@ -1246,7 +1246,7 @@ nice_udp_turn_socket_cache_realm_nonce_locked (NiceSocket *sock, ...@@ -1246,7 +1246,7 @@ nice_udp_turn_socket_cache_realm_nonce_locked (NiceSocket *sock,
UdpTurnPriv *priv = sock->priv; UdpTurnPriv *priv = sock->priv;
gconstpointer tmp; gconstpointer tmp;
g_assert_cmpint (sock->type, ==, NICE_SOCKET_TYPE_UDP_TURN); g_assert (sock->type == NICE_SOCKET_TYPE_UDP_TURN);
g_free (priv->cached_realm); g_free (priv->cached_realm);
priv->cached_realm = NULL; priv->cached_realm = NULL;
...@@ -1293,7 +1293,7 @@ nice_udp_turn_socket_parse_recv_message (NiceSocket *sock, NiceSocket **from_soc ...@@ -1293,7 +1293,7 @@ nice_udp_turn_socket_parse_recv_message (NiceSocket *sock, NiceSocket **from_soc
message->from, message->length, message->buffers[0].buffer, message->from, message->length, message->buffers[0].buffer,
message->from, message->buffers[0].buffer, message->length); message->from, message->buffers[0].buffer, message->length);
g_assert_cmpuint (len, <=, message->length); g_assert (len <= message->length);
message->length = len; message->length = len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment