unit: use g_assert_cmpint() and g_assert_cmpuint()

Comparisons of simple values should use test macros instead of checking
standard library call return value.  This prints more information on
failure - the actual values used for comparisons.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

3 files changed, 56 insertions, 55 deletions

diff --git a/unit/test-ndef-build.c b/unit/test-ndef-build.c
index 7ff2222..e83f7a8 100644
--- a/unit/test-ndef-build.c
+++ b/unit/test-ndef-build.c
@@ -63,7 +63,7 @@ static void test_ndef_text_build(void)
 	ndef = near_ndef_prepare_text_record("UTF-8", "en-US", "hello");
 
 	g_assert(ndef);
-	g_assert(ndef->length == ARRAY_SIZE(text));
+	g_assert_cmpuint(ndef->length, ==, ARRAY_SIZE(text));
 	g_assert(!memcmp(ndef->data, text, ARRAY_SIZE(text)));
 }
 
@@ -74,7 +74,7 @@ static void test_ndef_wsc_with_passphrase_build(void)
 	ndef = near_ndef_prepare_wsc_record("TestSSID", "Testpass");
 
 	g_assert(ndef);
-	g_assert(ndef->length == ARRAY_SIZE(wsc));
+	g_assert_cmpuint(ndef->length, ==, ARRAY_SIZE(wsc));
 	g_assert(!memcmp(ndef->data, wsc, ARRAY_SIZE(wsc)));
 }
 
@@ -85,7 +85,7 @@ static void test_ndef_wsc_with_out_passphrase_build(void)
 	ndef = near_ndef_prepare_wsc_record("TestSSID", NULL);
 
 	g_assert(ndef);
-	g_assert(ndef->length == ARRAY_SIZE(wsc_wo));
+	g_assert_cmpuint(ndef->length, ==, ARRAY_SIZE(wsc_wo));
 	g_assert(!memcmp(ndef->data, wsc_wo, ARRAY_SIZE(wsc_wo)));
 }
 
diff --git a/unit/test-ndef-parse.c b/unit/test-ndef-parse.c
index 91dc1f7..9d68a6a 100644
--- a/unit/test-ndef-parse.c
+++ b/unit/test-ndef-parse.c
@@ -206,16 +206,16 @@ static void test_ndef_uri(void)
 	records = near_ndef_parse_msg(uri, sizeof(uri), NULL);
 
 	g_assert(records);
-	g_assert(g_list_length(records) == 1);
+	g_assert_cmpuint(g_list_length(records), ==, 1);
 
 	record = (struct near_ndef_record *)(records->data);
 
-	g_assert(record->header->rec_type == RECORD_TYPE_WKT_URI);
-	g_assert(record->header->mb == 1);
-	g_assert(record->header->me == 1);
+	g_assert_cmpuint(record->header->rec_type, ==, RECORD_TYPE_WKT_URI);
+	g_assert_cmpuint(record->header->mb, ==, 1);
+	g_assert_cmpuint(record->header->me, ==, 1);
 
 	g_assert(record->uri);
-	g_assert(record->uri->field_length == strlen("intel.com"));
+	g_assert_cmpuint(record->uri->field_length, ==, strlen("intel.com"));
 	g_assert(strncmp((char *) record->uri->field, "intel.com",
 					record->uri->field_length) == 0);
 
@@ -235,13 +235,13 @@ static void test_ndef_text(void)
 	records = near_ndef_parse_msg(text, sizeof(text), NULL);
 
 	g_assert(records);
-	g_assert(g_list_length(records) == 1);
+	g_assert_cmpuint(g_list_length(records), ==, 1);
 
 	record = (struct near_ndef_record *)(records->data);
 
-	g_assert(record->header->rec_type == RECORD_TYPE_WKT_TEXT);
-	g_assert(record->header->mb == 1);
-	g_assert(record->header->me == 1);
+	g_assert_cmpuint(record->header->rec_type, ==, RECORD_TYPE_WKT_TEXT);
+	g_assert_cmpuint(record->header->mb, ==, 1);
+	g_assert_cmpuint(record->header->me, ==, 1);
 
 	g_assert(record->text);
 	g_assert_cmpstr(record->text->data, ==, "hello żółw");
