6 files changed, 30 insertions, 30 deletions

diff --git a/tests-clar/refs/create.c b/tests-clar/refs/create.c
index 3674022c0..dde4c5745 100644
--- a/tests-clar/refs/create.c
+++ b/tests-clar/refs/create.c
@@ -42,7 +42,7 @@ void test_refs_create__symbolic(void)
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker));
 	cl_assert(git_reference_type(looked_up_ref) & GIT_REF_SYMBOLIC);
 	cl_assert(git_reference_is_packed(looked_up_ref) == 0);
-	cl_assert_strequal(looked_up_ref->name, new_head_tracker);
+	cl_assert_equal_s(looked_up_ref->name, new_head_tracker);
 
 	/* ...peeled.. */
 	cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref));
@@ -112,7 +112,7 @@ void test_refs_create__oid(void)
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head));
 	cl_assert(git_reference_type(looked_up_ref) & GIT_REF_OID);
 	cl_assert(git_reference_is_packed(looked_up_ref) == 0);
-	cl_assert_strequal(looked_up_ref->name, new_head);
+	cl_assert_equal_s(looked_up_ref->name, new_head);
 
 	/* ...and that it points to the current master tip */
 	cl_assert(git_oid_cmp(&id, git_reference_oid(looked_up_ref)) == 0);
diff --git a/tests-clar/refs/overwrite.c b/tests-clar/refs/overwrite.c
index 5c6fd54bd..410e39a84 100644
--- a/tests-clar/refs/overwrite.c
+++ b/tests-clar/refs/overwrite.c
@@ -34,7 +34,7 @@ void test_refs_overwrite__symbolic(void)
 	/* Ensure it points to the right place*/
 	cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name));
 	cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC);
-	cl_assert_strequal(git_reference_target(ref), ref_branch_name);
+	cl_assert_equal_s(git_reference_target(ref), ref_branch_name);
 	git_reference_free(ref);
 
 	/* Ensure we can't create it unless we force it to */
@@ -45,7 +45,7 @@ void test_refs_overwrite__symbolic(void)
 	/* Ensure it points to the right place */
 	cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name));
 	cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC);
-	cl_assert_strequal(git_reference_target(ref), ref_master_name);
+	cl_assert_equal_s(git_reference_target(ref), ref_master_name);
 
 	git_reference_free(ref);
 	git_reference_free(branch_ref);
@@ -103,7 +103,7 @@ void test_refs_overwrite__object_id_with_symbolic(void)
 	/* Ensure it points to the right place */
 	cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name));
 	cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC);
-	cl_assert_strequal(git_reference_target(ref), ref_master_name);
+	cl_assert_equal_s(git_reference_target(ref), ref_master_name);
 
 	git_reference_free(ref);
 }
diff --git a/tests-clar/refs/pack.c b/tests-clar/refs/pack.c
index dca83d1ef..d50635670 100644
--- a/tests-clar/refs/pack.c
+++ b/tests-clar/refs/pack.c
@@ -39,7 +39,7 @@ void test_refs_pack__loose(void)
 	/* Ensure a known loose ref can be looked up */
 	cl_git_pass(git_reference_lookup(&reference, g_repo, loose_tag_ref_name));
 	cl_assert(git_reference_is_packed(reference) == 0);
-	cl_assert_strequal(reference->name, loose_tag_ref_name);
+	cl_assert_equal_s(reference->name, loose_tag_ref_name);
 	git_reference_free(reference);
 
 	/*
@@ -56,7 +56,7 @@ void test_refs_pack__loose(void)
 	/* Ensure the known ref can still be looked up but is now packed */
 	cl_git_pass(git_reference_lookup(&reference, g_repo, loose_tag_ref_name));
 	cl_assert(git_reference_is_packed(reference));
-	cl_assert_strequal(reference->name, loose_tag_ref_name);
+	cl_assert_equal_s(reference->name, loose_tag_ref_name);
 
 	/* Ensure the known ref has been removed from the loose folder structure */
 	cl_git_pass(git_buf_joinpath(&temp_path, g_repo->path_repository, loose_tag_ref_name));
diff --git a/tests-clar/refs/read.c b/tests-clar/refs/read.c
index c7e88abe4..d7111b232 100644
--- a/tests-clar/refs/read.c
+++ b/tests-clar/refs/read.c
@@ -34,7 +34,7 @@ void test_refs_read__loose_tag(void)
 	cl_git_pass(git_reference_lookup(&reference, g_repo, loose_tag_ref_name));
 	cl_assert(git_reference_type(reference) & GIT_REF_OID);
 	cl_assert(git_reference_is_packed(reference) == 0);
-	cl_assert_strequal(reference->name, loose_tag_ref_name);
+	cl_assert_equal_s(reference->name, loose_tag_ref_name);
 
 	cl_git_pass(git_object_lookup(&object, g_repo, git_reference_oid(reference), GIT_OBJ_ANY));
 	cl_assert(object != NULL);
