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 b0bb4524f3bdaa946cba8c54cea1f667db9f787d..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);
 
@@ -143,7 +143,7 @@ void test_status_submodules__moved_head(void)
        /* move submodule HEAD to c47800c7266a2be04c571c04d5a6614691ea99bd */
        cl_git_pass(
                git_oid_fromstr(&oid, "c47800c7266a2be04c571c04d5a6614691ea99bd"));
-       cl_git_pass(git_repository_set_head_detached(smrepo, &oid, NULL, NULL));
+       cl_git_pass(git_repository_set_head_detached(smrepo, &oid));
 
        /* first do a normal status, which should now include the submodule */
 
@@ -503,7 +503,7 @@ void test_status_submodules__entry_but_dir_tracked(void)
                cl_git_pass(git_signature_now(&sig, "Sloppy Submoduler", "sloppy@example.com"));
                cl_git_pass(git_tree_lookup(&tree, repo, &tree_id));
                cl_git_pass(git_commit_create(&commit_id, repo, NULL, sig, sig, NULL, "message", tree, 0, NULL));
-               cl_git_pass(git_reference_create(&ref, repo, "refs/heads/master", &commit_id, 1, sig, "commit: foo"));
+               cl_git_pass(git_reference_create(&ref, repo, "refs/heads/master", &commit_id, 1, "commit: foo"));
                git_reference_free(ref);
                git_signature_free(sig);
        }
@@ -524,3 +524,40 @@ void test_status_submodules__entry_but_dir_tracked(void)
        git_tree_free(tree);
        git_repository_free(repo);
 }
+
+void test_status_submodules__mixed_case(void)
+{
+       git_status_list *status;
+       git_status_options status_opts = GIT_STATUS_OPTIONS_INIT;
+       const git_status_entry *s;
+       size_t i;
+
+       status_opts.flags =
+               GIT_STATUS_OPT_INCLUDE_UNTRACKED |
+               GIT_STATUS_OPT_INCLUDE_IGNORED |
+               GIT_STATUS_OPT_INCLUDE_UNMODIFIED |
+               GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS |
+               GIT_STATUS_OPT_RECURSE_IGNORED_DIRS |
+               GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
+               GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR |
+               GIT_STATUS_OPT_RENAMES_FROM_REWRITES |
+               GIT_STATUS_OPT_INCLUDE_UNREADABLE |
+               GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED;
+
+    g_repo = setup_fixture_submod3();
+
+       cl_git_pass(git_status_list_new(&status, g_repo, &status_opts));
+
+       for (i = 0; i < git_status_list_entrycount(status); i++) {
+               s = git_status_byindex(status, i);
+
+               if (s->head_to_index &&
+                       strcmp(s->head_to_index->old_file.path, ".gitmodules") == 0)
+                       continue;
+
+               cl_assert_equal_i(0, s->status);
+       }
+
+       git_status_list_free(status);
+}
+