From c515b5bf1e63455686ee1ab89152f3da6eca73a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <carlos@cmartin.tk>
Date: Fri, 18 Nov 2011 02:16:24 +0100
Subject: [PATCH] Add test for renaming a file and adding it to the index

Thanks to Emeric.
---
 tests-clay/clay.h         |  1 +
 tests-clay/clay_main.c    | 13 +++++++--
 tests-clay/index/rename.c | 60 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 tests-clay/index/rename.c

diff --git a/tests-clay/clay.h b/tests-clay/clay.h
index 15e1770e068..db3a475b259 100644
--- a/tests-clay/clay.h
+++ b/tests-clay/clay.h
@@ -85,6 +85,7 @@ extern void test_core_strtol__int64(void);
 extern void test_core_vector__0(void);
 extern void test_core_vector__1(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__fnmatch(void);
 extern void test_network_remotes__initialize(void);
diff --git a/tests-clay/clay_main.c b/tests-clay/clay_main.c
index 3a63dfefa47..4ad6fc467a9 100644
--- a/tests-clay/clay_main.c
+++ b/tests-clay/clay_main.c
@@ -146,6 +146,9 @@ static const struct clay_func _clay_cb_core_vector[] = {
 	{"1", &test_core_vector__1},
 	{"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[] = {
     {"fnmatch", &test_network_remotes__fnmatch},
 	{"parsing", &test_network_remotes__parsing},
@@ -265,6 +268,12 @@ static const struct clay_suite _clay_suites[] = {
         {NULL, NULL},
         {NULL, NULL},
         _clay_cb_core_vector, 3
+    },
+	{
+        "index::rename",
+        {NULL, NULL},
+        {NULL, NULL},
+        _clay_cb_index_rename, 1
     },
 	{
         "network::remotes",
@@ -340,8 +349,8 @@ static const struct clay_suite _clay_suites[] = {
     }
 };
 
-static size_t _clay_suite_count = 21;
-static size_t _clay_callback_count = 64;
+static size_t _clay_suite_count = 22;
+static size_t _clay_callback_count = 65;
 
 /* Core test functions */
 static void
diff --git a/tests-clay/index/rename.c b/tests-clay/index/rename.c
new file mode 100644
index 00000000000..ba72b62f73e
--- /dev/null
+++ b/tests-clay/index/rename.c
@@ -0,0 +1,60 @@
+#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");
+}