mirror of
https://github.com/git/git.git
synced 2026-03-06 07:19:08 +01:00
Replace oidmap's use of hashmap_clear_() and layout-dependent freeing with an explicit iteration and optional free callback. This removes reliance on struct layout assumptions while keeping the existing API intact. Add tests for oidmap_clear_with_free behavior. test_oidmap__clear_with_free_callback verifies that entries are freed when a callback is provided, while test_oidmap__clear_without_free_callback verifies that entries are not freed when no callback is given. These tests ensure the new clear implementation behaves correctly and preserves ownership semantics. Signed-off-by: Seyi Kuforiji <kuforiji98@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
178 lines
3.8 KiB
C
178 lines
3.8 KiB
C
#include "unit-test.h"
|
|
#include "lib-oid.h"
|
|
#include "oidmap.h"
|
|
#include "hash.h"
|
|
#include "hex.h"
|
|
|
|
/*
|
|
* Elements we will put in oidmap structs are made of a key: the entry.oid
|
|
* field, which is of type struct object_id, and a value: the name field (could
|
|
* be a refname for example).
|
|
*/
|
|
struct test_entry {
|
|
struct oidmap_entry entry;
|
|
char name[FLEX_ARRAY];
|
|
};
|
|
|
|
static int freed;
|
|
|
|
static void test_free_fn(void *p) {
|
|
freed++;
|
|
free(p);
|
|
}
|
|
|
|
static const char *const key_val[][2] = { { "11", "one" },
|
|
{ "22", "two" },
|
|
{ "33", "three" } };
|
|
|
|
static struct oidmap map;
|
|
|
|
void test_oidmap__initialize(void)
|
|
{
|
|
oidmap_init(&map, 0);
|
|
|
|
for (size_t i = 0; i < ARRAY_SIZE(key_val); i++){
|
|
struct test_entry *entry;
|
|
|
|
FLEX_ALLOC_STR(entry, name, key_val[i][1]);
|
|
cl_parse_any_oid(key_val[i][0], &entry->entry.oid);
|
|
cl_assert(oidmap_put(&map, entry) == NULL);
|
|
}
|
|
}
|
|
|
|
void test_oidmap__cleanup(void)
|
|
{
|
|
oidmap_clear(&map, 1);
|
|
}
|
|
|
|
void test_oidmap__replace(void)
|
|
{
|
|
struct test_entry *entry, *prev;
|
|
|
|
FLEX_ALLOC_STR(entry, name, "un");
|
|
cl_parse_any_oid("11", &entry->entry.oid);
|
|
prev = oidmap_put(&map, entry);
|
|
cl_assert(prev != NULL);
|
|
cl_assert_equal_s(prev->name, "one");
|
|
free(prev);
|
|
|
|
FLEX_ALLOC_STR(entry, name, "deux");
|
|
cl_parse_any_oid("22", &entry->entry.oid);
|
|
prev = oidmap_put(&map, entry);
|
|
cl_assert(prev != NULL);
|
|
cl_assert_equal_s(prev->name, "two");
|
|
free(prev);
|
|
}
|
|
|
|
void test_oidmap__get(void)
|
|
{
|
|
struct test_entry *entry;
|
|
struct object_id oid;
|
|
|
|
cl_parse_any_oid("22", &oid);
|
|
entry = oidmap_get(&map, &oid);
|
|
cl_assert(entry != NULL);
|
|
cl_assert_equal_s(entry->name, "two");
|
|
|
|
cl_parse_any_oid("44", &oid);
|
|
cl_assert(oidmap_get(&map, &oid) == NULL);
|
|
|
|
cl_parse_any_oid("11", &oid);
|
|
entry = oidmap_get(&map, &oid);
|
|
cl_assert(entry != NULL);
|
|
cl_assert_equal_s(entry->name, "one");
|
|
}
|
|
|
|
void test_oidmap__remove(void)
|
|
{
|
|
struct test_entry *entry;
|
|
struct object_id oid;
|
|
|
|
cl_parse_any_oid("11", &oid);
|
|
entry = oidmap_remove(&map, &oid);
|
|
cl_assert(entry != NULL);
|
|
cl_assert_equal_s(entry->name, "one");
|
|
cl_assert(oidmap_get(&map, &oid) == NULL);
|
|
free(entry);
|
|
|
|
cl_parse_any_oid("22", &oid);
|
|
entry = oidmap_remove(&map, &oid);
|
|
cl_assert(entry != NULL);
|
|
cl_assert_equal_s(entry->name, "two");
|
|
cl_assert(oidmap_get(&map, &oid) == NULL);
|
|
free(entry);
|
|
|
|
cl_parse_any_oid("44", &oid);
|
|
cl_assert(oidmap_remove(&map, &oid) == NULL);
|
|
}
|
|
|
|
static int key_val_contains(struct test_entry *entry, char seen[])
|
|
{
|
|
for (size_t i = 0; i < ARRAY_SIZE(key_val); i++) {
|
|
struct object_id oid;
|
|
|
|
cl_parse_any_oid(key_val[i][0], &oid);
|
|
|
|
if (oideq(&entry->entry.oid, &oid)) {
|
|
if (seen[i])
|
|
return 2;
|
|
seen[i] = 1;
|
|
return 0;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
void test_oidmap__iterate(void)
|
|
{
|
|
struct oidmap_iter iter;
|
|
struct test_entry *entry;
|
|
char seen[ARRAY_SIZE(key_val)] = { 0 };
|
|
int count = 0;
|
|
|
|
oidmap_iter_init(&map, &iter);
|
|
while ((entry = oidmap_iter_next(&iter))) {
|
|
if (key_val_contains(entry, seen) != 0) {
|
|
cl_failf("Unexpected entry: name = %s, oid = %s",
|
|
entry->name, oid_to_hex(&entry->entry.oid));
|
|
}
|
|
count++;
|
|
}
|
|
cl_assert_equal_i(count, ARRAY_SIZE(key_val));
|
|
cl_assert_equal_i(hashmap_get_size(&map.map), ARRAY_SIZE(key_val));
|
|
}
|
|
|
|
void test_oidmap__clear_without_free_callback(void)
|
|
{
|
|
struct oidmap local_map = OIDMAP_INIT;
|
|
struct test_entry *entry;
|
|
|
|
freed = 0;
|
|
|
|
FLEX_ALLOC_STR(entry, name, "one");
|
|
cl_parse_any_oid("11", &entry->entry.oid);
|
|
cl_assert(oidmap_put(&local_map, entry) == NULL);
|
|
|
|
oidmap_clear_with_free(&local_map, NULL);
|
|
|
|
cl_assert_equal_i(freed, 0);
|
|
|
|
free(entry);
|
|
}
|
|
|
|
void test_oidmap__clear_with_free_callback(void)
|
|
{
|
|
struct oidmap local_map = OIDMAP_INIT;
|
|
struct test_entry *entry;
|
|
|
|
freed = 0;
|
|
|
|
FLEX_ALLOC_STR(entry, name, "one");
|
|
cl_parse_any_oid("11", &entry->entry.oid);
|
|
cl_assert(oidmap_put(&local_map, entry) == NULL);
|
|
|
|
oidmap_clear_with_free(&local_map, test_free_fn);
|
|
|
|
cl_assert_equal_i(freed, 1);
|
|
}
|