index 2b32d8b91a169290d0b6a3a2806d99fe72ad2de4..cd76dff1c458f53994c7cff1383a9c14c5dd8115 100644 (file)
--- a/t/unit/core/data_test.c
+++ b/t/unit/core/data_test.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "core/data.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
#include <assert.h>
#include <check.h>
sdb_data_t datum;
const char *expected;
} golden_data[] = {
+ {
+ { SDB_TYPE_NULL, { .integer = 0 } },
+ "NULL",
+ },
{
{ SDB_TYPE_INTEGER, { .integer = 4711 } },
"4711",
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
sdb_data_t *datum = &golden_data[i].datum;
char buf[sdb_data_strlen(datum) + 2];
- int check;
+ size_t check_null, check;
memset(buf, (int)'A', sizeof(buf));
+ check_null = sdb_data_format(datum, NULL, 0, SDB_DOUBLE_QUOTED);
check = sdb_data_format(datum, buf, sizeof(buf) - 1,
SDB_DOUBLE_QUOTED);
fail_unless(check > 0,
"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,
+ fail_unless(check_null == check,
+ "sdb_data_format(type=%s, NULL) = %d; "
+ "expected %d (matching sdb_data_format(type=%s, <buf>))",
+ SDB_TYPE_TO_STRING(datum->type), check_null,
+ check, SDB_TYPE_TO_STRING(datum->type));
+ fail_unless(check == strlen(golden_data[i].expected),
+ "sdb_data_format(type=%s) = %d; expected %zu (strlen)",
+ SDB_TYPE_TO_STRING(datum->type), check,
+ strlen(golden_data[i].expected));
+
+ fail_unless(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);
golden_data[i].input, type);
if (type == SDB_TYPE_STRING)
- fail_unless(golden_data[i].input == result.data.string,
- "sdb_data_parse(%s, %d, <d>) modified input string",
+ fail_unless(golden_data[i].input != result.data.string,
+ "sdb_data_parse(%s, %d, <d>) copied input string",
golden_data[i].input, type);
if (type == SDB_TYPE_BINARY)
- fail_unless(golden_data[i].input == (char *)result.data.binary.datum,
- "sdb_data_parse(%s, %d, <d>) modified input string",
+ fail_unless(golden_data[i].input != (char *)result.data.binary.datum,
+ "sdb_data_parse(%s, %d, <d>) copied input string",
golden_data[i].input, type);
- if (type == SDB_TYPE_REGEX) {
+ if (type == SDB_TYPE_REGEX)
fail_unless(golden_data[i].input != result.data.re.raw,
"sdb_data_parse(%s, %d, <d>) copied input string",
golden_data[i].input, type);
- sdb_data_free_datum(&result);
- }
+ sdb_data_free_datum(&result);
}
}
END_TEST
-Suite *
-core_data_suite(void)
+TEST_MAIN("core::data")
{
- Suite *s = suite_create("core::data");
- TCase *tc;
-
- tc = tcase_create("core");
+ TCase *tc = tcase_create("core");
tcase_add_test(tc, test_data);
tcase_add_test(tc, test_cmp);
tcase_add_test(tc, test_strcmp);
tcase_add_test(tc, test_expr_eval);
tcase_add_test(tc, test_format);
tcase_add_test(tc, test_parse);
- suite_add_tcase(s, tc);
-
- return s;
-} /* core_data_suite */
+ ADD_TCASE(tc);
+}
+TEST_MAIN_END
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */