Introduce cl_assert_equal_oid

1 files changed, 27 insertions, 27 deletions

diff --git a/tests/index/reuc.c b/tests/index/reuc.c
index 27240a30f..0b4d71a6a 100644
--- a/tests/index/reuc.c
+++ b/tests/index/reuc.c
@@ -53,9 +53,9 @@ void test_index_reuc__add(void)
 	cl_assert(reuc->mode[0] == 0100644);
 	cl_assert(reuc->mode[1] == 0100644);
 	cl_assert(reuc->mode[2] == 0100644);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &ancestor_oid) == 0);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &our_oid) == 0);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &their_oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &ancestor_oid);
+	cl_assert_equal_oid(&reuc->oid[1], &our_oid);
+	cl_assert_equal_oid(&reuc->oid[2], &their_oid);
 }
 
 void test_index_reuc__add_no_ancestor(void)
@@ -78,9 +78,9 @@ void test_index_reuc__add_no_ancestor(void)
 	cl_assert(reuc->mode[0] == 0);
 	cl_assert(reuc->mode[1] == 0100644);
 	cl_assert(reuc->mode[2] == 0100644);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &ancestor_oid) == 0);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &our_oid) == 0);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &their_oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &ancestor_oid);
+	cl_assert_equal_oid(&reuc->oid[1], &our_oid);
+	cl_assert_equal_oid(&reuc->oid[2], &their_oid);
 }
 
 void test_index_reuc__read_bypath(void)
@@ -97,11 +97,11 @@ void test_index_reuc__read_bypath(void)
 	cl_assert(reuc->mode[1] == 0100644);
 	cl_assert(reuc->mode[2] == 0100644);
 	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &oid);
 	git_oid_fromstr(&oid, TWO_OUR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[1], &oid);
 	git_oid_fromstr(&oid, TWO_THEIR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[2], &oid);
 
 	cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "one.txt"));
 
@@ -110,11 +110,11 @@ void test_index_reuc__read_bypath(void)
 	cl_assert(reuc->mode[1] == 0100644);
 	cl_assert(reuc->mode[2] == 0100644);
 	git_oid_fromstr(&oid, ONE_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &oid);
 	git_oid_fromstr(&oid, ONE_OUR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[1], &oid);
 	git_oid_fromstr(&oid, ONE_THEIR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[2], &oid);
 }
 
 void test_index_reuc__ignore_case(void)
@@ -142,11 +142,11 @@ void test_index_reuc__ignore_case(void)
 	cl_assert(reuc->mode[1] == 0100644);
 	cl_assert(reuc->mode[2] == 0100644);
 	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &oid);
 	git_oid_fromstr(&oid, TWO_OUR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[1], &oid);
 	git_oid_fromstr(&oid, TWO_THEIR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[2], &oid);
 }
 
 void test_index_reuc__read_byindex(void)
@@ -163,11 +163,11 @@ void test_index_reuc__read_byindex(void)
 	cl_assert(reuc->mode[1] == 0100644);
 	cl_assert(reuc->mode[2] == 0100644);
 	git_oid_fromstr(&oid, ONE_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &oid);
 	git_oid_fromstr(&oid, ONE_OUR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[1], &oid);
 	git_oid_fromstr(&oid, ONE_THEIR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[2], &oid);
 
 	cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 1));
 
@@ -176,11 +176,11 @@ void test_index_reuc__read_byindex(void)
 	cl_assert(reuc->mode[1] == 0100644);
 	cl_assert(reuc->mode[2] == 0100644);
 	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &oid);
 	git_oid_fromstr(&oid, TWO_OUR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[1], &oid);
 	git_oid_fromstr(&oid, TWO_THEIR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[2], &oid);
 }
 
 void test_index_reuc__updates_existing(void)
@@ -216,11 +216,11 @@ void test_index_reuc__updates_existing(void)
 
 	cl_assert_equal_s("TWO.txt", reuc->path);
 	git_oid_fromstr(&oid, TWO_OUR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &oid);
 	git_oid_fromstr(&oid, TWO_THEIR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[1], &oid);
 	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[2], &oid);
 }
 
 void test_index_reuc__remove(void)
@@ -242,11 +242,11 @@ void test_index_reuc__remove(void)
 	cl_assert(reuc->mode[1] == 0100644);
 	cl_assert(reuc->mode[2] == 0100644);
 	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[0], &oid);
 	git_oid_fromstr(&oid, TWO_OUR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[1], &oid);
 	git_oid_fromstr(&oid, TWO_THEIR_OID);
-	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
+	cl_assert_equal_oid(&reuc->oid[2], &oid);
 }
 
 void test_index_reuc__write(void)