diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/t04-commit.c | 49 | ||||
| -rw-r--r-- | tests/t08-tag.c | 9 | ||||
| -rw-r--r-- | tests/t10-refs.c | 4 |
3 files changed, 38 insertions, 24 deletions
diff --git a/tests/t04-commit.c b/tests/t04-commit.c index 53f0faefb..b042e1515 100644 --- a/tests/t04-commit.c +++ b/tests/t04-commit.c @@ -450,10 +450,8 @@ static int try_build_signature(const char *name, const char *email, git_time_t t git_signature *sign; int error = GIT_SUCCESS; - sign = git_signature_new(name, email, time, offset); - - if (sign == NULL) - error = GIT_ERROR; + if ((error = git_signature_new(&sign, name, email, time, offset)) < GIT_SUCCESS) + return error; git_signature_free((git_signature *)sign); @@ -462,8 +460,7 @@ static int try_build_signature(const char *name, const char *email, git_time_t t BEGIN_TEST(signature0, "creating a signature trims leading and trailing spaces") git_signature *sign; - sign = git_signature_new(" nulltoken ", " emeric.fermas@gmail.com ", 1234567890, 60); - must_be_true(sign != NULL); + must_pass(git_signature_new(&sign, " nulltoken ", " emeric.fermas@gmail.com ", 1234567890, 60)); must_pass(strcmp(sign->name, "nulltoken")); must_pass(strcmp(sign->email, "emeric.fermas@gmail.com")); git_signature_free((git_signature *)sign); @@ -478,6 +475,29 @@ BEGIN_TEST(signature1, "can not create a signature with empty name or email") must_fail(try_build_signature("nulltoken", " ", 1234567890, 60)); END_TEST +BEGIN_TEST(signature2, "creating a one character signature") + git_signature *sign; + must_pass(git_signature_new(&sign, "x", "foo@bar.baz", 1234567890, 60)); + must_pass(strcmp(sign->name, "x")); + must_pass(strcmp(sign->email, "foo@bar.baz")); + git_signature_free((git_signature *)sign); +END_TEST + +BEGIN_TEST(signature3, "creating a two character signature") + git_signature *sign; + must_pass(git_signature_new(&sign, "xx", "x@y.z", 1234567890, 60)); + must_pass(strcmp(sign->name, "x")); + must_pass(strcmp(sign->email, "foo@bar.baz")); + git_signature_free((git_signature *)sign); +END_TEST + +BEGIN_TEST(signature4, "creating a zero character signature") + git_signature *sign; + must_fail(git_signature_new(&sign, "", "x@y.z", 1234567890, 60)); + must_be_true(sign == NULL); +END_TEST + + /* External declaration for testing the buffer parsing method */ int commit_parse_buffer(git_commit *commit, void *data, size_t len, unsigned int parse_flags); @@ -629,11 +649,8 @@ BEGIN_TEST(write0, "write a new commit object from memory to disk") must_pass(git_commit_lookup(&parent, repo, &parent_id)); /* create signatures */ - committer = git_signature_new(COMMITTER_NAME, COMMITTER_EMAIL, 123456789, 60); - must_be_true(committer != NULL); - - author = git_signature_new(COMMITTER_NAME, COMMITTER_EMAIL, 987654321, 90); - must_be_true(author != NULL); + must_pass(git_signature_new(&committer, COMMITTER_NAME, COMMITTER_EMAIL, 123456789, 60)); + must_pass(git_signature_new(&author, COMMITTER_NAME, COMMITTER_EMAIL, 987654321, 90)); must_pass(git_commit_create_v( &commit_id, /* out id */ @@ -696,11 +713,8 @@ BEGIN_TEST(root0, "create a root commit") must_pass(git_tree_lookup(&tree, repo, &tree_id)); /* create signatures */ - committer = git_signature_new(COMMITTER_NAME, COMMITTER_EMAIL, 123456789, 60); - must_be_true(committer != NULL); - - author = git_signature_new(COMMITTER_NAME, COMMITTER_EMAIL, 987654321, 90); - must_be_true(author != NULL); + must_pass(git_signature_new(&committer, COMMITTER_NAME, COMMITTER_EMAIL, 123456789, 60)); + must_pass(git_signature_new(&author, COMMITTER_NAME, COMMITTER_EMAIL, 987654321, 90)); /* First we need to update HEAD so it points to our non-existant branch */ must_pass(git_reference_lookup(&head, repo, "HEAD")); @@ -758,4 +772,7 @@ BEGIN_SUITE(commit) ADD_TEST(signature0); ADD_TEST(signature1); + ADD_TEST(signature2); + ADD_TEST(signature3); + ADD_TEST(signature4); END_SUITE diff --git a/tests/t08-tag.c b/tests/t08-tag.c index 3ac9aa758..b0d4af87b 100644 --- a/tests/t08-tag.c +++ b/tests/t08-tag.c @@ -126,8 +126,7 @@ BEGIN_TEST(write0, "write a tag to the repository and read it again") must_pass(git_object_lookup(&target, repo, &target_id, GIT_OBJ_COMMIT)); /* create signature */ - tagger = git_signature_new(TAGGER_NAME, TAGGER_EMAIL, 123456789, 60); - must_be_true(tagger != NULL); + must_pass(git_signature_new(&tagger, TAGGER_NAME, TAGGER_EMAIL, 123456789, 60)); must_pass(git_tag_create( &tag_id, /* out id */ @@ -177,8 +176,7 @@ BEGIN_TEST(write2, "Attempt to write a tag bearing the same name than an already must_pass(git_object_lookup(&target, repo, &target_id, GIT_OBJ_COMMIT)); /* create signature */ - tagger = git_signature_new(TAGGER_NAME, TAGGER_EMAIL, 123456789, 60); - must_be_true(tagger != NULL); + must_pass(git_signature_new(&tagger, TAGGER_NAME, TAGGER_EMAIL, 123456789, 60)); must_fail(git_tag_create( &tag_id, /* out id */ @@ -212,8 +210,7 @@ BEGIN_TEST(write3, "Replace an already existing tag") git_oid_cpy(&old_tag_id, git_reference_oid(ref_tag)); /* create signature */ - tagger = git_signature_new(TAGGER_NAME, TAGGER_EMAIL, 123456789, 60); - must_be_true(tagger != NULL); + must_pass(git_signature_new(&tagger, TAGGER_NAME, TAGGER_EMAIL, 123456789, 60)); must_pass(git_tag_create( &tag_id, /* out id */ diff --git a/tests/t10-refs.c b/tests/t10-refs.c index c54ff7c0b..f80c3f510 100644 --- a/tests/t10-refs.c +++ b/tests/t10-refs.c @@ -1034,7 +1034,7 @@ BEGIN_TEST(reflog0, "write a reflog for a given reference and ensure it can be r must_pass(git_reference_create_oid(&ref, repo, new_ref, &oid, 0)); must_pass(git_reference_lookup(&ref, repo, new_ref)); - committer = git_signature_now("foo", "foo@bar"); + must_pass(git_signature_now(&committer, "foo", "foo@bar")); must_pass(git_reflog_write(ref, NULL, committer, NULL)); must_fail(git_reflog_write(ref, NULL, committer, "no\nnewline")); @@ -1082,7 +1082,7 @@ BEGIN_TEST(reflog1, "avoid writing an obviously wrong reflog") must_pass(git_reference_create_oid(&ref, repo, new_ref, &oid, 0)); must_pass(git_reference_lookup(&ref, repo, new_ref)); - committer = git_signature_now("foo", "foo@bar"); + must_pass(git_signature_now(&committer, "foo", "foo@bar")); /* Write the reflog for the new branch */ must_pass(git_reflog_write(ref, NULL, committer, NULL)); |