Merged branch 'master' of git://git.tokkee.org/sysdb.

[sysdb.git] / t / core / data_test.c

diff --git a/t/core/data_test.c b/t/core/data_test.c
index 8af042a8a79a1cfb53deccd7c6a55874d327ec15..261d5fd5a08ef9c60eb15eaf175897aeb27ed7fa 100644 (file)
--- a/t/core/data_test.c
+++ b/t/core/data_test.c
@@ -159,14 +159,20 @@ START_TEST(test_format)
 
                memset(buf, (int)'A', sizeof(buf));
 
-               check = sdb_data_format(datum, buf, sizeof(buf) - 1);
-               fail_unless(! check,
-                               "sdb_data_format(type=%s) = %d; expected: 0",
+               check = sdb_data_format(datum, buf, sizeof(buf) - 1,
+                               SDB_DOUBLE_QUOTED);
+               fail_unless(check > 0,
+                               "sdb_data_format(type=%s) = %d; expected: >0",
                                SDB_TYPE_TO_STRING(datum->type), check);
                fail_unless(! strcmp(buf, golden_data[i].expected),
                                "sdb_data_format(type=%s) used wrong format: %s; expected: %s",
                                SDB_TYPE_TO_STRING(datum->type), buf, golden_data[i].expected);
 
+               fail_unless((size_t)check <= sizeof(buf) - 2,
+                               "sdb_data_format(type=%s) wrote %d bytes; "
+                               "expected <= %zu based on sdb_data_strlen()",
+                               SDB_TYPE_TO_STRING(datum->type), check, sizeof(buf) - 2);
+
                fail_unless(buf[sizeof(buf) - 2] == '\0',
                                "sdb_data_format(type=%s) did not nul-terminate the buffer",
                                SDB_TYPE_TO_STRING(datum->type));