Test the strbuf API. Being used throughout all Git the API could be
considered tested, but adding specific tests makes it easier to improve
and extend the API.
Signed-off-by: William Duclot <william.duclot@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Simon Rabourg <simon.rabourg@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx>
---
Changes since V1:
* Use the parser API
* Coding style fix
* New test for string size
Makefile | 1 +
t/helper/test-strbuf.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++
t/t0082-strbuf.sh | 19 ++++++++++
3 files changed, 121 insertions(+)
create mode 100644 t/helper/test-strbuf.c
create mode 100755 t/t0082-strbuf.sh
diff --git a/Makefile b/Makefile
index 3f03366..dc84f43 100644
--- a/Makefile
+++ b/Makefile
@@ -613,6 +613,7 @@ TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
TEST_PROGRAMS_NEED_X += test-sha1
TEST_PROGRAMS_NEED_X += test-sha1-array
TEST_PROGRAMS_NEED_X += test-sigchain
+TEST_PROGRAMS_NEED_X += test-strbuf
TEST_PROGRAMS_NEED_X += test-string-list
TEST_PROGRAMS_NEED_X += test-submodule-config
TEST_PROGRAMS_NEED_X += test-subprocess
diff --git a/t/helper/test-strbuf.c b/t/helper/test-strbuf.c
new file mode 100644
index 0000000..271592e
--- /dev/null
+++ b/t/helper/test-strbuf.c
@@ -0,0 +1,101 @@
+#include "git-compat-util.h"
+#include "strbuf.h"
+#include "parse-options.h"
+#include "builtin.h"
+
+/*
+ * Check behavior on usual use cases
+ */
+static int strbuf_check_behavior(struct strbuf *sb)
+{
+ char *str_test = xstrdup("test"), *res, *old_buf;
+ size_t size, old_alloc;
+
+ strbuf_grow(sb, 1);
+ old_alloc = sb->alloc;
+ strbuf_grow(sb, sb->alloc - sb->len + 1000);
+ if (old_alloc == sb->alloc)
+ die("strbuf_grow does not realloc the buffer as expected");
+ old_buf = sb->buf;
+ res = strbuf_detach(sb, &size);
+ if (res != old_buf)
+ die("strbuf_detach does not return the expected buffer");
+ free(res);
+
+ str_test = xstrdup("test");
+ strbuf_attach(sb, str_test, strlen(str_test), strlen(str_test) + 1);
+ res = strbuf_detach(sb, &size);
+ if (size != strlen(str_test))
+ die ("size is not as expected");
+
+ if (res != str_test)
+ die("strbuf_detach does not return the expected buffer");
+ free(res);
+ strbuf_release(sb);
+
+ return 0;
+}
+
+static int basic_grow(struct strbuf *sb)
+{
+ strbuf_init(sb, 0);
+ strbuf_grow(sb, 0);
+ if (sb->buf == strbuf_slopbuf)
+ die("strbuf_grow failed to alloc memory");
+ strbuf_release(sb);
+ if (sb->buf != strbuf_slopbuf)
+ die("strbuf_release does not reinitialize the strbuf");
+
+ return 0;
+}
+
+static void grow_overflow(struct strbuf *sb)
+{
+ strbuf_init(sb, 1000);
+ strbuf_grow(sb, maximum_unsigned_value_of_type((size_t)1));
+}
+
+int main(int argc, const char *argv[])
+{
+ struct strbuf sb;
+ enum {
+ MODE_UNSPECIFIED = 0,
+ MODE_BASIC_GROW ,
+ MODE_STRBUF_CHECK,
+ MODE_GROW_OVERFLOW
+ } cmdmode = MODE_UNSPECIFIED;
+ struct option options[] = {
+ OPT_CMDMODE(0, "basic_grow", &cmdmode,
+ N_(" basic grow test"),
+ MODE_BASIC_GROW),
+ OPT_CMDMODE(0, "strbuf_check_behavior", &cmdmode,
+ N_("check the strbuf's behavior"),
+ MODE_STRBUF_CHECK),
+ OPT_CMDMODE(0, "grow_overflow", &cmdmode,
+ N_("test grow expecting overflow"),
+ MODE_GROW_OVERFLOW),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, NULL, options, NULL, 0);
+
+ if (cmdmode == MODE_BASIC_GROW) {
+ /*
+ * Check if strbuf_grow(0) allocate a new NUL-terminated buffer
+ */
+ return basic_grow(&sb);
+ } else if (cmdmode == MODE_STRBUF_CHECK) {
+ strbuf_init(&sb, 0);
+ return strbuf_check_behavior(&sb);
+ } else if (cmdmode == MODE_GROW_OVERFLOW) {
+ /*
+ * size_t overflow: should die().
+ * If this does not die(), fall through to returning success.
+ */
+ grow_overflow(&sb);
+ } else {
+ usage("test-strbuf mode");
+ }
+
+ return 0;
+}
diff --git a/t/t0082-strbuf.sh b/t/t0082-strbuf.sh
new file mode 100755
index 0000000..6a579a3
--- /dev/null
+++ b/t/t0082-strbuf.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+test_description='Test the strbuf API.'
+
+. ./test-lib.sh
+
+test_expect_success 'basic test on strbuf_grow()' '
+ test-strbuf --basic_grow
+'
+
+test_expect_success 'check strbuf behavior in usual use cases ' '
+ test-strbuf --strbuf_check_behavior
+'
+
+test_expect_success 'overflow while calling strbuf_grow' '
+ test_must_fail test-strbuf --grow_overflow
+'
+
+test_done
--
2.9.0.rc1.1.geac644e
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html