diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/t1001-readtag.c | 16 | ||||
| -rw-r--r-- | tests/t1002-readsymref.c | 48 | ||||
| -rw-r--r-- | tests/t1003-readpackedref.c | 31 |
3 files changed, 26 insertions, 69 deletions
diff --git a/tests/t1001-readtag.c b/tests/t1001-readtag.c index 57de1aa23..feecf2057 100644 --- a/tests/t1001-readtag.c +++ b/tests/t1001-readtag.c @@ -12,18 +12,15 @@ BEGIN_TEST(loose_tag_reference_looking_up) must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - - must_pass(git_repository_reference_lookup(&reference, repo, loose_tag_ref_name)); - must_be_true(reference->type == GIT_REF_OBJECT_ID); - must_be_true(reference->is_packed == 0); + must_pass(git_repository_lookup_ref(&reference, repo, loose_tag_ref_name)); + must_be_true(reference->type == GIT_REF_OID); + must_be_true(reference->packed == 0); must_be_true(strcmp(reference->name, loose_tag_ref_name) == 0); - - must_pass(git_repository_lookup(&object, repo, &((git_reference_object_id *)reference)->id, GIT_OBJ_ANY)); + must_pass(git_repository_lookup(&object, repo, git_reference_oid(reference), GIT_OBJ_ANY)); must_be_true(object != NULL); must_be_true(git_object_type(object) == GIT_OBJ_TAG); - git_repository_free(repo); END_TEST @@ -32,8 +29,7 @@ BEGIN_TEST(non_existing_tag_reference_looking_up) git_reference *reference; must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - - must_fail(git_repository_reference_lookup(&reference, repo, non_existing_tag_ref_name)); + must_fail(git_repository_lookup_ref(&reference, repo, non_existing_tag_ref_name)); git_repository_free(repo); -END_TEST
\ No newline at end of file +END_TEST diff --git a/tests/t1002-readsymref.c b/tests/t1002-readsymref.c index b6184b562..6dee0b916 100644 --- a/tests/t1002-readsymref.c +++ b/tests/t1002-readsymref.c @@ -8,54 +8,37 @@ static const char *current_master_tip = "be3563ae3f795b2b4353bcce3a527ad0a4f7f64 BEGIN_TEST(symbolic_reference_looking_up) git_repository *repo; - git_reference *reference; - git_reference_symbolic *head_ref; - git_reference_object_id *target_ref; + git_reference *reference, *resolved_ref; git_object *object; git_oid id; must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - - must_pass(git_repository_reference_lookup(&reference, repo, head_ref_name)); + must_pass(git_repository_lookup_ref(&reference, repo, head_ref_name)); must_be_true(reference->type == GIT_REF_SYMBOLIC); - must_be_true(reference->is_packed == 0); + must_be_true(reference->packed == 0); must_be_true(strcmp(reference->name, head_ref_name) == 0); - head_ref = (git_reference_symbolic *)reference; - must_be_true(head_ref->target != NULL); - must_be_true(head_ref->target->type == GIT_REF_OBJECT_ID); /* Current HEAD directly points to the object id reference */ - must_be_true(strcmp(head_ref->target->name, current_head_target) == 0); + must_pass(git_reference_resolve(&resolved_ref, reference)); + must_be_true(resolved_ref->type == GIT_REF_OID); - target_ref = (git_reference_object_id *)head_ref->target; - - must_pass(git_repository_lookup(&object, repo, &target_ref->id, GIT_OBJ_ANY)); + must_pass(git_repository_lookup(&object, repo, git_reference_oid(resolved_ref), GIT_OBJ_ANY)); must_be_true(object != NULL); must_be_true(git_object_type(object) == GIT_OBJ_COMMIT); git_oid_mkstr(&id, current_master_tip); must_be_true(git_oid_cmp(&id, git_object_id(object)) == 0); - git_repository_free(repo); END_TEST BEGIN_TEST(looking_up_head_then_master) git_repository *repo; git_reference *reference; - git_reference_symbolic *head_ref; must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - - - must_pass(git_repository_reference_lookup(&reference, repo, head_ref_name)); - - head_ref = (git_reference_symbolic *)reference; - must_be_true(head_ref->target != NULL); - - must_pass(git_repository_reference_lookup(&reference, repo, current_head_target)); - must_be_true(head_ref->target == reference); - + must_pass(git_repository_lookup_ref(&reference, repo, head_ref_name)); + must_pass(git_repository_lookup_ref(&reference, repo, current_head_target)); git_repository_free(repo); END_TEST @@ -63,19 +46,10 @@ END_TEST BEGIN_TEST(looking_up_master_then_head) git_repository *repo; git_reference *reference, *master_ref; - git_reference_symbolic *head_ref; must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - - - must_pass(git_repository_reference_lookup(&master_ref, repo, current_head_target)); - - must_pass(git_repository_reference_lookup(&reference, repo, head_ref_name)); - head_ref = (git_reference_symbolic *)reference; - must_be_true(head_ref->target != NULL); - - must_be_true(head_ref->target == master_ref); - + must_pass(git_repository_lookup_ref(&master_ref, repo, current_head_target)); + must_pass(git_repository_lookup_ref(&reference, repo, head_ref_name)); git_repository_free(repo); -END_TEST
\ No newline at end of file +END_TEST diff --git a/tests/t1003-readpackedref.c b/tests/t1003-readpackedref.c index 0d210fd35..d76bdcf3e 100644 --- a/tests/t1003-readpackedref.c +++ b/tests/t1003-readpackedref.c @@ -8,45 +8,32 @@ static const char *packed_test_head_name = "refs/heads/packed-test"; BEGIN_TEST(packed_reference_looking_up) git_repository *repo; git_reference *reference; - git_reference_object_id *packed_ref; git_object *object; - git_oid id; must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - - must_pass(git_repository_reference_lookup(&reference, repo, packed_head_name)); - must_be_true(reference->type == GIT_REF_OBJECT_ID); - must_be_true(reference->is_packed == 1); + must_pass(git_repository_lookup_ref(&reference, repo, packed_head_name)); + must_be_true(reference->type == GIT_REF_OID); + must_be_true(reference->packed == 1); must_be_true(strcmp(reference->name, packed_head_name) == 0); - packed_ref = (git_reference_object_id *)reference; - - must_pass(git_repository_lookup(&object, repo, &packed_ref->id, GIT_OBJ_ANY)); + must_pass(git_repository_lookup(&object, repo, git_reference_oid(reference), GIT_OBJ_ANY)); must_be_true(object != NULL); must_be_true(git_object_type(object) == GIT_OBJ_COMMIT); - git_repository_free(repo); END_TEST BEGIN_TEST(packed_exists_but_more_recent_loose_reference_is_retrieved) git_repository *repo; git_reference *reference; - git_reference_object_id *packed_ref; - git_object *object; - git_oid id; must_pass(git_repository_open(&repo, REPOSITORY_FOLDER)); - - - must_pass(git_repository_reference_lookup(&reference, repo, packed_head_name)); /* Triggers load and eager parsing of all packed references */ - - must_pass(git_repository_reference_lookup(&reference, repo, packed_test_head_name)); - must_be_true(reference->type == GIT_REF_OBJECT_ID); - must_be_true(reference->is_packed == 0); + must_pass(git_repository_lookup_ref(&reference, repo, packed_head_name)); + must_pass(git_repository_lookup_ref(&reference, repo, packed_test_head_name)); + must_be_true(reference->type == GIT_REF_OID); + must_be_true(reference->packed == 0); must_be_true(strcmp(reference->name, packed_test_head_name) == 0); - git_repository_free(repo); -END_TEST
\ No newline at end of file +END_TEST |