From dd5d60dc4cf8052feb00847f9b2276cf105b0551 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 30 Mar 2020 22:43:25 +0200 Subject: Renaming test according to src --- test/src/ht/test_ft_htcontent_new.c | 43 ------------------------------------- test/src/ht/test_ft_htdelone.c | 2 +- test/src/ht/test_ft_htdestroy.c | 2 +- test/src/ht/test_ft_htget.c | 2 +- test/src/ht/test_ft_htnew.c | 4 ++-- test/src/ht/test_ft_htset.c | 16 +++++++------- test/src/ht/test_ftht_entry_new.c | 43 +++++++++++++++++++++++++++++++++++++ 7 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 test/src/ht/test_ft_htcontent_new.c create mode 100644 test/src/ht/test_ftht_entry_new.c (limited to 'test/src/ht') diff --git a/test/src/ht/test_ft_htcontent_new.c b/test/src/ht/test_ft_htcontent_new.c deleted file mode 100644 index 6993581..0000000 --- a/test/src/ht/test_ft_htcontent_new.c +++ /dev/null @@ -1,43 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* test_ft_htcontent_new.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/02/17 04:07:04 by cacharle #+# #+# */ -/* Updated: 2020/02/17 04:15:39 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft_test.h" - -TEST_GROUP(ft_htcontent_new); - -TEST_SETUP(ft_htcontent_new) -{} - -TEST_TEAR_DOWN(ft_htcontent_new) -{} - -TEST(ft_htcontent_new, basic) -{ - t_ftht_content *c = NULL; - - char *k = "bonjour"; - c = ft_htcontent_new(k, NULL); - TEST_ASSERT_NOT_NULL(c); - TEST_ASSERT(k != c->key); - TEST_ASSERT_EQUAL_STRING(k, c->key); - TEST_ASSERT_NULL(c->value); - - c = ft_htcontent_new(k, k); - TEST_ASSERT_NOT_NULL(c); - TEST_ASSERT(k != c->key); - TEST_ASSERT_EQUAL_STRING(k, c->key); - TEST_ASSERT_EQUAL_PTR(k, c->value); - TEST_ASSERT_EQUAL_STRING(k, (char*)c->value); - - /* free(c->key); */ - /* free(c); */ -} diff --git a/test/src/ht/test_ft_htdelone.c b/test/src/ht/test_ft_htdelone.c index 3bc0922..5ba4822 100644 --- a/test/src/ht/test_ft_htdelone.c +++ b/test/src/ht/test_ft_htdelone.c @@ -20,7 +20,7 @@ TEST_SETUP(ft_htdelone) TEST_TEAR_DOWN(ft_htdelone) {} -static void st_del(t_ftht_content *v) +static void st_del(t_ftht_entry *v) { free(v->key); free(v); diff --git a/test/src/ht/test_ft_htdestroy.c b/test/src/ht/test_ft_htdestroy.c index 360a7a0..1512a48 100644 --- a/test/src/ht/test_ft_htdestroy.c +++ b/test/src/ht/test_ft_htdestroy.c @@ -20,7 +20,7 @@ TEST_SETUP(ft_htdestroy) TEST_TEAR_DOWN(ft_htdestroy) {} -static void st_del(t_ftht_content *v) +static void st_del(t_ftht_entry *v) { free(v->key); free(v); diff --git a/test/src/ht/test_ft_htget.c b/test/src/ht/test_ft_htget.c index 5db06b7..386c3dc 100644 --- a/test/src/ht/test_ft_htget.c +++ b/test/src/ht/test_ft_htget.c @@ -16,7 +16,7 @@ TEST_TEAR_DOWN(ft_htget) int helper_segfault_pid; -static void st_del(t_ftht_content *c) +static void st_del(t_ftht_entry *c) { free(c->key); free(c); diff --git a/test/src/ht/test_ft_htnew.c b/test/src/ht/test_ft_htnew.c index 82e54bc..17bca6a 100644 --- a/test/src/ht/test_ft_htnew.c +++ b/test/src/ht/test_ft_htnew.c @@ -42,7 +42,7 @@ TEST(ft_htnew, happy_path) ht = ft_htnew(10); TEST_ASSERT_NOT_NULL(ht); TEST_ASSERT_EQUAL(10, ht->size); - TEST_ASSERT_NOT_NULL(ht->entries); + TEST_ASSERT_NOT_NULL(ht->buckets); for (t_ftsize i = 0; i < ht->size; i++) - TEST_ASSERT_NULL(ht->entries[i]); + TEST_ASSERT_NULL(ht->buckets[i]); } diff --git a/test/src/ht/test_ft_htset.c b/test/src/ht/test_ft_htset.c index f161206..96d848e 100644 --- a/test/src/ht/test_ft_htset.c +++ b/test/src/ht/test_ft_htset.c @@ -14,7 +14,7 @@ TEST_TEAR_DOWN(ft_htset) /* ft_htdestroy_key(ht); */ } -static void st_del(t_ftht_content *c) +static void st_del(t_ftht_entry *c) { free(c->key); free(c); @@ -43,7 +43,7 @@ TEST(ft_htset, error_null) TEST(ft_htset, happy_path) { - t_ftht_content *content = ft_htset(ht, "bonjour", strdup("content"), NULL); + t_ftht_entry *content = ft_htset(ht, "bonjour", strdup("content"), NULL); TEST_ASSERT_NOT_NULL(content); TEST_ASSERT_NOT_NULL(content->key); TEST_ASSERT_NOT_NULL(content->value); @@ -57,14 +57,14 @@ TEST(ft_htset, reset) small = ft_htnew(3); - t_ftht_content *content = ft_htset(small, "bonjour", ft_strdup("content"), st_del); + t_ftht_entry *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(small, "bonjour", ft_strdup("yo"), st_del); + + t_ftht_entry *content_re = ft_htset(small, "bonjour", ft_strdup("yo"), st_del); TEST_ASSERT_NOT_NULL(content_re); TEST_ASSERT_NOT_NULL(content_re->key); TEST_ASSERT_NOT_NULL(content_re->value); @@ -77,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"), st_del); + t_ftht_entry *content1 = ft_htset(small, "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"), st_del); + t_ftht_entry *content2 = ft_htset(small, "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"), st_del); + t_ftht_entry *content3 = ft_htset(small, "aloa", strdup("content3"), st_del); TEST_ASSERT_NOT_NULL(content3); TEST_ASSERT_NOT_NULL(content3->key); TEST_ASSERT_NOT_NULL(content3->value); diff --git a/test/src/ht/test_ftht_entry_new.c b/test/src/ht/test_ftht_entry_new.c new file mode 100644 index 0000000..a566600 --- /dev/null +++ b/test/src/ht/test_ftht_entry_new.c @@ -0,0 +1,43 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* test_ft_htentry_new.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/17 04:07:04 by cacharle #+# #+# */ +/* Updated: 2020/02/17 04:15:39 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft_test.h" + +TEST_GROUP(ft_htentry_new); + +TEST_SETUP(ft_htentry_new) +{} + +TEST_TEAR_DOWN(ft_htentry_new) +{} + +TEST(ft_htentry_new, basic) +{ + t_ftht_entry *c = NULL; + + char *k = "bonjour"; + c = ft_htentry_new(k, NULL); + TEST_ASSERT_NOT_NULL(c); + TEST_ASSERT(k != c->key); + TEST_ASSERT_EQUAL_STRING(k, c->key); + TEST_ASSERT_NULL(c->value); + + c = ft_htentry_new(k, k); + TEST_ASSERT_NOT_NULL(c); + TEST_ASSERT(k != c->key); + TEST_ASSERT_EQUAL_STRING(k, c->key); + TEST_ASSERT_EQUAL_PTR(k, c->value); + TEST_ASSERT_EQUAL_STRING(k, (char*)c->value); + + /* free(c->key); */ + /* free(c); */ +} -- cgit