From 3c3f1115f6e9a9b914e2dcbd796501ca7ce85342 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 19 Feb 2020 02:51:44 +0100 Subject: Tested ht* --- test/src/ht/test_ft_htset.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'test/src/ht/test_ft_htset.c') diff --git a/test/src/ht/test_ft_htset.c b/test/src/ht/test_ft_htset.c index c4b53b9..f161206 100644 --- a/test/src/ht/test_ft_htset.c +++ b/test/src/ht/test_ft_htset.c @@ -11,7 +11,13 @@ TEST_SETUP(ft_htset) TEST_TEAR_DOWN(ft_htset) { - ft_htdestroy_key(ht); + /* ft_htdestroy_key(ht); */ +} + +static void st_del(t_ftht_content *c) +{ + free(c->key); + free(c); } TEST(ft_htset, segfault) @@ -51,20 +57,19 @@ TEST(ft_htset, reset) small = ft_htnew(3); - t_ftht_content *content = ft_htset(ht, "bonjour", strdup("content"), free); + t_ftht_content *content = ft_htset(small, "bonjour", ft_strdup("content"), st_del); TEST_ASSERT_NOT_NULL(content); TEST_ASSERT_NOT_NULL(content->key); TEST_ASSERT_NOT_NULL(content->value); TEST_ASSERT_EQUAL_STRING(content->key, "bonjour"); TEST_ASSERT_EQUAL_STRING(content->value, "content"); - t_ftht_content *content_re = ft_htset(ht, "bonjour", strdup("yo"), free); + t_ftht_content *content_re = ft_htset(small, "bonjour", ft_strdup("yo"), st_del); TEST_ASSERT_NOT_NULL(content_re); - TEST_ASSERT_EQUAL_PTR(content, content_re); TEST_ASSERT_NOT_NULL(content_re->key); TEST_ASSERT_NOT_NULL(content_re->value); - TEST_ASSERT_EQUAL_STRING(content_re->key, "bonjour"); - TEST_ASSERT_EQUAL_STRING(content_re->value, "yo"); + TEST_ASSERT_EQUAL_STRING("bonjour", content_re->key); + TEST_ASSERT_EQUAL_STRING("yo", content_re->value); } TEST(ft_htset, collision) @@ -72,21 +77,21 @@ TEST(ft_htset, collision) t_ftht *small = NULL; small = ft_htnew(1); - t_ftht_content *content1 = ft_htset(ht, "bonjour", strdup("content1"), free); + t_ftht_content *content1 = ft_htset(ht, "bonjour", strdup("content1"), st_del); TEST_ASSERT_NOT_NULL(content1); TEST_ASSERT_NOT_NULL(content1->key); TEST_ASSERT_NOT_NULL(content1->value); TEST_ASSERT_EQUAL_STRING(content1->key, "bonjour"); TEST_ASSERT_EQUAL_STRING(content1->value, "content1"); - t_ftht_content *content2 = ft_htset(ht, "aurevoir", strdup("content2"), free); + t_ftht_content *content2 = ft_htset(ht, "aurevoir", strdup("content2"), st_del); TEST_ASSERT_NOT_NULL(content2); TEST_ASSERT_NOT_NULL(content2->key); TEST_ASSERT_NOT_NULL(content2->value); TEST_ASSERT_EQUAL_STRING(content2->key, "aurevoir"); TEST_ASSERT_EQUAL_STRING(content2->value, "content2"); - t_ftht_content *content3 = ft_htset(ht, "aloa", strdup("content3"), free); + t_ftht_content *content3 = ft_htset(ht, "aloa", strdup("content3"), st_del); TEST_ASSERT_NOT_NULL(content3); TEST_ASSERT_NOT_NULL(content3->key); TEST_ASSERT_NOT_NULL(content3->value); -- cgit