@@ -42,7 +42,7 @@ void test_refs_read__loose_tag(void)
 
 	/* Ensure the name of the tag matches the name of the reference */
 	cl_git_pass(git_buf_joinpath(&ref_name_from_tag_name, GIT_REFS_TAGS_DIR, git_tag_name((git_tag *)object)));
-	cl_assert_strequal(ref_name_from_tag_name.ptr, loose_tag_ref_name);
+	cl_assert_equal_s(ref_name_from_tag_name.ptr, loose_tag_ref_name);
 	git_buf_free(&ref_name_from_tag_name);
 
 	git_object_free(object);
@@ -71,7 +71,7 @@ void test_refs_read__symbolic(void)
 	cl_git_pass(git_reference_lookup(&reference, g_repo, GIT_HEAD_FILE));
 	cl_assert(git_reference_type(reference) & GIT_REF_SYMBOLIC);
 	cl_assert(git_reference_is_packed(reference) == 0);
-	cl_assert_strequal(reference->name, GIT_HEAD_FILE);
+	cl_assert_equal_s(reference->name, GIT_HEAD_FILE);
 
 	cl_git_pass(git_reference_resolve(&resolved_ref, reference));
 	cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID);
@@ -99,7 +99,7 @@ void test_refs_read__nested_symbolic(void)
 	cl_git_pass(git_reference_lookup(&reference, g_repo, head_tracker_sym_ref_name));
 	cl_assert(git_reference_type(reference) & GIT_REF_SYMBOLIC);
 	cl_assert(git_reference_is_packed(reference) == 0);
-	cl_assert_strequal(reference->name, head_tracker_sym_ref_name);
+	cl_assert_equal_s(reference->name, head_tracker_sym_ref_name);
 
 	cl_git_pass(git_reference_resolve(&resolved_ref, reference));
 	cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID);
@@ -167,7 +167,7 @@ void test_refs_read__packed(void)
 	cl_git_pass(git_reference_lookup(&reference, g_repo, packed_head_name));
 	cl_assert(git_reference_type(reference) & GIT_REF_OID);
 	cl_assert(git_reference_is_packed(reference));
-	cl_assert_strequal(reference->name, packed_head_name);
+	cl_assert_equal_s(reference->name, packed_head_name);
 
 	cl_git_pass(git_object_lookup(&object, g_repo, git_reference_oid(reference), GIT_OBJ_ANY));
 	cl_assert(object != NULL);
@@ -188,7 +188,7 @@ void test_refs_read__loose_first(void)
 	cl_git_pass(git_reference_lookup(&reference, g_repo, packed_test_head_name));
 	cl_assert(git_reference_type(reference) & GIT_REF_OID);
 	cl_assert(git_reference_is_packed(reference) == 0);
-	cl_assert_strequal(reference->name, packed_test_head_name);
+	cl_assert_equal_s(reference->name, packed_test_head_name);
 
 	git_reference_free(reference);
 }
diff --git a/tests-clar/refs/reflog.c b/tests-clar/refs/reflog.c
index 8000e4851..1bc51b2b8 100644
--- a/tests-clar/refs/reflog.c
+++ b/tests-clar/refs/reflog.c
@@ -16,8 +16,8 @@ static git_repository *g_repo;
 static void assert_signature(git_signature *expected, git_signature *actual)
 {
 	cl_assert(actual);
-	cl_assert_strequal(expected->name, actual->name);
-	cl_assert_strequal(expected->email, actual->email);
+	cl_assert_equal_s(expected->name, actual->name);
+	cl_assert_equal_s(expected->email, actual->email);
 	cl_assert(expected->when.offset == actual->when.offset);
 	cl_assert(expected->when.time == actual->when.time);
 }
@@ -73,18 +73,18 @@ void test_refs_reflog__write_then_read(void)
 	entry = (git_reflog_entry *)git_vector_get(&reflog->entries, 0);
 	assert_signature(committer, entry->committer);
 	git_oid_tostr(oid_str, GIT_OID_HEXSZ+1, &entry->oid_old);
-	cl_assert_strequal("0000000000000000000000000000000000000000", oid_str);
+	cl_assert_equal_s("0000000000000000000000000000000000000000", oid_str);
 	git_oid_tostr(oid_str, GIT_OID_HEXSZ+1, &entry->oid_cur);
-	cl_assert_strequal(current_master_tip, oid_str);
+	cl_assert_equal_s(current_master_tip, oid_str);
 	cl_assert(entry->msg == NULL);
 
 	entry = (git_reflog_entry *)git_vector_get(&reflog->entries, 1);
 	assert_signature(committer, entry->committer);
 	git_oid_tostr(oid_str, GIT_OID_HEXSZ+1, &entry->oid_old);
-	cl_assert_strequal(current_master_tip, oid_str);
+	cl_assert_equal_s(current_master_tip, oid_str);
 	git_oid_tostr(oid_str, GIT_OID_HEXSZ+1, &entry->oid_cur);
