[linux-nfc] [neard][PATCH v2 45/73] unit: use g_assert_cmpstr()

Krzysztof Kozlowski <[email protected]> Mon, 19 Jul 2021 13:07:51 +0200
Newsgroups org.01.lists.linux-nfc,dev.linux.lists.oe-linux-nfc
Message-ID <[email protected]>
Comparisons of simple values should use test macros instead of checking
standard library call return value.  This prints more information:

g_assert():
    ERROR:unit/test-ndef-parse.c:256:test_ndef_text_encoding: assertion failed: (strcmp(record->text->language_code, "en-US1") == 0)

g_assert_cmpstr():
    ERROR:unit/test-ndef-parse.c:256:test_ndef_text_encoding: assertion failed (record->text->language_code == "en-US1"): ("en-US" == "en-US1")

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
 unit/test-ndef-parse.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/unit/test-ndef-parse.c b/unit/test-ndef-parse.c
index 6c62c7a928c7..91dc1f7c185e 100644
--- a/unit/test-ndef-parse.c
+++ b/unit/test-ndef-parse.c
@@ -244,9 +244,9 @@ static void test_ndef_text(void)
 	g_assert(record->header->me == 1);
 
 	g_assert(record->text);
-	g_assert(strcmp(record->text->data, "hello żółw") == 0);
-	g_assert(strcmp(record->text->encoding, "UTF-8") == 0);
-	g_assert(strcmp(record->text->language_code, "en-US") == 0);
+	g_assert_cmpstr(record->text->data, ==, "hello żółw");
+	g_assert_cmpstr(record->text->encoding,==,  "UTF-8");
+	g_assert_cmpstr(record->text->language_code, ==, "en-US");
 
 	if (g_test_verbose()) {
 		g_print("NDEF Text data: %s\n", record->text->data);
@@ -349,9 +349,9 @@ static void test_ndef_title_sp(void)
 		g_print("NDEF SP URI field: %.*s\n", uri->field_length,
 							(char *) uri->field);
 
-	g_assert(strcmp(text->data, "Intel") == 0);
-	g_assert(strcmp(text->encoding, "UTF-8") == 0);
-	g_assert(strcmp(text->language_code, "en") == 0);
+	g_assert_cmpstr(text->data, ==, "Intel");
+	g_assert_cmpstr(text->encoding, ==, "UTF-8");
+	g_assert_cmpstr(text->language_code, ==, "en");
 
 	if (g_test_verbose()) {
 		g_print("NDEF SP Title data: %s\n", text->data);
@@ -389,7 +389,7 @@ static void test_ndef_aar(void)
 
 	g_assert(record->aar);
 	g_assert(record->aar->package);
-	g_assert(strcmp((char *) record->aar->package, "com.example.aar") == 0);
+	g_assert_cmpstr((char *) record->aar->package, ==, "com.example.aar");
 
 
 	if (g_test_verbose())
@@ -431,7 +431,7 @@ static void test_ndef_ho_hs_bt(void)
 
 	records = g_list_next(records);
 	record = records->data;
-	g_assert(strcmp(record->type, BT_MIME_STRING_2_1) == 0);
+	g_assert_cmpstr(record->type, ==, BT_MIME_STRING_2_1);
 }
 
 int main(int argc, char **argv)
-- 
2.27.0
_______________________________________________
Linux-nfc mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s