diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-01 14:09:01 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-01 14:40:16 -0400 |
| commit | 0cee70ebb7297f155129e0d05f5a23be82231256 (patch) | |
| tree | 6d98f55d737f4187e58f2a180ffb75f05b98bfba /tests/revwalk/mergebase.c | |
| parent | e1fc03c9baea9864dec90d0aef7aadcc2ff20576 (diff) | |
| download | libgit2-0cee70ebb7297f155129e0d05f5a23be82231256.tar.gz | |
Introduce cl_assert_equal_oid
Diffstat (limited to 'tests/revwalk/mergebase.c')
| -rw-r--r-- | tests/revwalk/mergebase.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/revwalk/mergebase.c b/tests/revwalk/mergebase.c index 97663502c..2c7184fc7 100644 --- a/tests/revwalk/mergebase.c +++ b/tests/revwalk/mergebase.c @@ -30,7 +30,7 @@ void test_revwalk_mergebase__single1(void) cl_git_pass(git_oid_fromstr(&expected, "5b5b025afb0b4c913b4c338a42934a3863bf3644")); cl_git_pass(git_merge_base(&result, _repo, &one, &two)); - cl_assert(git_oid_cmp(&result, &expected) == 0); + cl_assert_equal_oid(&expected, &result); cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two)); cl_assert_equal_sz(ahead, 2); @@ -51,7 +51,7 @@ void test_revwalk_mergebase__single2(void) cl_git_pass(git_oid_fromstr(&expected, "c47800c7266a2be04c571c04d5a6614691ea99bd")); cl_git_pass(git_merge_base(&result, _repo, &one, &two)); - cl_assert(git_oid_cmp(&result, &expected) == 0); + cl_assert_equal_oid(&expected, &result); cl_git_pass(git_graph_ahead_behind( &ahead, &behind, _repo, &one, &two)); cl_assert_equal_sz(ahead, 4); @@ -72,10 +72,10 @@ void test_revwalk_mergebase__merged_branch(void) cl_git_pass(git_oid_fromstr(&expected, "9fd738e8f7967c078dceed8190330fc8648ee56a")); cl_git_pass(git_merge_base(&result, _repo, &one, &two)); - cl_assert(git_oid_cmp(&result, &expected) == 0); + cl_assert_equal_oid(&expected, &result); cl_git_pass(git_merge_base(&result, _repo, &two, &one)); - cl_assert(git_oid_cmp(&result, &expected) == 0); + cl_assert_equal_oid(&expected, &result); cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two)); cl_assert_equal_sz(ahead, 0); @@ -132,7 +132,7 @@ void test_revwalk_mergebase__prefer_youngest_merge_base(void) cl_git_pass(git_oid_fromstr(&expected, "c47800c7266a2be04c571c04d5a6614691ea99bd")); cl_git_pass(git_merge_base(&result, _repo, &one, &two)); - cl_assert(git_oid_cmp(&result, &expected) == 0); + cl_assert_equal_oid(&expected, &result); } void test_revwalk_mergebase__no_off_by_one_missing(void) @@ -177,7 +177,7 @@ static void assert_mergebase_many(const char *expected_sha, int count, ...) cl_git_pass(git_merge_base_many(&oid, _repo, count, oids)); cl_git_pass(git_oid_fromstr(&expected, expected_sha)); - cl_assert(git_oid_cmp(&expected, &oid) == 0); + cl_assert_equal_oid(&expected, &oid); } git__free(oids); @@ -241,7 +241,7 @@ static void assert_mergebase_octopus(const char *expected_sha, int count, ...) cl_git_pass(git_merge_base_octopus(&oid, _repo, count, oids)); cl_git_pass(git_oid_fromstr(&expected, expected_sha)); - cl_assert(git_oid_cmp(&expected, &oid) == 0); + cl_assert_equal_oid(&expected, &oid); } git__free(oids); |