-	cl_assert_strequal(current_master_tip, oid_str);
-	cl_assert_strequal(commit_msg, entry->msg);
+	cl_assert_equal_s(current_master_tip, oid_str);
+	cl_assert_equal_s(commit_msg, entry->msg);
 
 	git_signature_free(committer);
 	git_reflog_free(reflog);
diff --git a/tests-clar/refs/rename.c b/tests-clar/refs/rename.c
index 8e7c93c97..abcc751ca 100644
--- a/tests-clar/refs/rename.c
+++ b/tests-clar/refs/rename.c
@@ -48,14 +48,14 @@ void test_refs_rename__loose(void)
 
 	/* Now that the reference is renamed... */
 	cl_git_pass(git_reference_rename(looked_up_ref, new_name, 0));
-	cl_assert_strequal(looked_up_ref->name, new_name);
+	cl_assert_equal_s(looked_up_ref->name, new_name);
 
 	/* ...It can't be looked-up with the old name... */
 	cl_git_fail(git_reference_lookup(&another_looked_up_ref, g_repo, loose_tag_ref_name));
 
 	/* ...but the new name works ok... */
 	cl_git_pass(git_reference_lookup(&another_looked_up_ref, g_repo, new_name));
-	cl_assert_strequal(another_looked_up_ref->name, new_name);
+	cl_assert_equal_s(another_looked_up_ref->name, new_name);
 
 	/* .. the ref is still loose... */
 	cl_assert(git_reference_is_packed(another_looked_up_ref) == 0);
@@ -89,14 +89,14 @@ void test_refs_rename__packed(void)
 
 	/* Now that the reference is renamed... */
 	cl_git_pass(git_reference_rename(looked_up_ref, brand_new_name, 0));
-	cl_assert_strequal(looked_up_ref->name, brand_new_name);
+	cl_assert_equal_s(looked_up_ref->name, brand_new_name);
 
 	/* ...It can't be looked-up with the old name... */
 	cl_git_fail(git_reference_lookup(&another_looked_up_ref, g_repo, packed_head_name));
 
 	/* ...but the new name works ok... */
 	cl_git_pass(git_reference_lookup(&another_looked_up_ref, g_repo, brand_new_name));
-	cl_assert_strequal(another_looked_up_ref->name, brand_new_name);
+	cl_assert_equal_s(another_looked_up_ref->name, brand_new_name);
 
 	/* .. the ref is no longer packed... */
 	cl_assert(git_reference_is_packed(another_looked_up_ref) == 0);
@@ -166,7 +166,7 @@ void test_refs_rename__name_collision(void)
 
 	/* Failure to rename it hasn't corrupted its state */
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_head_name));
-	cl_assert_strequal(looked_up_ref->name, packed_head_name);
+	cl_assert_equal_s(looked_up_ref->name, packed_head_name);
 
 	git_reference_free(looked_up_ref);
 }
@@ -188,7 +188,7 @@ void test_refs_rename__invalid_name(void)
 	/* Failure to rename it hasn't corrupted its state */
 	git_reference_free(looked_up_ref);
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name));
-	cl_assert_strequal(looked_up_ref->name, packed_test_head_name);
+	cl_assert_equal_s(looked_up_ref->name, packed_test_head_name);
 
 	git_reference_free(looked_up_ref);
 }
@@ -209,7 +209,7 @@ void test_refs_rename__force_loose_packed(void)
 
 	/* Check we actually renamed it */
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name));
-	cl_assert_strequal(looked_up_ref->name, packed_test_head_name);
+	cl_assert_equal_s(looked_up_ref->name, packed_test_head_name);
 	cl_assert(!git_oid_cmp(&oid, git_reference_oid(looked_up_ref)));
 	git_reference_free(looked_up_ref);
 
@@ -233,7 +233,7 @@ void test_refs_rename__force_loose(void)
 
 	/* Check we actually renamed it */
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, "refs/heads/test"));
-	cl_assert_strequal(looked_up_ref->name,  "refs/heads/test");
+	cl_assert_equal_s(looked_up_ref->name,  "refs/heads/test");
 	cl_assert(!git_oid_cmp(&oid, git_reference_oid(looked_up_ref)));
 	git_reference_free(looked_up_ref);
 
@@ -298,7 +298,7 @@ void test_refs_rename__prefix(void)
 
 	/* Check we actually renamed it */
 	cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name_new));
-	cl_assert_strequal(looked_up_ref->name, ref_two_name_new);
+	cl_assert_equal_s(looked_up_ref->name, ref_two_name_new);
 	git_reference_free(looked_up_ref);
 	cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name));
 
@@ -331,7 +331,7 @@ void test_refs_rename__move_up(void)
 
     /* Check we actually renamed it */
     cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name));
-    cl_assert_strequal(looked_up_ref->name, ref_two_name);
+    cl_assert_equal_s(looked_up_ref->name, ref_two_name);
     git_reference_free(looked_up_ref);
     cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name_new));
     git_reference_free(ref);