[rpstir-devel] [PATCH 07/13] add tests for scrub_for_print()'s output length

[Richard Hansen]

These tests currently fail due to bugs in scrub_for_print().
Subsequent commits will fix the bugs.
---
 lib/util/tests/stringutils-test.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/util/tests/stringutils-test.c 
b/lib/util/tests/stringutils-test.c
index eb72ab0..8193f7b 100644
--- a/lib/util/tests/stringutils-test.c
+++ b/lib/util/tests/stringutils-test.c
@@ -12,9 +12,11 @@ static bool test_scrub_for_print__length_if_truncated(
     size_t const DST_LEN = 5;
     char src[] = "0123456789";
     char dst[DST_LEN];
+    size_t len_out;
 
-    scrub_for_print(dst, src, DST_LEN, NULL, "");
+    scrub_for_print(dst, src, DST_LEN, &len_out, "");
     TEST(size_t, "%zu", strlen(dst), ==, DST_LEN - 1);
+    TEST(size_t, "%zu", len_out, ==, strlen(src));
 
     return true;
 }
@@ -24,10 +26,12 @@ static bool 
test_scrub_for_print__length_if_expansion_truncated(
 {
     char src[50];
     char dst[dst_sz];
+    size_t len_out;
 
     sprintf(src, "%c%c%s", 'a', '\n', "12345");
-    scrub_for_print(dst, src, dst_sz, NULL, "");
+    scrub_for_print(dst, src, dst_sz, &len_out, "");
     TEST(size_t, "%zu", strlen(dst), ==, dst_sz - 1);
+    TEST(size_t, "%zu", len_out, ==, strlen(src) + 3);
 
     return true;
 }
@@ -38,9 +42,11 @@ static bool test_scrub_for_print__null_input(
     size_t const DST_LEN = 5;
     char src[] = "";
     char dst[DST_LEN];
+    size_t len_out;
 
-    scrub_for_print(dst, src, DST_LEN, NULL, "");
+    scrub_for_print(dst, src, DST_LEN, &len_out, "");
     TEST(size_t, "%zu", strlen(dst), ==, 0);
+    TEST(size_t, "%zu", len_out, ==, strlen(src));
 
     return true;
 }
@@ -51,9 +57,11 @@ static bool test_scrub_for_print__copy_all(
     size_t const DST_LEN = 10;
     char src[] = "abcdefg";
     char dst[DST_LEN];
+    size_t len_out;
 
-    scrub_for_print(dst, src, DST_LEN, NULL, "");
+    scrub_for_print(dst, src, DST_LEN, &len_out, "");
     TEST(size_t, "%zu", strlen(dst), ==, strlen(src));
+    TEST(size_t, "%zu", len_out, ==, strlen(src));
 
     return true;
 }
@@ -64,9 +72,11 @@ static bool test_scrub_for_print__backslash(
     size_t const DST_LEN = 50;
     char src[] = "ab\\cde\\";
     char dst[DST_LEN];
+    size_t len_out;
 
-    scrub_for_print(dst, src, DST_LEN, NULL, "");
+    scrub_for_print(dst, src, DST_LEN, &len_out, "");
     TEST(size_t, "%zu", strlen(dst), ==, strlen(src) + 2);
+    TEST(size_t, "%zu", len_out, ==, strlen(src) + 2);
 
     return true;
 }
@@ -77,9 +87,11 @@ static bool test_scrub_for_print__escape_chars(
     size_t const DST_LEN = 50;
     char src[] = "abcde";
     char dst[DST_LEN];
+    size_t len_out;
 
-    scrub_for_print(dst, src, DST_LEN, NULL, "bd");
+    scrub_for_print(dst, src, DST_LEN, &len_out, "bd");
     TEST_BOOL(strcmp(dst, "a\\bc\\de"), false);
+    TEST(size_t, "%zu", len_out, ==, strlen(src) + 2);
 
     return true;
 }
-- 
2.4.3


------------------------------------------------------------------------------
_______________________________________________
rpstir-devel mailing list
rpstir-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpstir-devel