Changes in v5:
- addressd Patrick's feedback about formatting
- changed macros to be in do while loop instead of simple block,
according to Patrick's feedback
Ghanshyam Thakkar (2):
strbuf: introduce strbuf_addstrings() to repeatedly add a string
t/: migrate helper/test-{sha1, sha256} to unit-tests/t-hash
Makefile | 1 +
builtin/submodule--helper.c | 4 +-
json-writer.c | 5 +--
strbuf.c | 9 ++++
strbuf.h | 5 +++
t/t0015-hash.sh | 56 ------------------------
t/unit-tests/t-hash.c | 86 +++++++++++++++++++++++++++++++++++++
7 files changed, 103 insertions(+), 63 deletions(-)
delete mode 100755 t/t0015-hash.sh
create mode 100644 t/unit-tests/t-hash.c
Range-diff against v4:
1: cd831fabf5 = 1: cd831fabf5 strbuf: introduce strbuf_addstrings() to repeatedly add a string
2: 6ce8f57af1 ! 2: c82ead8e48 t/: migrate helper/test-{sha1, sha256} to unit-tests/t-hash
@@ t/unit-tests/t-hash.c (new)
+ return;
+ }
+
-+ for (int i = 1; i < ARRAY_SIZE(hash_algos); i++) {
++ for (size_t i = 1; i < ARRAY_SIZE(hash_algos); i++) {
+ git_hash_ctx ctx;
+ unsigned char hash[GIT_MAX_HEXSZ];
+ const struct git_hash_algo *algop = &hash_algos[i];
@@ t/unit-tests/t-hash.c (new)
+
+/* Works with a NUL terminated string. Doesn't work if it should contain a NUL character. */
+#define TEST_HASH_STR(data, expected_sha1, expected_sha256) \
-+ { \
++ do { \
+ const char *expected_hashes[] = { expected_sha1, expected_sha256 }; \
+ TEST(check_hash_data(data, strlen(data), expected_hashes), \
+ "SHA1 and SHA256 (%s) works", #data); \
-+ }
++ } while (0)
+
+/* Only works with a literal string, useful when it contains a NUL character. */
+#define TEST_HASH_LITERAL(literal, expected_sha1, expected_sha256) \
-+ { \
++ do { \
+ const char *expected_hashes[] = { expected_sha1, expected_sha256 }; \
+ TEST(check_hash_data(literal, (sizeof(literal) - 1), expected_hashes), \
+ "SHA1 and SHA256 (%s) works", #literal); \
-+ }
++ } while (0)
+
+int cmd_main(int argc, const char **argv)
+{
@@ t/unit-tests/t-hash.c (new)
+ strbuf_addstrings(&aaaaaaaaaa_100000, "aaaaaaaaaa", 100000);
+ strbuf_addstrings(&alphabet_100000, "abcdefghijklmnopqrstuvwxyz", 100000);
+
-+ TEST_HASH_STR(
-+ "", "da39a3ee5e6b4b0d3255bfef95601890afd80709",
++ TEST_HASH_STR("",
++ "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+ "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
-+ TEST_HASH_STR(
-+ "a", "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8",
++ TEST_HASH_STR("a",
++ "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8",
+ "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb");
-+ TEST_HASH_STR(
-+ "abc", "a9993e364706816aba3e25717850c26c9cd0d89d",
++ TEST_HASH_STR("abc",
++ "a9993e364706816aba3e25717850c26c9cd0d89d",
+ "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad");
-+ TEST_HASH_STR(
-+ "message digest", "c12252ceda8be8994d5fa0290a47231c1d16aae3",
++ TEST_HASH_STR("message digest",
++ "c12252ceda8be8994d5fa0290a47231c1d16aae3",
+ "f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650");
-+ TEST_HASH_STR(
-+ "abcdefghijklmnopqrstuvwxyz", "32d10c7b8cf96570ca04ce37f2a19d84240d3a89",
++ TEST_HASH_STR("abcdefghijklmnopqrstuvwxyz",
++ "32d10c7b8cf96570ca04ce37f2a19d84240d3a89",
+ "71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73");
-+ TEST_HASH_STR(
-+ aaaaaaaaaa_100000.buf, "34aa973cd4c4daa4f61eeb2bdbad27316534016f",
++ TEST_HASH_STR(aaaaaaaaaa_100000.buf,
++ "34aa973cd4c4daa4f61eeb2bdbad27316534016f",
+ "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0");
-+ TEST_HASH_STR(
-+ alphabet_100000.buf, "e7da7c55b3484fdf52aebec9cbe7b85a98f02fd4",
++ TEST_HASH_STR(alphabet_100000.buf,
++ "e7da7c55b3484fdf52aebec9cbe7b85a98f02fd4",
+ "e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35");
-+ TEST_HASH_LITERAL(
-+ "blob 0\0", "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
++ TEST_HASH_LITERAL("blob 0\0",
++ "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+ "473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813");
-+ TEST_HASH_LITERAL(
-+ "blob 3\0abc", "f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f",
++ TEST_HASH_LITERAL("blob 3\0abc",
++ "f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f",
+ "c1cf6e465077930e88dc5136641d402f72a229ddd996f627d60e9639eaba35a6");
-+ TEST_HASH_LITERAL(
-+ "tree 0\0", "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
++ TEST_HASH_LITERAL("tree 0\0",
++ "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
+ "6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321");
+
+ strbuf_release(&aaaaaaaaaa_100000);
--
2.45.1
