New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / checkout / binaryunicode.c

diff --git a/tests/checkout/binaryunicode.c b/tests/checkout/binaryunicode.c
index 14ab9fdfaa6f1f7ecb9f1db10f4f5d08cc0c7d81..edb5cfaf52388ad45640a3dd1c1fe1845e3164ce 100644 (file)
--- a/tests/checkout/binaryunicode.c
+++ b/tests/checkout/binaryunicode.c
@@ -2,7 +2,7 @@
 #include "refs.h"
 #include "repo/repo_helpers.h"
 #include "path.h"
-#include "fileops.h"
+#include "futils.h"
 
 static git_repository *g_repo;
 
@@ -21,7 +21,7 @@ static void execute_test(void)
        git_oid oid, check;
        git_commit *commit;
        git_tree *tree;
-       git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
+       git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
 
        cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/branch1"));
        cl_git_pass(git_commit_lookup(&commit, g_repo, &oid));
@@ -36,13 +36,13 @@ static void execute_test(void)
 
        /* Verify that the lenna.jpg file was checked out correctly */
        cl_git_pass(git_oid_fromstr(&check, "8ab005d890fe53f65eda14b23672f60d9f4ec5a1"));
-       cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/lenna.jpg", GIT_OBJ_BLOB));
-       cl_assert(git_oid_equal(&oid, &check));
+       cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/lenna.jpg", GIT_OBJECT_BLOB));
+       cl_assert_equal_oid(&oid, &check);
 
        /* Verify that the text file was checked out correctly */
        cl_git_pass(git_oid_fromstr(&check, "965b223880dd4249e2c66a0cc0b4cffe1dc40f5a"));
-       cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/utf16_withbom_noeol_crlf.txt", GIT_OBJ_BLOB));
-       cl_assert(git_oid_equal(&oid, &check));
+       cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/utf16_withbom_noeol_crlf.txt", GIT_OBJECT_BLOB));
+       cl_assert_equal_oid(&oid, &check);
 }
 
 void test_checkout_binaryunicode__noautocrlf(void)