From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>,
Josh Steadmon <steadmon@google.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 0/7] add and use for_test to simplify tests
Date: Wed, 24 Jul 2024 16:42:42 +0200 [thread overview]
Message-ID: <73465c3d-1be0-456b-9471-f875e819c566@web.de> (raw)
In-Reply-To: <85b6b8a9-ee5f-42ab-bcbc-49976b30ef33@web.de>
Changes since v2:
- use nested here-docs in t0080 to reduce quoting and while keeping it
self-contained,
- include spin-off patch 4e1041dc39 (unit-tests: show location of checks
outside of tests) from seen, but with a test,
- document incompatibility of for_test and break,
- add blank line between variable declarations and rest of strbuf test
code to match the original style.
t0080: use here-doc test body
unit-tests: show location of checks outside of tests
unit-tests: add for_test
t-ctype: use for_test
t-reftable-basics: use for_test
t-strvec: use for_test
t-strbuf: use for_test
.clang-format | 2 +
t/helper/test-example-tap.c | 35 +++
t/t0080-unit-test-output.sh | 60 ++++--
t/unit-tests/t-ctype.c | 4 +-
t/unit-tests/t-reftable-basics.c | 228 +++++++++-----------
t/unit-tests/t-strbuf.c | 127 +++++------
t/unit-tests/t-strvec.c | 356 ++++++++++++++-----------------
t/unit-tests/test-lib.c | 7 +-
t/unit-tests/test-lib.h | 20 ++
9 files changed, 438 insertions(+), 401 deletions(-)
Range-Diff gegen v2:
1: 5faabaea54 < -: ---------- t0080: move expected output to a file
-: ---------- > 1: 9b919853df t0080: use here-doc test body
-: ---------- > 2: 9cea2b43b9 unit-tests: show location of checks outside of tests
2: d4f9fa0938 ! 3: 5ea7472d8a unit-tests: add for_test
@@ t/helper/test-example-tap.c: int cmd__example_tap(int argc, const char **argv)
return test_done();
}
- ## t/t0080/expect ##
-@@ t/t0080/expect: not ok 17 - messages from failing string and char comparison
- # BUG: test has no checks at t/helper/test-example-tap.c:92
- not ok 18 - test with no checks
- ok 19 - test with no checks returns 0
--1..19
-+ok 20 - for_test passing test
-+# check "1 == 2" failed at t/helper/test-example-tap.c:98
-+# left: 1
-+# right: 2
-+not ok 21 - for_test failing test
-+not ok 22 - for_test passing TEST_TODO() # TODO
-+# todo check 'check(1)' succeeded at t/helper/test-example-tap.c:102
-+not ok 23 - for_test failing TEST_TODO()
-+# check "0" failed at t/helper/test-example-tap.c:104
-+# skipping test - missing prerequisite
-+# skipping check '1' at t/helper/test-example-tap.c:106
-+ok 24 - for_test test_skip() # SKIP
-+# skipping test - missing prerequisite
-+ok 25 - for_test test_skip() inside TEST_TODO() # SKIP
-+# check "0" failed at t/helper/test-example-tap.c:111
-+not ok 26 - for_test TEST_TODO() after failing check
-+# check "0" failed at t/helper/test-example-tap.c:117
-+not ok 27 - for_test failing check after TEST_TODO()
-+# check "!strcmp("\thello\\", "there\"\n")" failed at t/helper/test-example-tap.c:120
-+# left: "\011hello\\"
-+# right: "there\"\012"
-+# check "!strcmp("NULL", NULL)" failed at t/helper/test-example-tap.c:121
-+# left: "NULL"
-+# right: NULL
-+# check "'a' == '\n'" failed at t/helper/test-example-tap.c:122
-+# left: 'a'
-+# right: '\012'
-+# check "'\\' == '\''" failed at t/helper/test-example-tap.c:123
-+# left: '\\'
-+# right: '\''
-+not ok 28 - for_test messages from failing string and char comparison
-+# BUG: test has no checks at t/helper/test-example-tap.c:125
-+not ok 29 - for_test test with no checks
-+1..29
+ ## t/t0080-unit-test-output.sh ##
+@@ t/t0080-unit-test-output.sh: test_expect_success 'TAP output from unit tests' - <<\EOT
+ # BUG: test has no checks at t/helper/test-example-tap.c:94
+ not ok 18 - test with no checks
+ ok 19 - test with no checks returns 0
+- 1..19
++ ok 20 - for_test passing test
++ # check "1 == 2" failed at t/helper/test-example-tap.c:100
++ # left: 1
++ # right: 2
++ not ok 21 - for_test failing test
++ not ok 22 - for_test passing TEST_TODO() # TODO
++ # todo check 'check(1)' succeeded at t/helper/test-example-tap.c:104
++ not ok 23 - for_test failing TEST_TODO()
++ # check "0" failed at t/helper/test-example-tap.c:106
++ # skipping test - missing prerequisite
++ # skipping check '1' at t/helper/test-example-tap.c:108
++ ok 24 - for_test test_skip() # SKIP
++ # skipping test - missing prerequisite
++ ok 25 - for_test test_skip() inside TEST_TODO() # SKIP
++ # check "0" failed at t/helper/test-example-tap.c:113
++ not ok 26 - for_test TEST_TODO() after failing check
++ # check "0" failed at t/helper/test-example-tap.c:119
++ not ok 27 - for_test failing check after TEST_TODO()
++ # check "!strcmp("\thello\\\\", "there\"\n")" failed at t/helper/test-example-tap.c:122
++ # left: "\011hello\\\\"
++ # right: "there\"\012"
++ # check "!strcmp("NULL", NULL)" failed at t/helper/test-example-tap.c:123
++ # left: "NULL"
++ # right: NULL
++ # check "'a' == '\n'" failed at t/helper/test-example-tap.c:124
++ # left: 'a'
++ # right: '\012'
++ # check "'\\\\' == '\\''" failed at t/helper/test-example-tap.c:125
++ # left: '\\\\'
++ # right: '\\''
++ not ok 28 - for_test messages from failing string and char comparison
++ # BUG: test has no checks at t/helper/test-example-tap.c:127
++ not ok 29 - for_test test with no checks
++ 1..29
+ EOF
+
+ ! test-tool example-tap >actual &&
## t/unit-tests/test-lib.h ##
@@
@@ t/unit-tests/test-lib.h
+ * Run a test unless test_skip_all() has been called. Acts like a for
+ * loop that runs at most once, with the test description between the
+ * parentheses and the test body as a statement or block after them.
-+ * The description for each test should be unique. E.g.:
++ * Supports continue to end the test early, but not break. The
++ * description for each test should be unique. E.g.:
+ *
+ * for_test ("something else %d %d", arg1, arg2) {
+ * prepare();
3: a7cd5a2a3a = 4: cf2fa74e9c t-ctype: use for_test
4: cc07910f88 = 5: f2e6271124 t-reftable-basics: use for_test
5: 11c1675a13 = 6: c87a17189c t-strvec: use for_test
6: cd79132f95 ! 7: beaf8194fd t-strbuf: use for_test
@@ t/unit-tests/t-strbuf.c: static void t_addstr(struct strbuf *buf, const void *da
+
+ for_test ("strbuf_addch adds char") {
+ struct strbuf sb = STRBUF_INIT;
++
+ t_addch(&sb, 'a');
+ t_release(&sb);
+ }
+
+ for_test ("strbuf_addch adds NUL char") {
+ struct strbuf sb = STRBUF_INIT;
++
+ t_addch(&sb, '\0');
+ t_release(&sb);
+ }
+
+ for_test ("strbuf_addch appends to initial value") {
+ struct strbuf sb = STRBUF_INIT;
++
+ t_addstr(&sb, "initial value");
+ t_addch(&sb, 'a');
+ t_release(&sb);
@@ t/unit-tests/t-strbuf.c: static void t_addstr(struct strbuf *buf, const void *da
+
+ for_test ("strbuf_addstr adds string") {
+ struct strbuf sb = STRBUF_INIT;
++
+ t_addstr(&sb, "hello there");
+ t_release(&sb);
+ }
+
+ for_test ("strbuf_addstr appends string to initial value") {
+ struct strbuf sb = STRBUF_INIT;
++
+ t_addstr(&sb, "initial value");
+ t_addstr(&sb, "hello there");
+ t_release(&sb);
7: 83dafb009d < -: ---------- unit-tests: show location of checks outside of tests
--
2.45.2
next prev parent reply other threads:[~2024-07-24 14:42 UTC|newest]
Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-29 15:33 [PATCH 0/6] unit-tests: add and use TEST_RUN to simplify tests René Scharfe
2024-06-29 15:35 ` [PATCH 1/6] t0080: move expected output to a file René Scharfe
2024-07-01 3:20 ` Jeff King
2024-07-01 19:17 ` Junio C Hamano
2024-07-01 22:10 ` Jeff King
2024-07-01 23:38 ` Junio C Hamano
2024-07-02 0:57 ` Jeff King
2024-07-01 19:51 ` René Scharfe
2024-07-01 22:18 ` Jeff King
2024-06-29 15:43 ` [PATCH 2/6] unit-tests: add TEST_RUN René Scharfe
2024-07-02 15:13 ` phillip.wood123
2024-07-02 15:51 ` Junio C Hamano
2024-07-02 20:55 ` René Scharfe
2024-07-02 20:55 ` René Scharfe
2024-07-05 9:42 ` phillip.wood123
2024-07-05 18:01 ` René Scharfe
2024-07-07 7:20 ` René Scharfe
2024-07-08 15:18 ` phillip.wood123
2024-07-08 15:39 ` Junio C Hamano
2024-07-11 15:34 ` Junio C Hamano
2024-07-13 13:27 ` Phillip Wood
2024-07-13 15:48 ` Junio C Hamano
2024-07-08 15:12 ` phillip.wood123
2024-06-29 15:44 ` [PATCH 3/6] t-ctype: use TEST_RUN René Scharfe
2024-07-01 19:49 ` Josh Steadmon
2024-07-01 20:04 ` René Scharfe
2024-07-02 15:14 ` phillip.wood123
2024-07-02 20:55 ` René Scharfe
2024-06-29 15:45 ` [PATCH 4/6] t-reftable-basics: " René Scharfe
2024-06-29 15:46 ` [PATCH 5/6] t-strvec: " René Scharfe
2024-07-02 15:14 ` phillip.wood123
2024-07-02 20:55 ` René Scharfe
2024-06-29 15:47 ` [PATCH 6/6] t-strbuf: " René Scharfe
2024-07-01 19:58 ` Josh Steadmon
2024-07-01 20:18 ` René Scharfe
2024-07-02 15:14 ` phillip.wood123
2024-07-02 20:55 ` René Scharfe
2024-07-04 13:09 ` phillip.wood123
2024-07-10 13:55 ` Phillip Wood
2024-07-14 11:44 ` René Scharfe
2024-07-15 14:46 ` Ghanshyam Thakkar
2024-07-02 17:29 ` Ghanshyam Thakkar
2024-07-02 20:55 ` René Scharfe
2024-07-03 3:42 ` Ghanshyam Thakkar
2024-07-08 18:11 ` Josh Steadmon
2024-07-08 21:59 ` Ghanshyam Thakkar
2024-07-01 19:59 ` [PATCH 0/6] unit-tests: add and use TEST_RUN to simplify tests Josh Steadmon
2024-07-10 22:13 ` Junio C Hamano
2024-07-11 10:05 ` Phillip Wood
2024-07-11 15:12 ` Junio C Hamano
2024-07-14 10:35 ` René Scharfe
2024-07-21 6:12 ` [PATCH v2 0/6] unit-tests: add and use for_test " René Scharfe
2024-07-21 6:15 ` [PATCH v2 1/6] t0080: move expected output to a file René Scharfe
2024-07-23 20:54 ` Jeff King
2024-07-21 6:21 ` [PATCH v2 2/6] unit-tests: add for_test René Scharfe
2024-07-22 19:13 ` Kyle Lippincott
2024-07-22 19:36 ` Junio C Hamano
2024-07-22 20:31 ` René Scharfe
2024-07-22 20:41 ` Junio C Hamano
2024-07-22 22:47 ` Kyle Lippincott
2024-07-23 12:37 ` René Scharfe
2024-07-23 6:02 ` [PATCH v2] unit-tests: show location of checks outside of tests René Scharfe
2024-07-23 13:25 ` Phillip Wood
2024-07-22 22:41 ` [PATCH v2 2/6] unit-tests: add for_test Kyle Lippincott
2024-07-23 7:18 ` René Scharfe
2024-07-23 6:36 ` Patrick Steinhardt
2024-07-23 9:25 ` René Scharfe
2024-07-23 9:53 ` Patrick Steinhardt
2024-07-23 12:37 ` René Scharfe
2024-07-23 13:00 ` Patrick Steinhardt
2024-07-23 13:23 ` Phillip Wood
2024-07-23 13:58 ` René Scharfe
2024-07-23 13:24 ` Phillip Wood
2024-07-25 9:45 ` Phillip Wood
2024-07-30 14:00 ` René Scharfe
2024-07-21 6:22 ` [PATCH v2 3/6] t-ctype: use for_test René Scharfe
2024-07-21 6:23 ` [PATCH v2 4/6] t-reftable-basics: " René Scharfe
2024-07-21 6:24 ` [PATCH v2 5/6] t-strvec: " René Scharfe
2024-07-21 6:26 ` [PATCH v2 6/6] t-strbuf: " René Scharfe
2024-07-23 13:23 ` Phillip Wood
2024-07-24 14:42 ` René Scharfe [this message]
2024-07-24 14:48 ` [PATCH v3 1/7] t0080: use here-doc test body René Scharfe
2024-07-24 14:50 ` [PATCH v3 2/7] unit-tests: show location of checks outside of tests René Scharfe
2024-07-24 14:51 ` [PATCH v3 3/7] unit-tests: add for_test René Scharfe
2024-07-24 19:24 ` Kyle Lippincott
2024-07-25 9:45 ` Phillip Wood
2024-07-25 16:02 ` Junio C Hamano
2024-07-25 21:31 ` Kyle Lippincott
2024-07-26 2:41 ` Junio C Hamano
2024-07-26 12:56 ` Patrick Steinhardt
2024-07-26 15:59 ` Junio C Hamano
2024-07-29 9:48 ` Patrick Steinhardt
2024-07-29 18:55 ` Junio C Hamano
2024-07-30 4:49 ` Patrick Steinhardt
2024-07-30 14:00 ` René Scharfe
2024-07-31 5:19 ` Patrick Steinhardt
2024-07-31 16:48 ` René Scharfe
2024-08-01 6:51 ` Patrick Steinhardt
2024-07-24 14:52 ` [PATCH v3 4/7] t-ctype: use for_test René Scharfe
2024-07-24 14:54 ` [PATCH v3 5/7] t-reftable-basics: " René Scharfe
2024-07-24 14:54 ` [PATCH v3 6/7] t-strvec: " René Scharfe
2024-07-24 14:55 ` [PATCH v3 7/7] t-strbuf: " René Scharfe
2024-07-30 14:03 ` [PATCH v4 0/6] add and use if_test to simplify tests René Scharfe
2024-07-30 14:05 ` [PATCH v4 1/6] t0080: use here-doc test body René Scharfe
2024-07-31 20:52 ` Kyle Lippincott
2024-07-30 14:07 ` [PATCH v4 2/6] unit-tests: show location of checks outside of tests René Scharfe
2024-07-31 21:03 ` Kyle Lippincott
2024-08-01 7:23 ` René Scharfe
2024-07-30 14:08 ` [PATCH v4 3/6] unit-tests: add if_test René Scharfe
2024-07-31 22:04 ` Kyle Lippincott
2024-08-01 7:32 ` René Scharfe
2024-08-02 0:48 ` Kyle Lippincott
2024-07-30 14:10 ` [PATCH v4 4/6] t-ctype: use if_test René Scharfe
2024-07-30 14:10 ` [PATCH v4 5/6] t-reftable-basics: " René Scharfe
2024-07-30 14:12 ` [PATCH v4 6/6] t-strvec: " René Scharfe
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=73465c3d-1be0-456b-9471-f875e819c566@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=steadmon@google.com \
/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.
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 NNTP newsgroup(s).