Commit c515b5bf by Carlos Martín Nieto

Add test for renaming a file and adding it to the index

Thanks to Emeric.
parent 472d4d85
...@@ -85,6 +85,7 @@ extern void test_core_strtol__int64(void); ...@@ -85,6 +85,7 @@ extern void test_core_strtol__int64(void);
extern void test_core_vector__0(void); extern void test_core_vector__0(void);
extern void test_core_vector__1(void); extern void test_core_vector__1(void);
extern void test_core_vector__2(void); extern void test_core_vector__2(void);
extern void test_index_rename__single_file(void);
extern void test_network_remotes__cleanup(void); extern void test_network_remotes__cleanup(void);
extern void test_network_remotes__fnmatch(void); extern void test_network_remotes__fnmatch(void);
extern void test_network_remotes__initialize(void); extern void test_network_remotes__initialize(void);
......
...@@ -146,6 +146,9 @@ static const struct clay_func _clay_cb_core_vector[] = { ...@@ -146,6 +146,9 @@ static const struct clay_func _clay_cb_core_vector[] = {
{"1", &test_core_vector__1}, {"1", &test_core_vector__1},
{"2", &test_core_vector__2} {"2", &test_core_vector__2}
}; };
static const struct clay_func _clay_cb_index_rename[] = {
{"single_file", &test_index_rename__single_file}
};
static const struct clay_func _clay_cb_network_remotes[] = { static const struct clay_func _clay_cb_network_remotes[] = {
{"fnmatch", &test_network_remotes__fnmatch}, {"fnmatch", &test_network_remotes__fnmatch},
{"parsing", &test_network_remotes__parsing}, {"parsing", &test_network_remotes__parsing},
...@@ -267,6 +270,12 @@ static const struct clay_suite _clay_suites[] = { ...@@ -267,6 +270,12 @@ static const struct clay_suite _clay_suites[] = {
_clay_cb_core_vector, 3 _clay_cb_core_vector, 3
}, },
{ {
"index::rename",
{NULL, NULL},
{NULL, NULL},
_clay_cb_index_rename, 1
},
{
"network::remotes", "network::remotes",
{"initialize", &test_network_remotes__initialize}, {"initialize", &test_network_remotes__initialize},
{"cleanup", &test_network_remotes__cleanup}, {"cleanup", &test_network_remotes__cleanup},
...@@ -340,8 +349,8 @@ static const struct clay_suite _clay_suites[] = { ...@@ -340,8 +349,8 @@ static const struct clay_suite _clay_suites[] = {
} }
}; };
static size_t _clay_suite_count = 21; static size_t _clay_suite_count = 22;
static size_t _clay_callback_count = 64; static size_t _clay_callback_count = 65;
/* Core test functions */ /* Core test functions */
static void static void
......
#include "clay_libgit2.h"
#include "posix.h"
static void file_create(const char *filename, const char *content)
{
int fd;
fd = p_creat(filename, 0666);
cl_assert(fd != 0);
cl_git_pass(p_write(fd, content, strlen(content)));
cl_git_pass(p_close(fd))
}
void test_index_rename__single_file(void)
{
git_repository *repo;
git_index *index;
int position;
git_oid expected;
git_index_entry *entry;
p_mkdir("rename", 0700);
cl_git_pass(git_repository_init(&repo, "./rename", 0));
cl_git_pass(git_repository_index(&index, repo));
cl_assert(git_index_entrycount(index) == 0);
file_create("./rename/lame.name.txt", "new_file\n");
/* This should add a new blob to the object database in 'd4/fa8600b4f37d7516bef4816ae2c64dbf029e3a' */
cl_git_pass(git_index_add(index, "lame.name.txt", 0));
cl_assert(git_index_entrycount(index) == 1);
cl_git_pass(git_oid_fromstr(&expected, "d4fa8600b4f37d7516bef4816ae2c64dbf029e3a"));
position = git_index_find(index, "lame.name.txt");
entry = git_index_get(index, position);
cl_assert(git_oid_cmp(&expected, &entry->oid) == 0);
/* This removes the entry from the index, but not from the object database */
cl_git_pass(git_index_remove(index, position));
cl_assert(git_index_entrycount(index) == 0);
p_rename("./rename/lame.name.txt", "./rename/fancy.name.txt");
cl_git_pass(git_index_add(index, "fancy.name.txt", 0));
cl_assert(git_index_entrycount(index) == 1);
position = git_index_find(index, "fancy.name.txt");
entry = git_index_get(index, position);
cl_assert(git_oid_cmp(&expected, &entry->oid) == 0);
git_index_free(index);
git_repository_free(repo);
cl_fixture_cleanup("rename");
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment