thodg/libgit2/tests/email/create.c
-
Show log
Commit
-
Hash : f0e693b1
Author :
Date : 2021-09-07T17:53:49
str: introduce `git_str` for internal, `git_buf` is external libgit2 has two distinct requirements that were previously solved by `git_buf`. We require: 1. A general purpose string class that provides a number of utility APIs for manipulating data (eg, concatenating, truncating, etc). 2. A structure that we can use to return strings to callers that they can take ownership of. By using a single class (`git_buf`) for both of these purposes, we have confused the API to the point that refactorings are difficult and reasoning about correctness is also difficult. Move the utility class `git_buf` to be called `git_str`: this represents its general purpose, as an internal string buffer class. The name also is an homage to Junio Hamano ("gitstr"). The public API remains `git_buf`, and has a much smaller footprint. It is generally only used as an "out" param with strict requirements that follow the documentation. (Exceptions exist for some legacy APIs to avoid breaking callers unnecessarily.) Utility functions exist to convert a user-specified `git_buf` to a `git_str` so that we can call internal functions, then converting it back again.
-
tests/email/create.c
-
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364
#include "clar.h" #include "clar_libgit2.h" #include "diff_generate.h" static git_repository *repo; void test_email_create__initialize(void) { repo = cl_git_sandbox_init("diff_format_email"); } void test_email_create__cleanup(void) { cl_git_sandbox_cleanup(); } static void email_for_commit( git_buf *out, const char *commit_id, git_email_create_options *opts) { git_oid oid; git_commit *commit = NULL; git_diff *diff = NULL; git_oid_fromstr(&oid, commit_id); cl_git_pass(git_commit_lookup(&commit, repo, &oid)); cl_git_pass(git_email_create_from_commit(out, commit, opts)); git_diff_free(diff); git_commit_free(commit); } static void assert_email_match( const char *expected, const char *commit_id, git_email_create_options *opts) { git_buf buf = GIT_BUF_INIT; email_for_commit(&buf, commit_id, opts); cl_assert_equal_s(expected, buf.ptr); git_buf_dispose(&buf); } static void assert_subject_match( const char *expected, const char *commit_id, git_email_create_options *opts) { git_buf buf = GIT_BUF_INIT; char *subject, *nl; email_for_commit(&buf, commit_id, opts); cl_assert((subject = strstr(buf.ptr, "\nSubject: ")) != NULL); subject += 10; if ((nl = strchr(subject, '\n')) != NULL) *nl = '\0'; cl_assert_equal_s(expected, subject); git_buf_dispose(&buf); } void test_email_create__commit(void) { const char *expected = "From 9264b96c6d104d0e07ae33d3007b6a48246c6f92 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Wed, 9 Apr 2014 20:57:01 +0200\n" \ "Subject: [PATCH] Modify some content\n" \ "\n" \ "---\n" \ " file1.txt | 8 +++++---\n" \ " 1 file changed, 5 insertions(+), 3 deletions(-)\n" \ "\n" \ "diff --git a/file1.txt b/file1.txt\n" \ "index 94aaae8..af8f41d 100644\n" \ "--- a/file1.txt\n" \ "+++ b/file1.txt\n" \ "@@ -1,15 +1,17 @@\n" \ " file1.txt\n" \ " file1.txt\n" \ "+_file1.txt_\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ "+\n" \ "+\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ " file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "+_file1.txt_\n" \ "+_file1.txt_\n" \ " file1.txt\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; assert_email_match( expected, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", NULL); } void test_email_create__rename(void) { const char *expected = "From 6e05acc5a5dab507d91a0a0cc0fb05a3dd98892d Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Wed, 9 Apr 2014 21:15:56 +0200\n" \ "Subject: [PATCH] Renamed file1.txt -> file1.txt.renamed\n" \ "\n" \ "---\n" \ " file1.txt => file1.txt.renamed | 4 ++--\n" \ " 1 file changed, 2 insertions(+), 2 deletions(-)\n" \ "\n" \ "diff --git a/file1.txt b/file1.txt.renamed\n" \ "similarity index 86%\n" \ "rename from file1.txt\n" \ "rename to file1.txt.renamed\n" \ "index af8f41d..a97157a 100644\n" \ "--- a/file1.txt\n" \ "+++ b/file1.txt.renamed\n" \ "@@ -3,13 +3,13 @@ file1.txt\n" \ " _file1.txt_\n" \ " file1.txt\n" \ " file1.txt\n" \ "-file1.txt\n" \ "+file1.txt_renamed\n" \ " file1.txt\n" \ " \n" \ " \n" \ " file1.txt\n" \ " file1.txt\n" \ "-file1.txt\n" \ "+file1.txt_renamed\n" \ " file1.txt\n" \ " file1.txt\n" \ " _file1.txt_\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; assert_email_match(expected, "6e05acc5a5dab507d91a0a0cc0fb05a3dd98892d", NULL); } void test_email_create__rename_as_add_delete(void) { const char *expected = "From 6e05acc5a5dab507d91a0a0cc0fb05a3dd98892d Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Wed, 9 Apr 2014 21:15:56 +0200\n" \ "Subject: [PATCH] Renamed file1.txt -> file1.txt.renamed\n" \ "\n" \ "---\n" \ " file1.txt | 17 -----------------\n" \ " file1.txt.renamed | 17 +++++++++++++++++\n" \ " 2 files changed, 17 insertions(+), 17 deletions(-)\n" \ " delete mode 100644 file1.txt\n" \ " create mode 100644 file1.txt.renamed\n" \ "\n" \ "diff --git a/file1.txt b/file1.txt\n" \ "deleted file mode 100644\n" \ "index af8f41d..0000000\n" \ "--- a/file1.txt\n" \ "+++ /dev/null\n" \ "@@ -1,17 +0,0 @@\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-_file1.txt_\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-\n" \ "-\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-file1.txt\n" \ "-_file1.txt_\n" \ "-_file1.txt_\n" \ "-file1.txt\n" \ "diff --git a/file1.txt.renamed b/file1.txt.renamed\n" \ "new file mode 100644\n" \ "index 0000000..a97157a\n" \ "--- /dev/null\n" \ "+++ b/file1.txt.renamed\n" \ "@@ -0,0 +1,17 @@\n" \ "+file1.txt\n" \ "+file1.txt\n" \ "+_file1.txt_\n" \ "+file1.txt\n" \ "+file1.txt\n" \ "+file1.txt_renamed\n" \ "+file1.txt\n" \ "+\n" \ "+\n" \ "+file1.txt\n" \ "+file1.txt\n" \ "+file1.txt_renamed\n" \ "+file1.txt\n" \ "+file1.txt\n" \ "+_file1.txt_\n" \ "+_file1.txt_\n" \ "+file1.txt\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; git_email_create_options opts = GIT_EMAIL_CREATE_OPTIONS_INIT; opts.flags |= GIT_EMAIL_CREATE_NO_RENAMES; assert_email_match(expected, "6e05acc5a5dab507d91a0a0cc0fb05a3dd98892d", &opts); } void test_email_create__binary(void) { const char *expected = "From 8d7523f6fcb2404257889abe0d96f093d9f524f9 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Sun, 13 Apr 2014 18:10:18 +0200\n" \ "Subject: [PATCH] Modified binary file\n" \ "\n" \ "---\n" \ " binary.bin | Bin 3 -> 5 bytes\n" \ " 1 file changed, 0 insertions(+), 0 deletions(-)\n" \ "\n" \ "diff --git a/binary.bin b/binary.bin\n" \ "index bd474b2519cc15eab801ff851cc7d50f0dee49a1..9ac35ff15cd8864aeafd889e4826a3150f0b06c4 100644\n" \ "GIT binary patch\n" \ "literal 5\n" \ "Mc${NkU}WL~000&M4gdfE\n" \ "\n" \ "literal 3\n" \ "Kc${Nk-~s>u4FC%O\n" \ "\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; assert_email_match(expected, "8d7523f6fcb2404257889abe0d96f093d9f524f9", NULL); } void test_email_create__binary_not_included(void) { const char *expected = "From 8d7523f6fcb2404257889abe0d96f093d9f524f9 Mon Sep 17 00:00:00 2001\n" \ "From: Jacques Germishuys <jacquesg@striata.com>\n" \ "Date: Sun, 13 Apr 2014 18:10:18 +0200\n" \ "Subject: [PATCH] Modified binary file\n" \ "\n" \ "---\n" \ " binary.bin | Bin 3 -> 5 bytes\n" \ " 1 file changed, 0 insertions(+), 0 deletions(-)\n" \ "\n" \ "diff --git a/binary.bin b/binary.bin\n" \ "index bd474b2..9ac35ff 100644\n" \ "Binary files a/binary.bin and b/binary.bin differ\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; git_email_create_options opts = GIT_EMAIL_CREATE_OPTIONS_INIT; opts.diff_opts.flags &= ~GIT_DIFF_SHOW_BINARY; assert_email_match(expected, "8d7523f6fcb2404257889abe0d96f093d9f524f9", &opts); } void test_email_create__custom_summary_and_body(void) { const char *expected = "From 627e7e12d87e07a83fad5b6bfa25e86ead4a5270 Mon Sep 17 00:00:00 2001\n" \ "From: Patrick Steinhardt <ps@pks.im>\n" \ "Date: Tue, 24 Nov 2015 13:34:39 +0100\n" \ "Subject: [PPPPPATCH 2/4] This is a subject\n" \ "\n" \ "Modify content of file3.txt by appending a new line. Make this\n" \ "commit message somewhat longer to test behavior with newlines\n" \ "embedded in the message body.\n" \ "\n" \ "Also test if new paragraphs are included correctly.\n" \ "---\n" \ " file3.txt | 1 +\n" \ " 1 file changed, 1 insertion(+)\n" \ "\n" \ "diff --git a/file3.txt b/file3.txt\n" \ "index 9a2d780..7309653 100644\n" \ "--- a/file3.txt\n" \ "+++ b/file3.txt\n" \ "@@ -3,3 +3,4 @@ file3!\n" \ " file3\n" \ " file3\n" \ " file3\n" \ "+file3\n" \ "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; const char *summary = "This is a subject\nwith\nnewlines"; const char *body = "Modify content of file3.txt by appending a new line. Make this\n" \ "commit message somewhat longer to test behavior with newlines\n" \ "embedded in the message body.\n" \ "\n" \ "Also test if new paragraphs are included correctly."; git_oid oid; git_commit *commit = NULL; git_diff *diff = NULL; git_buf buf = GIT_BUF_INIT; git_email_create_options opts = GIT_EMAIL_CREATE_OPTIONS_INIT; opts.subject_prefix = "PPPPPATCH"; git_oid_fromstr(&oid, "627e7e12d87e07a83fad5b6bfa25e86ead4a5270"); cl_git_pass(git_commit_lookup(&commit, repo, &oid)); cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); cl_git_pass(git_email_create_from_diff(&buf, diff, 2, 4, &oid, summary, body, git_commit_author(commit), &opts)); cl_assert_equal_s(expected, buf.ptr); git_diff_free(diff); git_commit_free(commit); git_buf_dispose(&buf); } void test_email_create__commit_subjects(void) { git_email_create_options opts = GIT_EMAIL_CREATE_OPTIONS_INIT; assert_subject_match("[PATCH] Modify some content", "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); opts.reroll_number = 42; assert_subject_match("[PATCH v42] Modify some content", "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); opts.flags |= GIT_EMAIL_CREATE_ALWAYS_NUMBER; assert_subject_match("[PATCH v42 1/1] Modify some content", "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); opts.start_number = 9; assert_subject_match("[PATCH v42 9/9] Modify some content", "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); opts.subject_prefix = ""; assert_subject_match("[v42 9/9] Modify some content", "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); opts.reroll_number = 0; assert_subject_match("[9/9] Modify some content", "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); opts.start_number = 0; assert_subject_match("[1/1] Modify some content", "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); opts.flags = GIT_EMAIL_CREATE_OMIT_NUMBERS; assert_subject_match("Modify some content", "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); }