![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 34edbe21a0f95fc0d99caa3767fbf544f6e5e65a..c15c1e9cb21a9b6821d8bfe8b57ed490ea320483 100644 (file)
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "utils/strbuf.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
#include <check.h>
sdb_strbuf_t *b = NULL;
va_list ap;
+ size_t check;
+
/* check that methods don't crash */
sdb_strbuf_destroy(b);
sdb_strbuf_skip(b, 0, 0);
"sdb_strbuf_read(NULL) didn't report failure");
fail_unless(sdb_strbuf_chomp(b) < 0,
"sdb_strbuf_chomp(NULL) didn't report failure");
+
+ /* check that methods return no used space */
+ check = sdb_strbuf_len(b);
+ fail_unless(check == 0,
+ "sdb_strbuf_len(NULL) = %zi; expected: 0", check);
+ check = sdb_strbuf_cap(b);
+ fail_unless(check == 0,
+ "sdb_strbuf_cap(NULL) = %zi; expected: 0", check);
}
END_TEST
{
sdb_strbuf_t *b = sdb_strbuf_create(0);
const char *data;
- size_t len;
+ size_t check;
/* check that methods don't crash */
sdb_strbuf_skip(b, 1, 1);
data = sdb_strbuf_string(b);
fail_unless(data && (*data == '\0'),
"sdb_strbuf_string(<empty>) = '%s'; expected: ''", data);
- len = sdb_strbuf_len(b);
- fail_unless(len == 0,
- "sdb_strbuf_len(<empty>) = %zu; expected: 0", len);
+ check = sdb_strbuf_len(b);
+ fail_unless(check == 0,
+ "sdb_strbuf_len(<empty>) = %zu; expected: 0", check);
+ check = sdb_strbuf_cap(b);
+ fail_unless(check == 0,
+ "sdb_strbuf_cap(<empty>) = %zu; expected: 0", check);
sdb_strbuf_destroy(b);
}
START_TEST(test_create)
{
sdb_strbuf_t *s;
- size_t len;
+ size_t check;
s = sdb_strbuf_create(0);
fail_unless(s != NULL,
"sdb_strbuf_create() = NULL; expected strbuf object");
- len = sdb_strbuf_len(s);
- fail_unless(len == 0,
+ check = sdb_strbuf_len(s);
+ fail_unless(check == 0,
"sdb_strbuf_create() created buffer with len = %zu; "
- "expected: 0", len);
+ "expected: 0", check);
+ check = sdb_strbuf_cap(s);
+ fail_unless(check == 0,
+ "sdb_strbuf_create() created buffer with cap = %zu; "
+ "expected: 0", check);
sdb_strbuf_destroy(s);
s = sdb_strbuf_create(128);
fail_unless(s != NULL,
"sdb_strbuf_create() = NULL; expected strbuf object");
- len = sdb_strbuf_len(s);
+ check = sdb_strbuf_len(s);
/* len still has to be 0 -- there's no content */
- fail_unless(len == 0,
+ fail_unless(check == 0,
"sdb_strbuf_create() created buffer with len = %zu; "
- "expected: 0", len);
+ "expected: 0", check);
+ check = sdb_strbuf_cap(s);
+ fail_unless(check == 128,
+ "sdb_strbuf_create() created buffer with cap = %zu; "
+ "expected: 128", check);
sdb_strbuf_destroy(s);
}
END_TEST
size_t i;
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- n = sdb_strbuf_append(buf, golden_data[i].input);
+ n = sdb_strbuf_append(buf, "%s", golden_data[i].input);
fail_unless((size_t)n == strlen(golden_data[i].input),
"sdb_strbuf_append() appended %zi bytes; expected: %zu",
n, strlen(golden_data[i].input));
test, golden_data[i].result);
}
- n = sdb_strbuf_append(buf, "%zu; %5.4f", 42, 4.2);
+ n = sdb_strbuf_append(buf, "%zu; %5.4f", (size_t)42, 4.2);
fail_unless(n == 10,
"sdb_strbuf_append() appended %zi bytes; expected: 10", n);
total += n;
START_TEST(test_sprintf)
{
ssize_t n;
- size_t len;
+ size_t check;
const char *test;
const char *golden_data[] = {
"ABCDE",
"",
"-",
+ "123456789012345678901234567890",
+ "--",
};
size_t i;
+ sdb_strbuf_destroy(buf);
+ buf = sdb_strbuf_create(1); /* -> min_size = 1 */
+
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
- n = sdb_strbuf_sprintf(buf, golden_data[i]);
+ n = sdb_strbuf_sprintf(buf, "%s", golden_data[i]);
fail_unless((size_t)n == strlen(golden_data[i]),
"sdb_strbuf_sprintf() wrote %zi bytes; expected: %zu",
n, strlen(golden_data[i]));
- len = sdb_strbuf_len(buf);
- fail_unless(len == (size_t)n,
+ check = sdb_strbuf_len(buf);
+ fail_unless(check == (size_t)n,
"sdb_strbuf_sprintf() left behind buffer with len = %zu; "
- "expected: %zi", len, n);
+ "expected: %zi", check, n);
test = sdb_strbuf_string(buf);
- fail_unless(test[len] == '\0',
+ fail_unless(test[check] == '\0',
"sdb_strbuf_sprintf() did not nil-terminate the string");
fail_unless(!strcmp(test, golden_data[i]),
"sdb_strbuf_sprintf() did not format string correctly; "
"got: %s; expected: %s", test, golden_data[i]);
+
+ check = sdb_strbuf_cap(buf);
+ /* 3 times the current len is the threshold for shrinking,
+ * but it's capped to the initial size (or 64) */
+ if (n)
+ fail_unless(((size_t)n < check) && (check < (size_t)n * 3),
+ "sdb_strbuf_sprintf() did not resize the buffer "
+ "correctly (got size %zu; expected %zi < <size> < %d)",
+ check, n, n / 3);
}
- n = sdb_strbuf_sprintf(buf, "%zu; %5.4f", 42, 4.2);
+ n = sdb_strbuf_sprintf(buf, "%zu; %5.4f", (size_t)42, 4.2);
fail_unless(n == 10,
"sdb_strbuf_sprintf() wrote %zi bytes; expected: 10", n);
- len = sdb_strbuf_len(buf);
- fail_unless(len == 10,
+ check = sdb_strbuf_len(buf);
+ fail_unless(check == 10,
"sdb_strbuf_sprintf() left behind buffer with len = %zu; "
- "expected: 10", len);
+ "expected: 10", check);
test = sdb_strbuf_string(buf);
- fail_unless(test[len] == '\0',
+ fail_unless(test[check] == '\0',
"sdb_strbuf_sprintf() did not nil-terminate the string");
fail_unless(!strcmp(test, "42; 4.2000"),
"sdb_strbuf_sprintf() did not format string correctly; "
const char *data;
ssize_t n;
- size_t i;
+ size_t i, check;
sdb_strbuf_destroy(buf);
buf = sdb_strbuf_create(1024);
fail_unless(n == 1, "sdb_strbuf_append() = %zi; expected: 1", n);
}
+ check = sdb_strbuf_cap(buf);
+ fail_unless(check == 1024,
+ "sdb_strbuf_append() resizes the buffer too early "
+ "(got size %zu; expected: 1024)", check);
+
/* write another byte; this has to trigger a resize */
n = sdb_strbuf_append(buf, ".");
fail_unless(n == 1, "sdb_strbuf_append() = %zi; expected: 1", n);
+ check = sdb_strbuf_cap(buf);
+ /* the exact size doesn't matter but is an implementation detail */
+ fail_unless(check > 1024,
+ "sdb_strbuf_append() did not resize the buffer");
+
/* write more bytes; this should trigger at least one more resize but
- * that's an implementation detail */
+ * that's an implementation detail as well */
for (i = 0; i < 1024; ++i) {
n = sdb_strbuf_append(buf, ".");
fail_unless(n == 1, "sdb_strbuf_append() = %zi; expected: 1", n);
fail_unless(!memcmp(check, mem_golden_data[i].input,
mem_golden_data[i].size),
"sdb_strbuf_memcpy() did not set the buffer correctly");
+
+ n = (ssize_t)sdb_strbuf_cap(buf);
+ fail_unless((size_t)n > mem_golden_data[i].size,
+ "sdb_strbuf_memcpy() did not resize the buffer correctly "
+ "(got size %zi; expected: > %zu)", n,
+ mem_golden_data[i].size);
}
}
END_TEST
fail_unless(check[total] == '\0',
"sdb_strbuf_memappend() did not nil-terminate the data");
+
+ n = (ssize_t)sdb_strbuf_cap(buf);
+ fail_unless((size_t)n > total,
+ "sdb_strbuf_memappend() did not resize the buffer correctly "
+ "(got size %zi; expected: > %zu)", n, total);
}
}
END_TEST
const char *check;
if (golden_data[i].input)
- sdb_strbuf_sprintf(buf, golden_data[i].input);
+ sdb_strbuf_sprintf(buf, "%s", golden_data[i].input);
/* empty buffer */
n = sdb_strbuf_chomp(buf);
const char *check;
size_t n;
- sdb_strbuf_sprintf(buf, input);
+ sdb_strbuf_sprintf(buf, "%s", input);
sdb_strbuf_skip(buf, golden_data[i].offset,
golden_data[i].n);
const char *check;
if (golden_data[i].input)
- sdb_strbuf_sprintf(buf, golden_data[i].input);
+ sdb_strbuf_sprintf(buf, "%s", golden_data[i].input);
check = sdb_strbuf_string(buf);
fail_unless(!strcmp(check, golden_data[i].expected),
"sdb_strbuf_string() = '%s'; expected: '%s'",
size_t check;
if (golden_data[i].input)
- sdb_strbuf_sprintf(buf, golden_data[i].input);
+ sdb_strbuf_sprintf(buf, "%s", golden_data[i].input);
check = sdb_strbuf_len(buf);
fail_unless(check == golden_data[i].expected,
"sdb_strbuf_len() = %zu; expected: %zu",
}
END_TEST
-Suite *
-util_strbuf_suite(void)
+TEST_MAIN("utils::strbuf")
{
- Suite *s = suite_create("utils::strbuf");
- TCase *tc;
-
- tc = tcase_create("empty");
+ TCase *tc = tcase_create("empty");
tcase_add_test(tc, test_null);
tcase_add_test(tc, test_empty);
- suite_add_tcase(s, tc);
+ ADD_TCASE(tc);
tc = tcase_create("core");
tcase_add_checked_fixture(tc, setup, teardown);
tcase_add_test(tc, test_clear);
tcase_add_test(tc, test_string);
tcase_add_test(tc, test_len);
- suite_add_tcase(s, tc);
-
- return s;
-} /* util_strbuf_suite */
+ ADD_TCASE(tc);
+}
+TEST_MAIN_END
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */