thodg/libgit2

diff --git a/tests/generate.py b/tests/generate.py
index 0a94d49..572a57f 100644
--- a/tests/generate.py
+++ b/tests/generate.py
@@ -24,8 +24,8 @@ class Module(object):
         def render(self):
             out = "\n".join("extern %s;" % cb['declaration'] for cb in self.module.callbacks) + "\n"
 
-            if self.module.initialize:
-                out += "extern %s;\n" % self.module.initialize['declaration']
+            for initializer in self.module.initializers:
+                out += "extern %s;\n" % initializer['declaration']
 
             if self.module.cleanup:
                 out += "extern %s;\n" % self.module.cleanup['declaration']
@@ -41,7 +41,19 @@ class Module(object):
 
     class InfoTemplate(Template):
         def render(self):
-            return Template(
+            templates = []
+
+            initializers = self.module.initializers
+            if len(initializers) == 0:
+                initializers = [ None ]
+
+            for initializer in initializers:
+                name = self.module.clean_name()
+                if initializer and initializer['short_name'].startswith('initialize_'):
+                    variant = initializer['short_name'][len('initialize_'):]
+                    name += " (%s)" % variant.replace('_', ' ')
+
+                template = Template(
             r"""
     {
         "${clean_name}",
@@ -49,14 +61,17 @@ class Module(object):
     ${cleanup},
         ${cb_ptr}, ${cb_count}, ${enabled}
     }"""
-            ).substitute(
-                clean_name = self.module.clean_name(),
-                initialize = self._render_callback(self.module.initialize),
-                cleanup = self._render_callback(self.module.cleanup),
-                cb_ptr = "_clar_cb_%s" % self.module.name,
-                cb_count = len(self.module.callbacks),
-                enabled = int(self.module.enabled)
-            )
+                ).substitute(
+                    clean_name = name,
+                    initialize = self._render_callback(initializer),
+                    cleanup = self._render_callback(self.module.cleanup),
+                    cb_ptr = "_clar_cb_%s" % self.module.name,
+                    cb_count = len(self.module.callbacks),
+                    enabled = int(self.module.enabled)
+                )
+                templates.append(template)
+
+            return ','.join(templates)
 
     def __init__(self, name):
         self.name = name
@@ -86,7 +101,7 @@ class Module(object):
         regex = re.compile(TEST_FUNC_REGEX % self.name, re.MULTILINE)
 
         self.callbacks = []
-        self.initialize = None
+        self.initializers = []
         self.cleanup = None
 
         for (declaration, symbol, short_name) in regex.findall(contents):
@@ -96,8 +111,8 @@ class Module(object):
                 "symbol" : symbol
             }
 
-            if short_name == 'initialize':
-                self.initialize = data
+            if short_name.startswith('initialize'):
+                self.initializers.append(data)
             elif short_name == 'cleanup':
                 self.cleanup = data
             else:
diff --git a/tests/object/cache.c b/tests/object/cache.c
index d3ec53a..3ccc325 100644
--- a/tests/object/cache.c
+++ b/tests/object/cache.c
@@ -2,10 +2,35 @@
 #include "repository.h"
 
 static git_repository *g_repo;
+static size_t cache_limit;
+static int object_type;
 
-void test_object_cache__initialize(void)
+void test_object_cache__initialize_cache_no_blobs(void)
 {
 	g_repo = NULL;
+	object_type = GIT_OBJECT_BLOB;
+	cache_limit = 0;
+}
+
+void test_object_cache__initialize_cache_tiny_blobs(void)
+{
+	g_repo = NULL;
+	object_type = GIT_OBJECT_BLOB;
+	cache_limit = 10;
+}
+
+void test_object_cache__initialize_cache_all_blobs(void)
+{
+	g_repo = NULL;
+	object_type = GIT_OBJECT_BLOB;
+	cache_limit = 32767;
+}
+
+void test_object_cache__initialize_cache_no_trees(void)
+{
+	g_repo = NULL;
+	object_type = GIT_OBJECT_TREE;
+	cache_limit = 0;
 }
 
 void test_object_cache__cleanup(void)
@@ -14,47 +39,49 @@ void test_object_cache__cleanup(void)
 	g_repo = NULL;
 
 	git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJECT_BLOB, (size_t)0);
+	git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJECT_TREE, (size_t)4096);
+	git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJECT_COMMIT, (size_t)4096);
 }
 
 static struct {
 	git_object_t type;
 	const char *sha;
+	size_t size;
 } g_data[] = {
 	/* HEAD */
-	{ GIT_OBJECT_BLOB, "a8233120f6ad708f843d861ce2b7228ec4e3dec6" }, /* README */
-	{ GIT_OBJECT_BLOB, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc" }, /* branch_file.txt */
-	{ GIT_OBJECT_BLOB, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd" }, /* new.txt */
+	{ GIT_OBJECT_BLOB, "a8233120f6ad708f843d861ce2b7228ec4e3dec6", 10 }, /* README */
+	{ GIT_OBJECT_BLOB, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc",  8 }, /* branch_file.txt */
+	{ GIT_OBJECT_BLOB, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd", 12 }, /* new.txt */
 
 	/* refs/heads/subtrees */
-	{ GIT_OBJECT_BLOB, "1385f264afb75a56a5bec74243be9b367ba4ca08" }, /* README */
-	{ GIT_OBJECT_TREE, "f1425cef211cc08caa31e7b545ffb232acb098c3" }, /* ab */
-	{ GIT_OBJECT_BLOB, "d6c93164c249c8000205dd4ec5cbca1b516d487f" }, /* ab/4.txt */
-	{ GIT_OBJECT_TREE, "9a03079b8a8ee85a0bee58bf9be3da8b62414ed4" }, /* ab/c */
-	{ GIT_OBJECT_BLOB, "270b8ea76056d5cad83af921837702d3e3c2924d" }, /* ab/c/3.txt */
-	{ GIT_OBJECT_TREE, "b6361fc6a97178d8fc8639fdeed71c775ab52593" }, /* ab/de */
-	{ GIT_OBJECT_BLOB, "e7b4ad382349ff96dd8199000580b9b1e2042eb0" }, /* ab/de/2.txt */
-	{ GIT_OBJECT_TREE, "3259a6bd5b57fb9c1281bb7ed3167b50f224cb54" }, /* ab/de/fgh */
-	{ GIT_OBJECT_BLOB, "1f67fc4386b2d171e0d21be1c447e12660561f9b" }, /* ab/de/fgh/1.txt */
-	{ GIT_OBJECT_BLOB, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057" }, /* branch_file.txt */
-	{ GIT_OBJECT_BLOB, "fa49b077972391ad58037050f2a75f74e3671e92" }, /* new.txt */
+	{ GIT_OBJECT_BLOB, "1385f264afb75a56a5bec74243be9b367ba4ca08",  4 }, /* README */
+	{ GIT_OBJECT_TREE, "f1425cef211cc08caa31e7b545ffb232acb098c3", 90 }, /* ab */
+	{ GIT_OBJECT_BLOB, "d6c93164c249c8000205dd4ec5cbca1b516d487f",  6 }, /* ab/4.txt */
+	{ GIT_OBJECT_TREE, "9a03079b8a8ee85a0bee58bf9be3da8b62414ed4", 33 }, /* ab/c */
+	{ GIT_OBJECT_BLOB, "270b8ea76056d5cad83af921837702d3e3c2924d",  6 }, /* ab/c/3.txt */
+	{ GIT_OBJECT_TREE, "b6361fc6a97178d8fc8639fdeed71c775ab52593", 63 }, /* ab/de */
+	{ GIT_OBJECT_BLOB, "e7b4ad382349ff96dd8199000580b9b1e2042eb0",  6 }, /* ab/de/2.txt */
+	{ GIT_OBJECT_TREE, "3259a6bd5b57fb9c1281bb7ed3167b50f224cb54", 33 }, /* ab/de/fgh */
+	{ GIT_OBJECT_BLOB, "1f67fc4386b2d171e0d21be1c447e12660561f9b",  6 }, /* ab/de/fgh/1.txt */
+	{ GIT_OBJECT_BLOB, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057",  3 }, /* branch_file.txt */
+	{ GIT_OBJECT_BLOB, "fa49b077972391ad58037050f2a75f74e3671e92",  9 }, /* new.txt */
 
 	/* refs/heads/chomped */
-	{ GIT_OBJECT_BLOB, "0266163a49e280c4f5ed1e08facd36a2bd716bcf" }, /* readme.txt */
+	{ GIT_OBJECT_BLOB, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", 51 }, /* readme.txt */
 
-	{ 0, NULL },
-	{ 0, NULL }
+	{ 0, NULL, 0 },
+	{ 0, NULL, 0 }
 };
 
-void test_object_cache__cache_everything(void)
+void test_object_cache__cache_counts(void)
 {
-	int i, start;
+	int i, start, nonmatching = 0;
 	git_oid oid;
 	git_odb_object *odb_obj;
 	git_object *obj;
 	git_odb *odb;
 
-	git_libgit2_opts(
-		GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJECT_BLOB, (size_t)32767);
+	git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, object_type, cache_limit);
 
 	cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git")));
 	cl_git_pass(git_repository_odb(&odb, g_repo));
@@ -77,12 +104,16 @@ void test_object_cache__cache_everything(void)
 			git_object_free(obj);
 		}
 
-		cl_assert_equal_i(count + 1, (int)git_cache_size(&g_repo->objects));
+		if ((g_data[i].type == object_type && g_data[i].size >= cache_limit) ||
+		    (g_data[i].type != object_type && g_data[i].type == GIT_OBJECT_BLOB))
+			cl_assert_equal_i(count, (int)git_cache_size(&g_repo->objects));
+		else {
+			cl_assert_equal_i(count + 1, (int)git_cache_size(&g_repo->objects));
+			nonmatching++;
+		}
 	}
 
-	cl_assert_equal_i(i, (int)git_cache_size(&g_repo->objects) - start);
-
-	git_odb_free(odb);
+	cl_assert_equal_i(nonmatching, (int)git_cache_size(&g_repo->objects) - start);
 
 	for (i = 0; g_data[i].sha != NULL; ++i) {
 		int count = (int)git_cache_size(&g_repo->objects);
@@ -94,48 +125,6 @@ void test_object_cache__cache_everything(void)
 
 		cl_assert_equal_i(count, (int)git_cache_size(&g_repo->objects));
 	}
-}
-
-void test_object_cache__cache_no_blobs(void)
-{
-	int i, start, nonblobs = 0;
-	git_oid oid;
-	git_odb_object *odb_obj;
-	git_object *obj;
-	git_odb *odb;
-
-	git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJECT_BLOB, (size_t)0);
-
-	cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git")));
-	cl_git_pass(git_repository_odb(&odb, g_repo));
-
-	start = (int)git_cache_size(&g_repo->objects);
-
-	for (i = 0; g_data[i].sha != NULL; ++i) {
-		int count = (int)git_cache_size(&g_repo->objects);
-
-		cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha));
-
-		/* alternate between loading raw and parsed objects */
-		if ((i & 1) == 0) {
-			cl_git_pass(git_odb_read(&odb_obj, odb, &oid));
-			cl_assert(g_data[i].type == git_odb_object_type(odb_obj));
-			git_odb_object_free(odb_obj);
-		} else {
-			cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
-			cl_assert(g_data[i].type == git_object_type(obj));
-			git_object_free(obj);
-		}
-
-		if (g_data[i].type == GIT_OBJECT_BLOB)
-			cl_assert_equal_i(count, (int)git_cache_size(&g_repo->objects));
-		else {
-			cl_assert_equal_i(count + 1, (int)git_cache_size(&g_repo->objects));
-			nonblobs++;
-		}
-	}
-
-	cl_assert_equal_i(nonblobs, (int)git_cache_size(&g_repo->objects) - start);
 
 	git_odb_free(odb);
 }