@@ -280,24 +280,24 @@ static void test_ndef_single_sp(void)
 	records = near_ndef_parse_msg(single_sp, sizeof(single_sp), NULL);
 
 	g_assert(records);
-	g_assert(g_list_length(records) == 1);
+	g_assert_cmpuint(g_list_length(records), ==, 1);
 
 	record = (struct near_ndef_record *) records->data;
 
-	g_assert(record->header->rec_type == RECORD_TYPE_WKT_SMART_POSTER);
-	g_assert(record->header->mb == 1);
-	g_assert(record->header->me == 1);
+	g_assert_cmpuint(record->header->rec_type, ==, RECORD_TYPE_WKT_SMART_POSTER);
+	g_assert_cmpuint(record->header->mb, ==, 1);
+	g_assert_cmpuint(record->header->me, ==, 1);
 
 	g_assert(record->sp);
-	g_assert(record->sp->number_of_title_records == 0);
+	g_assert_cmpuint(record->sp->number_of_title_records, ==, 0);
 	g_assert(!record->sp->type);
 	g_assert(!record->sp->action);
-	g_assert(record->sp->size == 0);
+	g_assert_cmpuint(record->sp->size, ==, 0);
 	g_assert(record->sp->uri);
 
 	uri = (struct near_ndef_uri_payload *) record->sp->uri;
 
-	g_assert(uri->field_length == strlen("intel.com"));
+	g_assert_cmpuint(uri->field_length, ==, strlen("intel.com"));
 	g_assert(strncmp((char *) uri->field, "intel.com",
 					uri->field_length) == 0);
 
@@ -322,26 +322,26 @@ static void test_ndef_title_sp(void)
 	records = near_ndef_parse_msg(title_sp, sizeof(title_sp), NULL);
 
 	g_assert(records);
-	g_assert(g_list_length(records) == 1);
+	g_assert_cmpuint(g_list_length(records), ==, 1);
 
 	record = (struct near_ndef_record *) records->data;
 
-	g_assert(record->header->rec_type == RECORD_TYPE_WKT_SMART_POSTER);
-	g_assert(record->header->mb == 1);
-	g_assert(record->header->me == 1);
+	g_assert_cmpuint(record->header->rec_type, ==, RECORD_TYPE_WKT_SMART_POSTER);
+	g_assert_cmpuint(record->header->mb, ==, 1);
+	g_assert_cmpuint(record->header->me, ==, 1);
 
 	g_assert(record->sp);
-	g_assert(record->sp->number_of_title_records == 1);
+	g_assert_cmpuint(record->sp->number_of_title_records, ==, 1);
 	g_assert(!record->sp->type);
 	g_assert(!record->sp->action);
-	g_assert(record->sp->size == 0);
+	g_assert_cmpuint(record->sp->size, ==, 0);
 	g_assert(record->sp->uri);
 	g_assert(record->sp->title_records[0]);
 
 	uri = (struct near_ndef_uri_payload *) record->sp->uri;
 	text = (struct near_ndef_text_payload *) record->sp->title_records[0];
 
-	g_assert(uri->field_length == strlen("intel.com"));
+	g_assert_cmpuint(uri->field_length, ==, strlen("intel.com"));
 	g_assert(strncmp((char *) uri->field, "intel.com",
 					uri->field_length) == 0);
 
@@ -379,13 +379,13 @@ static void test_ndef_aar(void)
 	records = near_ndef_parse_msg(aar, sizeof(aar), NULL);
 
 	g_assert(records);
-	g_assert(g_list_length(records) == 1);
+	g_assert_cmpuint(g_list_length(records), ==, 1);
 
 	record = (struct near_ndef_record *)(records->data);
 
-	g_assert(record->header->rec_type == RECORD_TYPE_EXT_AAR);
-	g_assert(record->header->mb == 1);
-	g_assert(record->header->me == 1);
+	g_assert_cmpuint(record->header->rec_type, ==, RECORD_TYPE_EXT_AAR);
+	g_assert_cmpuint(record->header->mb, ==, 1);
+	g_assert_cmpuint(record->header->me, ==, 1);
 
 	g_assert(record->aar);
 	g_assert(record->aar->package);
