New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / status / submodules.c

diff --git a/tests/status/submodules.c b/tests/status/submodules.c
index 33c9e5ab4ef0c82da20f91102644bb8faeac44df..d223657b4ead9877756f8f741c4e4931f0f53ee3 100644 (file)
--- a/tests/status/submodules.c
+++ b/tests/status/submodules.c
@@ -1,5 +1,5 @@
 #include "clar_libgit2.h"
-#include "fileops.h"
+#include "futils.h"
 #include "status_helpers.h"
 #include "../submodule/submodule_helpers.h"
 
@@ -36,9 +36,9 @@ void test_status_submodules__0(void)
 
        g_repo = setup_fixture_submodules();
 
-       cl_assert(git_path_isdir("submodules/.git"));
-       cl_assert(git_path_isdir("submodules/testrepo/.git"));
-       cl_assert(git_path_isfile("submodules/.gitmodules"));
+       cl_assert(git_fs_path_isdir("submodules/.git"));
+       cl_assert(git_fs_path_isdir("submodules/testrepo/.git"));
+       cl_assert(git_fs_path_isfile("submodules/.gitmodules"));
 
        cl_git_pass(
                git_status_foreach(g_repo, cb_status__count, &counts)
@@ -71,12 +71,12 @@ static int cb_status__match(const char *p, unsigned int s, void *payload)
        int idx = counts->entry_count++;
 
        clar__assert_equal(
-               counts->file, counts->line,
+               counts->file, counts->func, counts->line,
                "Status path mismatch", 1,
                "%s", counts->expected_paths[idx], p);
 
        clar__assert_equal(
-               counts->file, counts->line,
+               counts->file, counts->func, counts->line,
                "Status code mismatch", 1,
                "%o", counts->expected_statuses[idx], s);
 
@@ -89,9 +89,9 @@ void test_status_submodules__1(void)
 
        g_repo = setup_fixture_submodules();
 
-       cl_assert(git_path_isdir("submodules/.git"));
-       cl_assert(git_path_isdir("submodules/testrepo/.git"));
-       cl_assert(git_path_isfile("submodules/.gitmodules"));
+       cl_assert(git_fs_path_isdir("submodules/.git"));
+       cl_assert(git_fs_path_isdir("submodules/testrepo/.git"));
+       cl_assert(git_fs_path_isfile("submodules/.gitmodules"));
 
        status_counts_init(counts, expected_files, expected_status);