diff options
Diffstat (limited to 'tests-clar/object/tree/attributes.c')
| -rw-r--r-- | tests-clar/object/tree/attributes.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/tests-clar/object/tree/attributes.c b/tests-clar/object/tree/attributes.c index ed88e7486..054f67137 100644 --- a/tests-clar/object/tree/attributes.c +++ b/tests-clar/object/tree/attributes.c @@ -4,9 +4,6 @@ static const char *blob_oid = "3d0970ec547fc41ef8a5882dde99c6adce65b021"; static const char *tree_oid = "1b05fdaa881ee45b48cbaa5e9b037d667a47745e"; -#define GROUP_WRITABLE_FILE 0100664 -#define REGULAR_FILE 0100644 - void test_object_tree_attributes__ensure_correctness_of_attributes_on_insertion(void) { git_treebuilder *builder; @@ -16,9 +13,9 @@ void test_object_tree_attributes__ensure_correctness_of_attributes_on_insertion( cl_git_pass(git_treebuilder_create(&builder, NULL)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, 0777777)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, 0100666)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, 0000001)); + cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, (git_filemode_t)0777777)); + cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, (git_filemode_t)0100666)); + cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, (git_filemode_t)0000001)); git_treebuilder_free(builder); } @@ -37,8 +34,8 @@ void test_object_tree_attributes__group_writable_tree_entries_created_with_an_an entry = git_tree_entry_byname(tree, "old_mode.txt"); cl_assert_equal_i( - GROUP_WRITABLE_FILE, - git_tree_entry_attributes(entry)); + GIT_FILEMODE_BLOB_GROUP_WRITABLE, + git_tree_entry_filemode(entry)); git_tree_free(tree); git_repository_free(repo); @@ -63,11 +60,11 @@ void test_object_tree_attributes__normalize_attributes_when_inserting_in_a_new_t builder, "normalized.txt", &bid, - GROUP_WRITABLE_FILE)); + GIT_FILEMODE_BLOB_GROUP_WRITABLE)); cl_assert_equal_i( - REGULAR_FILE, - git_tree_entry_attributes(entry)); + GIT_FILEMODE_BLOB, + git_tree_entry_filemode(entry)); cl_git_pass(git_treebuilder_write(&tid, repo, builder)); git_treebuilder_free(builder); @@ -76,8 +73,8 @@ void test_object_tree_attributes__normalize_attributes_when_inserting_in_a_new_t entry = git_tree_entry_byname(tree, "normalized.txt"); cl_assert_equal_i( - REGULAR_FILE, - git_tree_entry_attributes(entry)); + GIT_FILEMODE_BLOB, + git_tree_entry_filemode(entry)); git_tree_free(tree); cl_git_sandbox_cleanup(); @@ -100,8 +97,8 @@ void test_object_tree_attributes__normalize_attributes_when_creating_a_tree_from entry = git_treebuilder_get(builder, "old_mode.txt"); cl_assert_equal_i( - REGULAR_FILE, - git_tree_entry_attributes(entry)); + GIT_FILEMODE_BLOB, + git_tree_entry_filemode(entry)); cl_git_pass(git_treebuilder_write(&tid2, repo, builder)); git_treebuilder_free(builder); @@ -110,8 +107,8 @@ void test_object_tree_attributes__normalize_attributes_when_creating_a_tree_from cl_git_pass(git_tree_lookup(&tree, repo, &tid2)); entry = git_tree_entry_byname(tree, "old_mode.txt"); cl_assert_equal_i( - REGULAR_FILE, - git_tree_entry_attributes(entry)); + GIT_FILEMODE_BLOB, + git_tree_entry_filemode(entry)); git_tree_free(tree); cl_git_sandbox_cleanup(); |