From: William Duclot <william.duclot@ensimag.grenoble-inp.fr>
To: git@vger.kernel.org
Cc: antoine.queru@ensimag.grenoble-inp.fr,
francois.beutin@ensimag.grenoble-inp.fr, mhagger@alum.mit.edu,
Johannes.Schindelin@gmx.de, peff@peff.net, mh@glandium.org,
gitster@pobox.com,
Simon Rabourg <simon.rabourg@ensimag.grenoble-inp.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: [PATCH V2 1/3] strbuf: add tests
Date: Mon, 6 Jun 2016 17:13:38 +0200 [thread overview]
Message-ID: <20160606151340.22424-2-william.duclot@ensimag.grenoble-inp.fr> (raw)
In-Reply-To: <20160606151340.22424-1-william.duclot@ensimag.grenoble-inp.fr>
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@ensimag.grenoble-inp.fr>
Signed-off-by: Simon Rabourg <simon.rabourg@ensimag.grenoble-inp.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
---
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
next prev parent reply other threads:[~2016-06-06 15:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 15:13 [PATCH V2 0/3] strbuf: improve API William Duclot
2016-06-06 15:13 ` William Duclot [this message]
2016-06-06 16:11 ` [PATCH V2 1/3] strbuf: add tests Matthieu Moy
2016-06-07 8:44 ` Johannes Schindelin
2016-06-06 15:13 ` [PATCH V2 2/3] pretty.c: rename strbuf_wrap() function William Duclot
2016-06-06 16:12 ` Matthieu Moy
2016-06-07 9:04 ` Johannes Schindelin
2016-06-06 15:13 ` [PATCH V2 3/3] strbuf: allow to use preallocated memory William Duclot
2016-06-06 16:17 ` Matthieu Moy
2016-06-06 17:19 ` Junio C Hamano
2016-06-06 20:39 ` William Duclot
2016-06-06 22:44 ` Junio C Hamano
2016-06-06 22:58 ` Jeff King
2016-06-06 23:24 ` Junio C Hamano
2016-06-06 23:25 ` Junio C Hamano
2016-06-06 23:30 ` Jeff King
2016-06-07 9:06 ` William Duclot
2016-06-07 18:10 ` Junio C Hamano
2016-06-08 16:20 ` Michael Haggerty
2016-06-08 18:07 ` Junio C Hamano
2016-06-08 19:19 ` Jeff King
2016-06-08 19:42 ` [PATCH] send-pack: use buffered I/O to talk to pack-objects Jeff King
2016-06-09 12:10 ` Matthieu Moy
2016-06-09 14:34 ` Ramsay Jones
2016-06-09 17:12 ` Jeff King
2016-06-09 22:40 ` Ramsay Jones
2016-06-09 16:40 ` Junio C Hamano
2016-06-09 17:14 ` Jeff King
2016-06-09 17:22 ` Matthieu Moy
2016-06-08 19:48 ` [PATCH V2 3/3] strbuf: allow to use preallocated memory Junio C Hamano
2016-06-08 19:52 ` Jeff King
2016-06-08 23:05 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160606151340.22424-2-william.duclot@ensimag.grenoble-inp.fr \
--to=william.duclot@ensimag.grenoble-inp.fr \
--cc=Johannes.Schindelin@gmx.de \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=antoine.queru@ensimag.grenoble-inp.fr \
--cc=francois.beutin@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mh@glandium.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=simon.rabourg@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).