@@ -417,16 +417,16 @@ static void test_ndef_ho_hs_bt(void)
 	records = near_ndef_parse_msg(ho_hs_bt, sizeof(ho_hs_bt), NULL);
 
 	g_assert(records);
-	g_assert(g_list_length(records) == 2);
+	g_assert_cmpuint(g_list_length(records), ==, 2);
 
 	record = records->data;
 	ho = record->ho;
 
-	g_assert(ho->number_of_ac_payloads == 1);
+	g_assert_cmpuint(ho->number_of_ac_payloads, ==, 1);
 
 	ac = ho->ac_payloads[0];
 
-	g_assert(ac->cdr_len == 1);
+	g_assert_cmpuint(ac->cdr_len, ==, 1);
 	g_assert(memcmp(ac->cdr, "0", ac->cdr_len) == 0);
 
 	records = g_list_next(records);
diff --git a/unit/test-snep-read.c b/unit/test-snep-read.c
index 03c916a..802451e 100644
--- a/unit/test-snep-read.c
+++ b/unit/test-snep-read.c
@@ -367,7 +367,7 @@ static bool test_snep_read_send_fragment(size_t frag_len,
 	size_t nbytes;
 
 	nbytes = send(sockfd[client], data, frag_len, 0);
-	g_assert(nbytes == frag_len);
+	g_assert_cmpuint(nbytes, ==, frag_len);
 
 	near_snep_core_read(sockfd[server], 0, 0, NULL,
 			test_snep_dummy_req_get, test_snep_dummy_req_put,
@@ -400,7 +400,7 @@ static void test_snep_read_recv_fragments(uint32_t frag_len,
 
 		/* receive remaining fragments */
 		nbytes = recv(sockfd[client], resp, frag_len, 0);
-		g_assert(nbytes > 0); /* TODO use explicit value? */
+		g_assert_cmpint(nbytes, >, 0); /* TODO use explicit value? */
 
 		/* store received data (no header this time) */
 		memcpy(data_recvd + offset, resp, nbytes);
@@ -422,8 +422,8 @@ static void test_snep_read_no_response(void)
 	g_assert(resp);
 
 	nbytes = recv(sockfd[client], resp, sizeof(*resp), MSG_DONTWAIT);
-	g_assert(nbytes < 0);
-	g_assert(errno == EAGAIN);
+	g_assert_cmpint(nbytes, <, 0);
+	g_assert_cmpint(errno, ==, EAGAIN);
 
 	g_free(resp);
 }
@@ -446,14 +446,14 @@ static void test_snep_read_verify_resp(int exp_resp_code,
 	g_assert(resp);
 
 	nbytes = recv(sockfd[client], resp, frame_len, 0);
-	g_assert(nbytes == frame_len);
+	g_assert_cmpint(nbytes, ==, frame_len);
 
 	TEST_SNEP_LOG("received response = 0x%02X, exp = 0x%02X\n",
 			resp->response, exp_resp_code);
 
-	g_assert(resp->version == NEAR_SNEP_VERSION);
-	g_assert(resp->response == exp_resp_code);
-	g_assert(resp->length == GUINT_TO_BE(exp_resp_info_len));
+	g_assert_cmpuint(resp->version, ==, NEAR_SNEP_VERSION);
+	g_assert_cmpuint(resp->response, ==, exp_resp_code);
+	g_assert_cmpuint(resp->length, ==, GUINT_TO_BE(exp_resp_info_len));
 	g_assert(!memcmp(resp->info, exp_resp_info, exp_resp_info_len));
 
 	g_free(resp);
@@ -750,8 +750,8 @@ static void test_snep_read_get_req_frags_client_resp(gpointer context,
 
 	/* start receiving fragments */
 	nbytes = recv(sockfd[client], resp, frame_len, 0);
-	g_assert(nbytes == frag_len);
-	g_assert(resp->length == GUINT_TO_BE(ctx->req_info_len));
+	g_assert_cmpuint(nbytes, ==, frag_len);
+	g_assert_cmpuint(resp->length, ==, GUINT_TO_BE(ctx->req_info_len));
 	g_assert(resp->info);
 
 	data_recvd = g_try_malloc0(ctx->req_info_len);
@@ -817,10 +817,10 @@ static void test_snep_response_noinfo(gpointer context, gconstpointer gp)
 	near_snep_core_response_noinfo(sockfd[client], NEAR_SNEP_RESP_SUCCESS);
 
 	bytes_recv = recv(sockfd[server], &resp, sizeof(resp), 0);
-	g_assert(bytes_recv == NEAR_SNEP_RESP_HEADER_LENGTH);
-	g_assert(resp.version == NEAR_SNEP_VERSION);
-	g_assert(resp.response == NEAR_SNEP_RESP_SUCCESS);
-	g_assert(resp.length == 0);
+	g_assert_cmpint(bytes_recv, ==, NEAR_SNEP_RESP_HEADER_LENGTH);
+	g_assert_cmpint(resp.version, ==, NEAR_SNEP_VERSION);
+	g_assert_cmpint(resp.response, ==, NEAR_SNEP_RESP_SUCCESS);
+	g_assert_cmpint(resp.length, ==, 0);
 }
 
 /*
@@ -841,7 +841,7 @@ static void test_snep_response_put_get_ndef(gpointer context,
 	ndef = near_ndef_prepare_text_record("UTF-8", "en-US", "neard");
 	g_assert(ndef);
 	g_assert(ndef->data);
-	g_assert(ndef->length > 0);
+	g_assert_cmpuint(ndef->length, >, 0);
 
 	frame_len = NEAR_SNEP_RESP_HEADER_LENGTH + ndef->length;
 
@@ -855,7 +855,7 @@ static void test_snep_response_put_get_ndef(gpointer context,
 
 	/* Send PUT request with text record */
 	nbytes = send(sockfd[server], req, frame_len, 0);
-	g_assert(nbytes == frame_len);
+	g_assert_cmpuint(nbytes, ==, frame_len);
 
 	/* UUT */
 	ret = near_snep_core_read(sockfd[client], 0, 0, NULL,
@@ -867,14 +867,14 @@ static void test_snep_response_put_get_ndef(gpointer context,
 
 	/* Get response from server */
 	nbytes = recv(sockfd[server], resp, frame_len, 0);
-	g_assert(nbytes > 0);
-	g_assert(resp->response == NEAR_SNEP_RESP_SUCCESS);
+	g_assert_cmpint(nbytes, >, 0);
+	g_assert_cmpuint(resp->response, ==, NEAR_SNEP_RESP_SUCCESS);
 
 	/* Send GET request to retrieve a record */
 	req->request = NEAR_SNEP_REQ_GET;
 	req->length = 0;
 	nbytes = send(sockfd[server], req, NEAR_SNEP_RESP_HEADER_LENGTH, 0);
-	g_assert(nbytes > 0);
+	g_assert_cmpint(nbytes, >, 0);
 
 	/* UUT */
 	ret = near_snep_core_read(sockfd[client], 0, 0, NULL,
@@ -883,9 +883,10 @@ static void test_snep_response_put_get_ndef(gpointer context,
 
 	/* Get response and verify */
 	nbytes = recv(sockfd[server], resp, frame_len, 0);
-	g_assert(nbytes > 0);
-	g_assert(resp->response == NEAR_SNEP_RESP_SUCCESS);
-	g_assert(resp->length == GUINT_TO_BE(ndef->length));
+	g_assert_cmpint(nbytes, >, 0);
+	g_assert_cmpuint(resp->response, ==, NEAR_SNEP_RESP_SUCCESS);
+	g_assert_cmpint(resp->length, ==, GUINT_TO_BE(ndef->length));
+	g_assert_cmpuint(resp->length, ==, GUINT_TO_BE(ndef->length));
 	g_assert(!memcmp(resp->info, text, ndef->length));
 
 	g_free(req);