diff options
| author | Nika Layzell <nika@thelayzells.com> | 2018-05-07 11:59:00 -0700 |
|---|---|---|
| committer | Nika Layzell <nika@thelayzells.com> | 2018-06-14 22:43:28 -0700 |
| commit | 56303e1ade453648230115cdaaba8244273f3315 (patch) | |
| tree | 4f099c741f2b0caf8161e4f3cfdcf670db7bfb74 /tests/mailmap | |
| parent | a140c138757e6d4dbcd34a2c68ca34e87cc76238 (diff) | |
| download | libgit2-56303e1ade453648230115cdaaba8244273f3315.tar.gz | |
mailmap: API and style cleanup
Diffstat (limited to 'tests/mailmap')
| -rw-r--r-- | tests/mailmap/basic.c | 5 | ||||
| -rw-r--r-- | tests/mailmap/blame.c | 8 | ||||
| -rw-r--r-- | tests/mailmap/mailmap_testdata.h (renamed from tests/mailmap/mailmap_helpers.h) | 0 | ||||
| -rw-r--r-- | tests/mailmap/parsing.c | 8 |
4 files changed, 7 insertions, 14 deletions
diff --git a/tests/mailmap/basic.c b/tests/mailmap/basic.c index b8a91327e..20fa8be7b 100644 --- a/tests/mailmap/basic.c +++ b/tests/mailmap/basic.c @@ -27,10 +27,7 @@ struct { void test_mailmap_basic__initialize(void) { - git_buf buf = GIT_BUF_INIT; - git_buf_attach_notowned(&buf, TEST_MAILMAP, strlen(TEST_MAILMAP)); - - cl_git_pass(git_mailmap_from_buffer(&mailmap, &buf)); + cl_git_pass(git_mailmap_from_buffer(&mailmap, TEST_MAILMAP, 0)); } void test_mailmap_basic__cleanup(void) diff --git a/tests/mailmap/blame.c b/tests/mailmap/blame.c index 328f4bce1..e6bc1a41f 100644 --- a/tests/mailmap/blame.c +++ b/tests/mailmap/blame.c @@ -2,7 +2,7 @@ #include "git2/repository.h" #include "git2/blame.h" #include "mailmap.h" -#include "mailmap_helpers.h" +#include "mailmap_testdata.h" static git_repository *g_repo; static git_blame *g_blame; @@ -30,8 +30,7 @@ void test_mailmap_blame__hunks(void) opts.flags |= GIT_BLAME_USE_MAILMAP; cl_git_pass(git_blame_file(&g_blame, g_repo, "file.txt", &opts)); - if (!g_blame) - return; + cl_assert(g_blame); for (idx = 0; idx < ARRAY_SIZE(resolved); ++idx) { hunk = git_blame_get_hunk_byline(g_blame, idx + 1); @@ -52,8 +51,7 @@ void test_mailmap_blame__hunks_no_mailmap(void) g_repo = cl_git_sandbox_init("mailmap"); cl_git_pass(git_blame_file(&g_blame, g_repo, "file.txt", &opts)); - if (!g_blame) - return; + cl_assert(g_blame); for (idx = 0; idx < ARRAY_SIZE(resolved); ++idx) { hunk = git_blame_get_hunk_byline(g_blame, idx + 1); diff --git a/tests/mailmap/mailmap_helpers.h b/tests/mailmap/mailmap_testdata.h index 173536dd0..173536dd0 100644 --- a/tests/mailmap/mailmap_helpers.h +++ b/tests/mailmap/mailmap_testdata.h diff --git a/tests/mailmap/parsing.c b/tests/mailmap/parsing.c index 70110c033..2cb830450 100644 --- a/tests/mailmap/parsing.c +++ b/tests/mailmap/parsing.c @@ -1,7 +1,7 @@ #include "clar_libgit2.h" #include "repository.h" #include "git2/sys/repository.h" -#include "mailmap_helpers.h" +#include "mailmap_testdata.h" #include "buf_text.h" static git_repository *g_repo; @@ -67,9 +67,7 @@ static const mailmap_entry resolved_untracked[] = { void test_mailmap_parsing__string(void) { - git_buf buf = GIT_BUF_INIT; - git_buf_attach_notowned(&buf, string_mailmap, strlen(string_mailmap)); - cl_git_pass(git_mailmap_from_buffer(&g_mailmap, &buf)); + cl_git_pass(git_mailmap_from_buffer(&g_mailmap, string_mailmap, 0)); /* We should have parsed all of the entries */ check_mailmap_entries(g_mailmap, entries, ARRAY_SIZE(entries)); @@ -89,7 +87,7 @@ void test_mailmap_parsing__windows_string(void) git_buf_attach_notowned(&unixbuf, string_mailmap, strlen(string_mailmap)); git_buf_text_lf_to_crlf(&winbuf, &unixbuf); - cl_git_pass(git_mailmap_from_buffer(&g_mailmap, &winbuf)); + cl_git_pass(git_mailmap_from_buffer(&g_mailmap, winbuf.ptr, winbuf.size)); git_buf_free(&winbuf); /* We should have parsed all of the entries */ |