diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-05-16 19:16:35 +0200 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-05-16 19:24:35 +0200 |
| commit | cedf9ca955144c04b87209fd07d1a8763ed4e00d (patch) | |
| tree | 3c48695d4d30f6658a3bb225c0f46bea0e9c5329 /tests-clar/object/tree | |
| parent | 9bd5a99fea4757e5a17412b81eb5a9223437ebdc (diff) | |
| download | libgit2-cedf9ca955144c04b87209fd07d1a8763ed4e00d.tar.gz | |
tree: Kill the `git_tree_diff` functions
These are deprecated and replaced with the diffing code in git2/diff.h
Diffstat (limited to 'tests-clar/object/tree')
| -rw-r--r-- | tests-clar/object/tree/diff.c | 168 |
1 files changed, 0 insertions, 168 deletions
diff --git a/tests-clar/object/tree/diff.c b/tests-clar/object/tree/diff.c deleted file mode 100644 index 631fc3be4..000000000 --- a/tests-clar/object/tree/diff.c +++ /dev/null @@ -1,168 +0,0 @@ -#include "clar_libgit2.h" -#include "tree.h" -#include "repository.h" - -static git_repository *repo; -static git_index *theindex; -static git_tree *atree, *btree; -static git_oid aoid, boid; - -static void diff_cmp(const git_tree_diff_data *a, const git_tree_diff_data *b) -{ - cl_assert(a->old_attr - b->old_attr == 0); - - cl_assert(a->new_attr - b->new_attr == 0); - - cl_assert(git_oid_cmp(&a->old_oid, &b->old_oid) == 0); - cl_assert(git_oid_cmp(&a->new_oid, &b->new_oid) == 0); - - cl_assert(a->status - b->status == 0); - - cl_assert_equal_s(a->path, b->path); -} - -static int diff_cb(const git_tree_diff_data *diff, void *data) -{ - diff_cmp(diff, data); - return 0; -} - -static void test_diff(git_tree *a, git_tree *b, git_tree_diff_cb cb, void *data) -{ - cl_must_pass(git_tree_diff(a, b, cb, data)); - - cl_git_pass(git_index_read_tree(theindex, b)); - cl_git_pass(git_tree_diff_index_recursive(a, theindex, cb, data)); -} - -void test_object_tree_diff__initialize(void) -{ - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_index(&theindex, repo)); -} - -void test_object_tree_diff__cleanup(void) -{ - git_tree_free(atree); - git_tree_free(btree); - git_index_free(theindex); - git_repository_free(repo); -} - -void test_object_tree_diff__addition(void) -{ - char *astr = "181037049a54a1eb5fab404658a3a250b44335d7"; - char *bstr = "f60079018b664e4e79329a7ef9559c8d9e0378d1"; - git_tree_diff_data expect; - - memset(&expect, 0x0, sizeof(git_tree_diff_data)); - expect.old_attr = 0; - expect.new_attr = 0100644; - git_oid_fromstr(&expect.new_oid, "fa49b077972391ad58037050f2a75f74e3671e92"); - expect.status = GIT_STATUS_ADDED; - expect.path = "new.txt"; - - cl_must_pass(git_oid_fromstr(&aoid, astr)); - cl_must_pass(git_oid_fromstr(&boid, bstr)); - - cl_must_pass(git_tree_lookup(&atree, repo, &aoid)); - cl_must_pass(git_tree_lookup(&btree, repo, &boid)); - - test_diff(atree, btree, diff_cb, &expect); -} - -void test_object_tree_diff__deletion(void) -{ - char *astr = "f60079018b664e4e79329a7ef9559c8d9e0378d1"; - char *bstr = "181037049a54a1eb5fab404658a3a250b44335d7"; - git_tree_diff_data expect; - - memset(&expect, 0x0, sizeof(git_tree_diff_data)); - expect.old_attr = 0100644; - expect.new_attr = 0; - git_oid_fromstr(&expect.old_oid, "fa49b077972391ad58037050f2a75f74e3671e92"); - expect.status = GIT_STATUS_DELETED; - expect.path = "new.txt"; - cl_must_pass(git_oid_fromstr(&aoid, astr)); - cl_must_pass(git_oid_fromstr(&boid, bstr)); - - cl_must_pass(git_tree_lookup(&atree, repo, &aoid)); - cl_must_pass(git_tree_lookup(&btree, repo, &boid)); - - test_diff(atree, btree, diff_cb, &expect); -} - -void test_object_tree_diff__modification(void) -{ - char *astr = "1810dff58d8a660512d4832e740f692884338ccd"; - char *bstr = "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162"; - git_tree_diff_data expect; - - expect.old_attr = 0100644; - expect.new_attr = 0100644; - git_oid_fromstr(&expect.old_oid, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"); - git_oid_fromstr(&expect.new_oid, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc"); - expect.status = GIT_STATUS_MODIFIED; - expect.path = "branch_file.txt"; - - cl_must_pass(git_oid_fromstr(&aoid, astr)); - cl_must_pass(git_oid_fromstr(&boid, bstr)); - - cl_must_pass(git_tree_lookup(&atree, repo, &aoid)); - cl_must_pass(git_tree_lookup(&btree, repo, &boid)); - - test_diff(atree, btree, diff_cb, &expect); -} - -struct diff_more_data { - git_tree_diff_data expect[3]; - int expect_idx; -}; - -static int diff_more_cb(const git_tree_diff_data *diff, void *data) -{ - struct diff_more_data *more_data = data; - diff_cmp(diff, &more_data->expect[more_data->expect_idx]); - - more_data->expect_idx = (more_data->expect_idx + 1) % ARRAY_SIZE(more_data->expect); - - return 0; -} - -void test_object_tree_diff__more(void) -{ - char *astr = "814889a078c031f61ed08ab5fa863aea9314344d"; - char *bstr = "75057dd4114e74cca1d750d0aee1647c903cb60a"; - struct diff_more_data more_data; - git_tree_diff_data *expect = more_data.expect; - - memset(&more_data, 0x0, sizeof(struct diff_more_data)); - /* M README */ - expect[0].old_attr = 0100644; - expect[0].new_attr = 0100644; - git_oid_fromstr(&expect[0].old_oid, "a8233120f6ad708f843d861ce2b7228ec4e3dec6"); - git_oid_fromstr(&expect[0].new_oid, "1385f264afb75a56a5bec74243be9b367ba4ca08"); - expect[0].status = GIT_STATUS_MODIFIED; - expect[0].path = "README"; - /* A branch_file.txt */ - expect[1].old_attr = 0; - expect[1].new_attr = 0100644; - git_oid_fromstr(&expect[1].new_oid, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"); - expect[1].status = GIT_STATUS_ADDED; - expect[1].path = "branch_file.txt"; - /* M new.txt */ - expect[2].old_attr = 0100644; - expect[2].new_attr = 0100644; - git_oid_fromstr(&expect[2].old_oid, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd"); - git_oid_fromstr(&expect[2].new_oid, "fa49b077972391ad58037050f2a75f74e3671e92"); - expect[2].status = GIT_STATUS_MODIFIED; - expect[2].path = "new.txt"; - - cl_must_pass(git_oid_fromstr(&aoid, astr)); - cl_must_pass(git_oid_fromstr(&boid, bstr)); - - cl_must_pass(git_tree_lookup(&atree, repo, &aoid)); - cl_must_pass(git_tree_lookup(&btree, repo, &boid)); - - test_diff(atree, btree, diff_more_cb, &more_data); -} |
