Add string array equality test assert

Author: cookpate

src/json_encode.c

@@ -225,8 +225,7 @@ GG_TEST_DEFINE(json_encode_null_ok) {
     GgBuffer buf = GG_BUF((uint8_t[4]) { 0 });
     GgByteVec vec = gg_byte_vec_init(buf);
     GG_TEST_ASSERT_OK(gg_json_encode(null, gg_byte_vec_writer(&vec)));
-    TEST_ASSERT_EQUAL_UINT(4, vec.buf.len);
-    TEST_ASSERT_EQUAL_CHAR_ARRAY("null", (char *) vec.buf.data, vec.buf.len);
+    GG_TEST_ASSERT_BUF_EQUAL_STR(GG_STR("null"), vec.buf);
 }
 
 GG_TEST_DEFINE(json_encode_bool_ok) {
@@ -235,15 +234,15 @@ GG_TEST_DEFINE(json_encode_bool_ok) {
         GgBuffer buf = GG_BUF((uint8_t[5]) { 0 });
         GgByteVec vec = gg_byte_vec_init(buf);
         GG_TEST_ASSERT_OK(gg_json_encode(obj_false, gg_byte_vec_writer(&vec)));
-        GG_TEST_ASSERT_BUF_EQUAL(GG_STR("false"), vec.buf);
+        GG_TEST_ASSERT_BUF_EQUAL_STR(GG_STR("false"), vec.buf);
     }
 
     {
         GgObject obj_true = gg_obj_bool(true);
         GgBuffer buf = GG_BUF((uint8_t[4]) { 0 });
         GgByteVec vec = gg_byte_vec_init(buf);
         GG_TEST_ASSERT_OK(gg_json_encode(obj_true, gg_byte_vec_writer(&vec)));
-        GG_TEST_ASSERT_BUF_EQUAL(GG_STR("true"), vec.buf);
+        GG_TEST_ASSERT_BUF_EQUAL_STR(GG_STR("true"), vec.buf);
     }
 }
 
@@ -252,7 +251,7 @@ GG_TEST_DEFINE(json_encode_i64_ok) {
     GgBuffer buf = GG_BUF((uint8_t[3]) { 0 });
     GgByteVec vec = gg_byte_vec_init(buf);
     GG_TEST_ASSERT_OK(gg_json_encode(obj, gg_byte_vec_writer(&vec)));
-    GG_TEST_ASSERT_BUF_EQUAL(GG_STR("123"), vec.buf);
+    GG_TEST_ASSERT_BUF_EQUAL_STR(GG_STR("123"), vec.buf);
 }
 
 GG_TEST_DEFINE(json_encode_f64_ok) {
@@ -272,23 +271,23 @@ GG_TEST_DEFINE(json_encode_buf_ok) {
         GgBuffer buf = GG_BUF((uint8_t[8]) { 0 });
         GgByteVec vec = gg_byte_vec_init(buf);
         GG_TEST_ASSERT_OK(gg_json_encode(obj, gg_byte_vec_writer(&vec)));
-        GG_TEST_ASSERT_BUF_EQUAL(GG_STR("\"\\u001F\""), vec.buf);
+        GG_TEST_ASSERT_BUF_EQUAL_STR(GG_STR("\"\\u001F\""), vec.buf);
     }
 
     {
         GgObject obj = gg_obj_buf(GG_STR("Hello, world!"));
         GgBuffer buf = GG_BUF((uint8_t[15]) { 0 });
         GgByteVec vec = gg_byte_vec_init(buf);
         GG_TEST_ASSERT_OK(gg_json_encode(obj, gg_byte_vec_writer(&vec)));
-        GG_TEST_ASSERT_BUF_EQUAL(GG_STR("\"Hello, world!\""), vec.buf);
+        GG_TEST_ASSERT_BUF_EQUAL_STR(GG_STR("\"Hello, world!\""), vec.buf);
     }
 
     {
         GgObject obj = gg_obj_buf(GG_STR("\"escape \\ me \" \0"));
         GgBuffer buf = GG_BUF((uint8_t[26]) { 0 });
         GgByteVec vec = gg_byte_vec_init(buf);
         GG_TEST_ASSERT_OK(gg_json_encode(obj, gg_byte_vec_writer(&vec)));
-        GG_TEST_ASSERT_BUF_EQUAL(
+        GG_TEST_ASSERT_BUF_EQUAL_STR(
             GG_STR("\"\\\"escape \\\\ me \\\" \\u0000\""), vec.buf
         );
     }
@@ -304,7 +303,9 @@ GG_TEST_DEFINE(json_encode_map_ok) {
         GgBuffer buf = GG_BUF((uint8_t[20]) { 0 });
         GgByteVec vec = gg_byte_vec_init(buf);
         GG_TEST_ASSERT_OK(gg_json_encode(obj, gg_byte_vec_writer(&vec)));
-        GG_TEST_ASSERT_BUF_EQUAL(GG_STR("{\"a\":1,\"b\":2,\"c\":3}"), vec.buf);
+        GG_TEST_ASSERT_BUF_EQUAL_STR(
+            GG_STR("{\"a\":1,\"b\":2,\"c\":3}"), vec.buf
+        );
     }
 }
 
@@ -315,7 +316,7 @@ GG_TEST_DEFINE(json_encode_list_ok) {
         GgBuffer buf = GG_BUF((uint8_t[7]) { 0 });
         GgByteVec vec = gg_byte_vec_init(buf);
         GG_TEST_ASSERT_OK(gg_json_encode(obj, gg_byte_vec_writer(&vec)));
-        GG_TEST_ASSERT_BUF_EQUAL(GG_STR("[1,2,3]"), vec.buf);
+        GG_TEST_ASSERT_BUF_EQUAL_STR(GG_STR("[1,2,3]"), vec.buf);
     }
 }
 

test/client/mqtt.c

@@ -219,7 +219,7 @@ static void subscribe_to_iot_core_okay_subscription_response(
 ) {
     SubscribeOkayContext *context = ctx;
     TEST_ASSERT_EQUAL_PTR(&subscribe_okay_context, context);
-    GG_TEST_ASSERT_BUF_EQUAL(GG_STR("my/topic"), topic);
+    GG_TEST_ASSERT_BUF_EQUAL_STR(GG_STR("my/topic"), topic);
 
     GG_TEST_ASSERT_BUF_EQUAL(payloads[0].payload, payload);
 

unity/gg_test/include/gg/test.h

@@ -52,4 +52,14 @@ int gg_test_run_suite(void);
         ); \
     } while (0)
 
+#define GG_TEST_ASSERT_BUF_EQUAL_STR(expected, actual) \
+    do { \
+        TEST_ASSERT_EQUAL_size_t_MESSAGE( \
+            (expected).len, (actual).len, "Size mismatch" \
+        ); \
+        TEST_ASSERT_EQUAL_STRING_LEN( \
+            (expected).data, (actual).data, (expected).len \
+        ); \
+    } while (0)
+
 #endif