Merge branch 'minishell'

39 files changed, 669 insertions, 303 deletions

diff --git a/test/Makefile b/test/Makefile
index 5835c1c..cf065c6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -6,7 +6,7 @@
 #    By: cacharle <marvin@42.fr>                    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/02/15 04:35:44 by cacharle          #+#    #+#              #
-#    Updated: 2020/02/15 22:46:20 by cacharle         ###   ########.fr        #
+#    Updated: 2020/02/28 12:13:30 by cacharle         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
diff --git a/test/include/libft_test.h b/test/include/libft_test.h
index 23c39c3..efa15cd 100644
--- a/test/include/libft_test.h
+++ b/test/include/libft_test.h
@@ -18,9 +18,10 @@
 
 # include "libft.h"
 # include "libft_algo.h"
+# include "libft_lst.h"
 # include "libft_ht.h"
+# include "libft_vec.h"
 
 # include "helper/helper_segfault.h"
 
-
 #endif
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 6b90f03..17bca6a 100644
--- a/test/src/ht/test_ft_htnew.c
+++ b/test/src/ht/test_ft_htnew.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/12 22:30:06 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/17 04:18:20 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/28 12:15:32 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -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 5fb3af6..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(small, "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(small, "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(small, "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_ft_htcontent_new.c b/test/src/ht/test_ftht_entry_new.c
index 6993581..a566600 100644
--- a/test/src/ht/test_ft_htcontent_new.c
+++ b/test/src/ht/test_ftht_entry_new.c
@@ -1,7 +1,7 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   test_ft_htcontent_new.c                            :+:      :+:    :+:   */
+/*   test_ft_htentry_new.c                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
@@ -12,26 +12,26 @@
 
 #include "libft_test.h"
 
-TEST_GROUP(ft_htcontent_new);
+TEST_GROUP(ft_htentry_new);
 
-TEST_SETUP(ft_htcontent_new)
+TEST_SETUP(ft_htentry_new)
 {}
 
-TEST_TEAR_DOWN(ft_htcontent_new)
+TEST_TEAR_DOWN(ft_htentry_new)
 {}
 
-TEST(ft_htcontent_new, basic)
+TEST(ft_htentry_new, basic)
 {
-	t_ftht_content *c = NULL;
+	t_ftht_entry *c = NULL;
 
 	char *k = "bonjour";
-	c = ft_htcontent_new(k, NULL);
+	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_htcontent_new(k, k);
+	c = ft_htentry_new(k, k);
 	TEST_ASSERT_NOT_NULL(c);
 	TEST_ASSERT(k != c->key);
 	TEST_ASSERT_EQUAL_STRING(k, c->key);
diff --git a/test/src/lst/test_ft_lstadd_back.c b/test/src/lst/test_ft_lstadd_back.c
deleted file mode 100644
index 42e749c..0000000
--- a/test/src/lst/test_ft_lstadd_back.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "libft_test.h"
-
-TEST_GROUP(ft_lstadd_back);
-
-TEST_SETUP(ft_lstadd_back)
-{}
-
-TEST_TEAR_DOWN(ft_lstadd_back)
-{}
-
-TEST(ft_lstadd_back, basic)
-{
-	t_ftlst *lst;
-	int a = 1;
-	int b = 2;
-	int c = 2;
-
-	lst = ft_lstnew(&a);
-	TEST_ASSERT_NOT_NULL(lst);
-
-	ft_lstadd_back(&lst, ft_lstnew(&b));
-	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->next->content);
-
-	ft_lstadd_back(&lst, ft_lstnew(&c));
-	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->next->next->content);
-
-	ft_lstclear(&lst, NULL);
-}
diff --git a/test/src/lst/test_ft_lstadd_front.c b/test/src/lst/test_ft_lstadd_front.c
deleted file mode 100644
index 21b7617..0000000
--- a/test/src/lst/test_ft_lstadd_front.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "libft_test.h"
-
-TEST_GROUP(ft_lstadd_front);
-
-TEST_SETUP(ft_lstadd_front)
-{}
-
-TEST_TEAR_DOWN(ft_lstadd_front)
-{}
-
-TEST(ft_lstadd_front, basic)
-{
-	t_ftlst *lst;
-	int a = 1;
-	int b = 2;
-	int c = 2;
-
-	lst = ft_lstnew(&a);
-	TEST_ASSERT_NOT_NULL(lst);
-
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->next->content);
-
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->next->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->next->next->content);
-
-	ft_lstclear(&lst, NULL);
-}
diff --git a/test/src/lst/test_ft_lstbsearch.c b/test/src/lst/test_ft_lstbsearch.c
index 218f0bf..81f2578 100644
--- a/test/src/lst/test_ft_lstbsearch.c
+++ b/test/src/lst/test_ft_lstbsearch.c
@@ -17,10 +17,10 @@ TEST(ft_lstbsearch, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 
 	found = ft_lstbsearch(lst, ft_compar_int, &c);
 	TEST_ASSERT_NOT_NULL(found);
@@ -33,5 +33,5 @@ TEST(ft_lstbsearch, basic)
 	found = ft_lstbsearch(lst, ft_compar_int, &d);
 	TEST_ASSERT_NULL(found);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstclear.c b/test/src/lst/test_ft_lstclear.c
deleted file mode 100644
index acffb17..0000000
--- a/test/src/lst/test_ft_lstclear.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "libft_test.h"
-
-TEST_GROUP(ft_lstclear);
-
-TEST_SETUP(ft_lstclear)
-{}
-
-TEST_TEAR_DOWN(ft_lstclear)
-{}
-
-TEST(ft_lstclear, basic)
-{
-	TEST_PASS();  // how to test free?
-}
diff --git a/test/src/lst/test_ft_lstdestroy.c b/test/src/lst/test_ft_lstdestroy.c
new file mode 100644
index 0000000..e7b98c5
--- /dev/null
+++ b/test/src/lst/test_ft_lstdestroy.c
@@ -0,0 +1,14 @@
+#include "libft_test.h"
+
+TEST_GROUP(ft_lstdestroy);
+
+TEST_SETUP(ft_lstdestroy)
+{}
+
+TEST_TEAR_DOWN(ft_lstdestroy)
+{}
+
+TEST(ft_lstdestroy, basic)
+{
+	TEST_PASS();  // how to test free?
+}
diff --git a/test/src/lst/test_ft_lstiter.c b/test/src/lst/test_ft_lstiter.c
index c8bf90d..53b1380 100644
--- a/test/src/lst/test_ft_lstiter.c
+++ b/test/src/lst/test_ft_lstiter.c
@@ -26,27 +26,27 @@ TEST(ft_lstiter, basic)
 	ft_lstiter(lst, square_iter_func);
 	TEST_ASSERT_NULL(lst);
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	ft_lstiter(lst, square_iter_func);
-	TEST_ASSERT_EQUAL(4, *(int*)lst->content);
+	TEST_ASSERT_EQUAL(4, *(int*)lst->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	ft_lstiter(lst, square_iter_func);
-	TEST_ASSERT_EQUAL(9, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(16, *(int*)lst->next->content);
+	TEST_ASSERT_EQUAL(9, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(16, *(int*)lst->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	ft_lstiter(lst, square_iter_func);
-	TEST_ASSERT_EQUAL(16, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(81, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(256, *(int*)lst->next->next->content);
+	TEST_ASSERT_EQUAL(16, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(81, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(256, *(int*)lst->next->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	ft_lstiter(lst, square_iter_func);
-	TEST_ASSERT_EQUAL(25, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(256, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(81 * 81, *(int*)lst->next->next->content);
-	TEST_ASSERT_EQUAL(256 * 256, *(int*)lst->next->next->next->content);
+	TEST_ASSERT_EQUAL(25, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(256, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(81 * 81, *(int*)lst->next->next->data);
+	TEST_ASSERT_EQUAL(256 * 256, *(int*)lst->next->next->next->data);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstlast.c b/test/src/lst/test_ft_lstlast.c
index 6b44c28..82c8096 100644
--- a/test/src/lst/test_ft_lstlast.c
+++ b/test/src/lst/test_ft_lstlast.c
@@ -16,14 +16,14 @@ TEST(ft_lstlast, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL_PTR(lst, ft_lstlast(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	TEST_ASSERT_EQUAL_PTR(lst->next, ft_lstlast(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	TEST_ASSERT_EQUAL_PTR(lst->next->next, ft_lstlast(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	TEST_ASSERT_EQUAL_PTR(lst->next->next->next, ft_lstlast(lst));
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstlfind.c b/test/src/lst/test_ft_lstlfind.c
index 493a8ad..1851436 100644
--- a/test/src/lst/test_ft_lstlfind.c
+++ b/test/src/lst/test_ft_lstlfind.c
@@ -29,13 +29,13 @@ TEST(ft_lstlfind, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 
 	found = ft_lstlfind(lst, ft_compar_int, &c);
 	TEST_ASSERT_EQUAL_PTR(lst->next->next->next, found);
@@ -51,5 +51,5 @@ TEST(ft_lstlfind, basic)
 	found = ft_lstlfind(lst, ft_compar_int, &d);
 	TEST_ASSERT_NULL(found);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstlsearch.c b/test/src/lst/test_ft_lstlsearch.c
index c9f9c64..83a8f4e 100644
--- a/test/src/lst/test_ft_lstlsearch.c
+++ b/test/src/lst/test_ft_lstlsearch.c
@@ -29,13 +29,13 @@ TEST(ft_lstlsearch, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 
 	found = ft_lstlsearch(lst, ft_compar_int, &c);
 	TEST_ASSERT_EQUAL_PTR(lst->next->next->next, found);
@@ -51,5 +51,5 @@ TEST(ft_lstlsearch, basic)
 	found = ft_lstlsearch(lst, ft_compar_int, &d);
 	TEST_ASSERT_EQUAL_PTR(ft_lstlast(lst), found);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstmap.c b/test/src/lst/test_ft_lstmap.c
index 4abdddc..53c2f7a 100644
--- a/test/src/lst/test_ft_lstmap.c
+++ b/test/src/lst/test_ft_lstmap.c
@@ -29,54 +29,54 @@ TEST(ft_lstmap, basic)
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NULL(mapped);
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NOT_NULL(mapped);
-	TEST_ASSERT_NOT_NULL(mapped->content);
-	TEST_ASSERT_EQUAL(4, *(int*)mapped->content);
+	TEST_ASSERT_NOT_NULL(mapped->data);
+	TEST_ASSERT_EQUAL(4, *(int*)mapped->data);
 	TEST_ASSERT_NULL(mapped->next);
-	ft_lstclear(&mapped, free);
+	ft_lstdestroy(&mapped, free);
 
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NOT_NULL(mapped);
-	TEST_ASSERT_NOT_NULL(mapped->content);
-	TEST_ASSERT_EQUAL(9, *(int*)mapped->content);
+	TEST_ASSERT_NOT_NULL(mapped->data);
+	TEST_ASSERT_EQUAL(9, *(int*)mapped->data);
 	TEST_ASSERT_NOT_NULL(mapped->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->content);
-	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->data);
+	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->data);
 	TEST_ASSERT_NULL(mapped->next->next);
-	ft_lstclear(&mapped, free);
+	ft_lstdestroy(&mapped, free);
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NOT_NULL(mapped);
-	TEST_ASSERT_NOT_NULL(mapped->content);
-	TEST_ASSERT_EQUAL(16, *(int*)mapped->content);
+	TEST_ASSERT_NOT_NULL(mapped->data);
+	TEST_ASSERT_EQUAL(16, *(int*)mapped->data);
 	TEST_ASSERT_NOT_NULL(mapped->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->content);
-	TEST_ASSERT_EQUAL(9, *(int*)mapped->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->data);
+	TEST_ASSERT_EQUAL(9, *(int*)mapped->next->data);
 	TEST_ASSERT_NOT_NULL(mapped->next->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->next->content);
-	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->next->data);
+	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->next->data);
 	TEST_ASSERT_NULL(mapped->next->next->next);
-	ft_lstclear(&mapped, free);
+	ft_lstdestroy(&mapped, free);
 
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NOT_NULL(mapped);
-	TEST_ASSERT_NOT_NULL(mapped->content);
-	TEST_ASSERT_EQUAL(25, *(int*)mapped->content);
+	TEST_ASSERT_NOT_NULL(mapped->data);
+	TEST_ASSERT_EQUAL(25, *(int*)mapped->data);
 	TEST_ASSERT_NOT_NULL(mapped->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->content);
-	TEST_ASSERT_EQUAL(16, *(int*)mapped->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->data);
+	TEST_ASSERT_EQUAL(16, *(int*)mapped->next->data);
 	TEST_ASSERT_NOT_NULL(mapped->next->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->next->content);
-	TEST_ASSERT_EQUAL(9, *(int*)mapped->next->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->next->data);
+	TEST_ASSERT_EQUAL(9, *(int*)mapped->next->next->data);
 	TEST_ASSERT_NOT_NULL(mapped->next->next->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->next->next->content);
-	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->next->next->content);
-	ft_lstclear(&mapped, free);
+	TEST_ASSERT_NOT_NULL(mapped->next->next->next->data);
+	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->next->next->data);
+	ft_lstdestroy(&mapped, free);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstnew.c b/test/src/lst/test_ft_lstnew.c
index bdb0066..518c885 100644
--- a/test/src/lst/test_ft_lstnew.c
+++ b/test/src/lst/test_ft_lstnew.c
@@ -15,11 +15,11 @@ TEST(ft_lstnew, basic)
 
 	lst = ft_lstnew(&a);
 	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->data);
 
 	/* free(lst); */
 	lst = ft_lstnew(NULL);
 	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_NULL(lst->content);
+	TEST_ASSERT_NULL(lst->data);
 }
diff --git a/test/src/lst/test_ft_lstpop_front.c b/test/src/lst/test_ft_lstpop_front.c
index 18815d4..827afe6 100644
--- a/test/src/lst/test_ft_lstpop_front.c
+++ b/test/src/lst/test_ft_lstpop_front.c
@@ -15,16 +15,16 @@ TEST(ft_lstpop_front, basic)
 	int b = 2;
 	int c = 3;
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 
 	ft_lstpop_front(&lst, NULL);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
 
 	ft_lstpop_front(&lst, NULL);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
 
 	ft_lstpop_front(&lst, NULL);
 	TEST_ASSERT_NULL(lst);
diff --git a/test/src/lst/test_ft_lstpush_back.c b/test/src/lst/test_ft_lstpush_back.c
new file mode 100644
index 0000000..9f0d97b
--- /dev/null
+++ b/test/src/lst/test_ft_lstpush_back.c
@@ -0,0 +1,41 @@
+#include "libft_test.h"
+
+TEST_GROUP(ft_lstpush_back);
+
+TEST_SETUP(ft_lstpush_back)
+{}
+
+TEST_TEAR_DOWN(ft_lstpush_back)
+{}
+
+TEST(ft_lstpush_back, basic)
+{
+	t_ftlst *lst;
+	int a = 1;
+	int b = 2;
+	int c = 2;
+
+	lst = ft_lstnew(&a);
+	TEST_ASSERT_NOT_NULL(lst);
+
+	ft_lstpush_back(&lst, ft_lstnew(&b));
+	TEST_ASSERT_NOT_NULL(lst);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->next->data);
+
+	ft_lstpush_back(&lst, ft_lstnew(&c));
+	TEST_ASSERT_NOT_NULL(lst);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->next->next->data);
+
+	ft_lstdestroy(&lst, NULL);
+}
diff --git a/test/src/lst/test_ft_lstpush_front.c b/test/src/lst/test_ft_lstpush_front.c
new file mode 100644
index 0000000..4a6af9f
--- /dev/null
+++ b/test/src/lst/test_ft_lstpush_front.c
@@ -0,0 +1,41 @@
+#include "libft_test.h"
+
+TEST_GROUP(ft_lstpush_front);
+
+TEST_SETUP(ft_lstpush_front)
+{}
+
+TEST_TEAR_DOWN(ft_lstpush_front)
+{}
+
+TEST(ft_lstpush_front, basic)
+{
+	t_ftlst *lst;
+	int a = 1;
+	int b = 2;
+	int c = 2;
+
+	lst = ft_lstnew(&a);
+	TEST_ASSERT_NOT_NULL(lst);
+
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	TEST_ASSERT_NOT_NULL(lst);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->next->data);
+
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	TEST_ASSERT_NOT_NULL(lst);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->next->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->next->next->data);
+
+	ft_lstdestroy(&lst, NULL);
+}
diff --git a/test/src/lst/test_ft_lstremove_if.c b/test/src/lst/test_ft_lstremove_if.c
index e32a262..a79016b 100644
--- a/test/src/lst/test_ft_lstremove_if.c
+++ b/test/src/lst/test_ft_lstremove_if.c
@@ -16,14 +16,14 @@ TEST(ft_lstremove_if, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_back(&lst, ft_lstnew(&a));
-	ft_lstadd_back(&lst, ft_lstnew(&b));
-	ft_lstadd_back(&lst, ft_lstnew(&c));
-	ft_lstadd_back(&lst, ft_lstnew(&d));
-	ft_lstadd_back(&lst, ft_lstnew(&d));
-	ft_lstadd_back(&lst, ft_lstnew(&d));
-	ft_lstadd_back(&lst, ft_lstnew(&a));
-	ft_lstadd_back(&lst, ft_lstnew(&a));
+	ft_lstpush_back(&lst, ft_lstnew(&a));
+	ft_lstpush_back(&lst, ft_lstnew(&b));
+	ft_lstpush_back(&lst, ft_lstnew(&c));
+	ft_lstpush_back(&lst, ft_lstnew(&d));
+	ft_lstpush_back(&lst, ft_lstnew(&d));
+	ft_lstpush_back(&lst, ft_lstnew(&d));
+	ft_lstpush_back(&lst, ft_lstnew(&a));
+	ft_lstpush_back(&lst, ft_lstnew(&a));
 
 	ft_lstremove_if(&lst, ft_compar_int, &a, NULL);
 	TEST_ASSERT_NOT_NULL(lst);
@@ -31,39 +31,39 @@ TEST(ft_lstremove_if, basic)
 	TEST_ASSERT_NOT_NULL(lst->next->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next->next->next);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->next->next->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->next->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->next->next->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->next->data);
 
 	ft_lstremove_if(&lst, ft_compar_int, &b, NULL);
 	TEST_ASSERT_NOT_NULL(lst);
 	TEST_ASSERT_NOT_NULL(lst->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next->next);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->data);
 
 	ft_lstremove_if(&lst, ft_compar_int, &d, NULL);
 	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->data);
 
 	ft_lstremove_if(&lst, ft_compar_int, &d, NULL);
 	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->data);
 
 	ft_lstremove_if(&lst, ft_compar_int, &c, NULL);
 	TEST_ASSERT_NULL(lst);
diff --git a/test/src/lst/test_ft_lstreverse.c b/test/src/lst/test_ft_lstreverse.c
index d22bfdc..a0a7d4e 100644
--- a/test/src/lst/test_ft_lstreverse.c
+++ b/test/src/lst/test_ft_lstreverse.c
@@ -19,27 +19,27 @@ TEST(ft_lstreverse, basic)
 	ft_lstreverse(&lst);
 	TEST_ASSERT_NULL(lst);
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	ft_lstreverse(&lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	ft_lstreverse(&lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	ft_lstreverse(&lst);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->content);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	ft_lstreverse(&lst);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->next->content);
-	TEST_ASSERT_EQUAL_PTR(&d, lst->next->next->next->content);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->next->data);
+	TEST_ASSERT_EQUAL_PTR(&d, lst->next->next->next->data);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstreverse_ret.c b/test/src/lst/test_ft_lstreverse_ret.c
index 6a85ddf..e6fc278 100644
--- a/test/src/lst/test_ft_lstreverse_ret.c
+++ b/test/src/lst/test_ft_lstreverse_ret.c
@@ -19,27 +19,27 @@ TEST(ft_lstreverse_ret, basic)
 	lst = ft_lstreverse_ret(lst);
 	TEST_ASSERT_NULL(lst);
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	lst = ft_lstreverse_ret(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	lst = ft_lstreverse_ret(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	lst = ft_lstreverse_ret(lst);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->content);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	lst = ft_lstreverse_ret(lst);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->next->content);
-	TEST_ASSERT_EQUAL_PTR(&d, lst->next->next->next->content);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->next->data);
+	TEST_ASSERT_EQUAL_PTR(&d, lst->next->next->next->data);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstsize.c b/test/src/lst/test_ft_lstsize.c
index c80bc7c..d3b78bb 100644
--- a/test/src/lst/test_ft_lstsize.c
+++ b/test/src/lst/test_ft_lstsize.c
@@ -16,22 +16,22 @@ TEST(ft_lstsize, basic)
 	TEST_ASSERT_EQUAL(0, ft_lstsize(lst));
 	lst = ft_lstnew(&a);
 	TEST_ASSERT_EQUAL(1, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(2, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(3, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(4, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(5, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(6, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(7, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(8, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(9, ft_lstsize(lst));
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstsort.c b/test/src/lst/test_ft_lstsort.c
index e1e1566..3b771ae 100644
--- a/test/src/lst/test_ft_lstsort.c
+++ b/test/src/lst/test_ft_lstsort.c
@@ -16,23 +16,23 @@ TEST(ft_lstsort, basic)
 	int c = 4;
 	int d = -3;
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	ft_lstsort(&lst, ft_compar_int);
 
 	TEST_ASSERT_NOT_NULL(lst);
 	TEST_ASSERT_NOT_NULL(lst->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next->next);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->next->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->next->data);
 
-	TEST_ASSERT_EQUAL(-3, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(-1, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(1, *(int*)lst->next->next->content);
-	TEST_ASSERT_EQUAL(4, *(int*)lst->next->next->next->content);
+	TEST_ASSERT_EQUAL(-3, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(-1, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(1, *(int*)lst->next->next->data);
+	TEST_ASSERT_EQUAL(4, *(int*)lst->next->next->next->data);
 }
diff --git a/test/src/lst/test_ft_lstsorted_merge.c b/test/src/lst/test_ft_lstsorted_merge.c
index 4c548c9..9839cd7 100644
--- a/test/src/lst/test_ft_lstsorted_merge.c
+++ b/test/src/lst/test_ft_lstsorted_merge.c
@@ -18,23 +18,23 @@ TEST(ft_lstsorted_merge, basic)
 	int d = 4;
 	int e = 5;
 
-	ft_lstadd_front(&lst1, ft_lstnew(&a));
-	ft_lstadd_front(&lst1, ft_lstnew(&d));
-	ft_lstadd_front(&lst1, ft_lstnew(&e));
-	ft_lstadd_front(&lst1, ft_lstnew(&d));
-	ft_lstadd_front(&lst1, ft_lstnew(&a));
-
-	ft_lstadd_front(&lst2, ft_lstnew(&e));
-	ft_lstadd_front(&lst2, ft_lstnew(&a));
-	ft_lstadd_front(&lst2, ft_lstnew(&b));
-	ft_lstadd_front(&lst2, ft_lstnew(&d));
-	ft_lstadd_front(&lst2, ft_lstnew(&c));
+	ft_lstpush_front(&lst1, ft_lstnew(&a));
+	ft_lstpush_front(&lst1, ft_lstnew(&d));
+	ft_lstpush_front(&lst1, ft_lstnew(&e));
+	ft_lstpush_front(&lst1, ft_lstnew(&d));
+	ft_lstpush_front(&lst1, ft_lstnew(&a));
+
+	ft_lstpush_front(&lst2, ft_lstnew(&e));
+	ft_lstpush_front(&lst2, ft_lstnew(&a));
+	ft_lstpush_front(&lst2, ft_lstnew(&b));
+	ft_lstpush_front(&lst2, ft_lstnew(&d));
+	ft_lstpush_front(&lst2, ft_lstnew(&c));
 
 	ft_lstsort(&lst1, ft_compar_int);
 	ft_lstsort(&lst2, ft_compar_int);
 
 	lst1 = ft_lstsorted_merge(lst1, lst2, ft_compar_int);
 	for (; lst1->next != NULL; lst1 = lst1->next)
-		if (ft_compar_int(lst1->content, lst1->next->content) > 0)
+		if (ft_compar_int(lst1->data, lst1->next->data) > 0)
 			TEST_FAIL();
 }
diff --git a/test/src/main.c b/test/src/main.c
index e93c623..83e8d5f 100644
--- a/test/src/main.c
+++ b/test/src/main.c
@@ -31,7 +31,7 @@ static void run_all_test(void)
 	RUN_TEST_GROUP(ft_strlen);
 
 	// ht
-	RUN_TEST_GROUP(ft_htcontent_new);
+	RUN_TEST_GROUP(ft_htentry_new);
 	RUN_TEST_GROUP(ft_htnew);
 	RUN_TEST_GROUP(ft_htget);
 	RUN_TEST_GROUP(ft_htset);
@@ -50,12 +50,12 @@ static void run_all_test(void)
 	RUN_TEST_GROUP(ft_reverse);
 
 	// lst
-	RUN_TEST_GROUP(ft_lstadd_back);
-	RUN_TEST_GROUP(ft_lstadd_front);
+	RUN_TEST_GROUP(ft_lstpush_back);
+	RUN_TEST_GROUP(ft_lstpush_front);
 	RUN_TEST_GROUP(ft_lstbsearch);
 	RUN_TEST_GROUP(ft_lstlsearch);
 	RUN_TEST_GROUP(ft_lstlfind);
-	RUN_TEST_GROUP(ft_lstclear);
+	RUN_TEST_GROUP(ft_lstdestroy);
 	RUN_TEST_GROUP(ft_lstdelone);
 	RUN_TEST_GROUP(ft_lstiter);
 	RUN_TEST_GROUP(ft_lstlast);
@@ -68,6 +68,14 @@ static void run_all_test(void)
 	RUN_TEST_GROUP(ft_lstsize);
 	RUN_TEST_GROUP(ft_lstsort);
 	RUN_TEST_GROUP(ft_lstsorted_merge);
+
+	// vec
+	RUN_TEST_GROUP(ft_vecdestroy);
+	RUN_TEST_GROUP(ft_vecgrow);
+	RUN_TEST_GROUP(ft_veciter);
+	RUN_TEST_GROUP(ft_vecnew);
+	RUN_TEST_GROUP(ft_vecpop);
+	RUN_TEST_GROUP(ft_vecpush);
 }
 
 int main(int argc, const char **argv)
diff --git a/test/src/runner/test_runner_ht.c b/test/src/runner/test_runner_ht.c
index 6f83006..1563a72 100644
--- a/test/src/runner/test_runner_ht.c
+++ b/test/src/runner/test_runner_ht.c
@@ -6,15 +6,15 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/12 22:44:39 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/19 02:46:34 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/28 12:17:33 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft_test.h"
 
-TEST_GROUP_RUNNER(ft_htcontent_new)
+TEST_GROUP_RUNNER(ft_htentry_new)
 {
-	RUN_TEST_CASE(ft_htcontent_new, basic);
+	RUN_TEST_CASE(ft_htentry_new, basic);
 }
 
 TEST_GROUP_RUNNER(ft_htnew)
diff --git a/test/src/runner/test_runner_lst.c b/test/src/runner/test_runner_lst.c
index 483e120..5ae9557 100644
--- a/test/src/runner/test_runner_lst.c
+++ b/test/src/runner/test_runner_lst.c
@@ -12,14 +12,14 @@
 
 #include "libft_test.h"
 
-TEST_GROUP_RUNNER(ft_lstadd_back)
+TEST_GROUP_RUNNER(ft_lstpush_back)
 {
-	RUN_TEST_CASE(ft_lstadd_back, basic);
+	RUN_TEST_CASE(ft_lstpush_back, basic);
 }
 
-TEST_GROUP_RUNNER(ft_lstadd_front)
+TEST_GROUP_RUNNER(ft_lstpush_front)
 {
-	RUN_TEST_CASE(ft_lstadd_front, basic);
+	RUN_TEST_CASE(ft_lstpush_front, basic);
 }
 
 TEST_GROUP_RUNNER(ft_lstbsearch)
@@ -37,9 +37,9 @@ TEST_GROUP_RUNNER(ft_lstlfind)
 	RUN_TEST_CASE(ft_lstlfind, basic);
 }
 
-TEST_GROUP_RUNNER(ft_lstclear)
+TEST_GROUP_RUNNER(ft_lstdestroy)
 {
-	RUN_TEST_CASE(ft_lstclear, basic);
+	RUN_TEST_CASE(ft_lstdestroy, basic);
 }
 
 TEST_GROUP_RUNNER(ft_lstdelone)
diff --git a/test/src/runner/test_runner_vec.c b/test/src/runner/test_runner_vec.c
new file mode 100644
index 0000000..af91360
--- /dev/null
+++ b/test/src/runner/test_runner_vec.c
@@ -0,0 +1,45 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_runner_vec.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 19:55:53 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 19:58:25 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+
+#include "libft_test.h"
+
+TEST_GROUP_RUNNER(ft_vecdestroy)
+{
+	RUN_TEST_CASE(ft_vecdestroy, basic);
+}
+
+TEST_GROUP_RUNNER(ft_vecgrow)
+{
+	RUN_TEST_CASE(ft_vecgrow, basic);
+}
+
+TEST_GROUP_RUNNER(ft_veciter)
+{
+	RUN_TEST_CASE(ft_veciter, basic);
+}
+
+TEST_GROUP_RUNNER(ft_vecnew)
+{
+	RUN_TEST_CASE(ft_vecnew, basic);
+}
+
+TEST_GROUP_RUNNER(ft_vecpop)
+{
+	RUN_TEST_CASE(ft_vecpop, basic);
+}
+
+TEST_GROUP_RUNNER(ft_vecpush)
+{
+	RUN_TEST_CASE(ft_vecpush, basic);
+}
+
diff --git a/test/src/str/test_ft_strlen.c b/test/src/str/test_ft_strlen.c
index f251fc6..47ca69b 100644
--- a/test/src/str/test_ft_strlen.c
+++ b/test/src/str/test_ft_strlen.c
@@ -21,4 +21,40 @@ TEST(ft_strlen, basic)
 	TEST_ASSERT_FT_STRLEN("asodifuaosidjoiasjdfoijasklfqwkberkjqwerkjqwlkenrmnqwerjkqwehfakjs");
 	TEST_ASSERT_FT_STRLEN("im\0hidden");
 	TEST_ASSERT_FT_STRLEN("987987\xff\xee\xaasdfioxcv");
+
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqrstuvwxyz");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqrstuvwxy");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqrstuvwx");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqrstuvw");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqrstuv");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqrstu");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqrst");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqrs");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopqr");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnopq");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmnop");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmno");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklmn");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijklm");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijkl");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghijk");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghij");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefghi");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefgh");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdefg");
+	TEST_ASSERT_FT_STRLEN("0123456789abcdef");
+	TEST_ASSERT_FT_STRLEN("0123456789abcde");
+	TEST_ASSERT_FT_STRLEN("0123456789abcd");
+	TEST_ASSERT_FT_STRLEN("0123456789abc");
+	TEST_ASSERT_FT_STRLEN("0123456789ab");
+	TEST_ASSERT_FT_STRLEN("0123456789a");
+	TEST_ASSERT_FT_STRLEN("012345678");
+	TEST_ASSERT_FT_STRLEN("01234567");
+	TEST_ASSERT_FT_STRLEN("0123456");
+	TEST_ASSERT_FT_STRLEN("012345");
+	TEST_ASSERT_FT_STRLEN("01234");
+	TEST_ASSERT_FT_STRLEN("0123");
+	TEST_ASSERT_FT_STRLEN("012");
+	TEST_ASSERT_FT_STRLEN("01");
+	TEST_ASSERT_FT_STRLEN("0");
 }
diff --git a/test/src/vec/test_ft_vecdestroy.c b/test/src/vec/test_ft_vecdestroy.c
new file mode 100644
index 0000000..4f121dc
--- /dev/null
+++ b/test/src/vec/test_ft_vecdestroy.c
@@ -0,0 +1,26 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecdestroy.c                               :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 19:41:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 19:55:14 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecdestroy);
+
+TEST_SETUP(ft_vecdestroy)
+{}
+
+TEST_TEAR_DOWN(ft_vecdestroy)
+{}
+
+TEST(ft_vecdestroy, basic)
+{
+	TEST_PASS();
+}
diff --git a/test/src/vec/test_ft_vecgrow.c b/test/src/vec/test_ft_vecgrow.c
new file mode 100644
index 0000000..0b40390
--- /dev/null
+++ b/test/src/vec/test_ft_vecgrow.c
@@ -0,0 +1,47 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecgrow.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 19:41:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 21:17:13 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecgrow);
+
+TEST_SETUP(ft_vecgrow)
+{}
+
+TEST_TEAR_DOWN(ft_vecgrow)
+{}
+
+TEST(ft_vecgrow, basic)
+{
+	t_ftvec *vec = ft_vecnew(1);
+	TEST_ASSERT_NOT_NULL(vec);
+	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
+	TEST_ASSERT_EQUAL(2, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
+	TEST_ASSERT_EQUAL(3, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
+	TEST_ASSERT_EQUAL(6, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
+	TEST_ASSERT_EQUAL(9, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
+	TEST_ASSERT_EQUAL(13, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+
+	ft_vecdestroy(vec, NULL);
+}
diff --git a/test/src/vec/test_ft_veciter.c b/test/src/vec/test_ft_veciter.c
new file mode 100644
index 0000000..fac28c1
--- /dev/null
+++ b/test/src/vec/test_ft_veciter.c
@@ -0,0 +1,52 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_veciter.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 19:41:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 20:20:41 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_veciter);
+
+TEST_SETUP(ft_veciter)
+{}
+
+TEST_TEAR_DOWN(ft_veciter)
+{}
+
+static void iter_func(void *x)
+{
+	*(int*)x = *(int*)x * *(int*)x;
+}
+
+static void iter_func2(void *x)
+{
+	*(int*)x = *(int*)x - 100;
+}
+
+TEST(ft_veciter, basic)
+{
+	int	tmp[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+	t_ftvec *vec;
+
+	vec = ft_vecnew(10);
+	TEST_ASSERT_NOT_NULL(vec);
+	TEST_ASSERT_NOT_NULL(vec->data);
+	for (int i = 0; i < 10; i++)
+		vec->data[i] = tmp + i;
+	vec->size = 10;
+	ft_veciter(vec, iter_func);
+	for (int i = 0; i < 10; i++)
+		TEST_ASSERT_EQUAL(i * i, *(int*)vec->data[i]);
+	ft_veciter(vec, iter_func2);
+	for (int i = 0; i < 10; i++)
+		TEST_ASSERT_EQUAL(i * i - 100, *(int*)vec->data[i]);
+
+	ft_vecdestroy(vec, NULL);
+}
diff --git a/test/src/vec/test_ft_vecnew.c b/test/src/vec/test_ft_vecnew.c
new file mode 100644
index 0000000..579a182
--- /dev/null
+++ b/test/src/vec/test_ft_vecnew.c
@@ -0,0 +1,47 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecnew.c                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 19:41:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 20:01:37 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecnew);
+
+TEST_SETUP(ft_vecnew)
+{}
+
+TEST_TEAR_DOWN(ft_vecnew)
+{}
+
+TEST(ft_vecnew, basic)
+{
+	t_ftvec *vec;
+
+	vec = ft_vecnew(0);
+	TEST_ASSERT_NOT_NULL(vec);
+	TEST_ASSERT_NOT_NULL(vec->data);
+	TEST_ASSERT_EQUAL(1, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	ft_vecdestroy(vec, NULL);
+
+	vec = ft_vecnew(10);
+	TEST_ASSERT_NOT_NULL(vec);
+	TEST_ASSERT_NOT_NULL(vec->data);
+	TEST_ASSERT_EQUAL(10, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	ft_vecdestroy(vec, NULL);
+
+	vec = ft_vecnew(256);
+	TEST_ASSERT_NOT_NULL(vec);
+	TEST_ASSERT_NOT_NULL(vec->data);
+	TEST_ASSERT_EQUAL(256, vec->capacity);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	ft_vecdestroy(vec, NULL);
+}
diff --git a/test/src/vec/test_ft_vecpop.c b/test/src/vec/test_ft_vecpop.c
new file mode 100644
index 0000000..2ee96d2
--- /dev/null
+++ b/test/src/vec/test_ft_vecpop.c
@@ -0,0 +1,47 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecpop.c                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 19:41:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 20:26:37 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecpop);
+
+TEST_SETUP(ft_vecpop)
+{}
+
+TEST_TEAR_DOWN(ft_vecpop)
+{}
+
+TEST(ft_vecpop, basic)
+{
+	t_ftvec *vec;
+
+	vec = ft_vecnew(3);
+	TEST_ASSERT_NOT_NULL(vec);
+	TEST_ASSERT_NOT_NULL(vec->data);
+
+	vec->size = 3;
+	for (long i = 0; i < 3; i++)
+		vec->data[i] = (void*)i;
+
+	ft_vecpop(vec, NULL);
+	TEST_ASSERT_EQUAL(2, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->capacity);
+	ft_vecpop(vec, NULL);
+	TEST_ASSERT_EQUAL(1, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->capacity);
+	ft_vecpop(vec, NULL);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->capacity);
+	ft_vecpop(vec, NULL);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->capacity);
+}
diff --git a/test/src/vec/test_ft_vecpush.c b/test/src/vec/test_ft_vecpush.c
new file mode 100644
index 0000000..05efc7a
--- /dev/null
+++ b/test/src/vec/test_ft_vecpush.c
@@ -0,0 +1,57 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecpush.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 19:41:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 20:23:00 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecpush);
+
+TEST_SETUP(ft_vecpush)
+{}
+
+TEST_TEAR_DOWN(ft_vecpush)
+{}
+
+TEST(ft_vecpush, basic)
+{
+	t_ftvec *vec;
+
+	vec = ft_vecnew(2);
+	TEST_ASSERT_NOT_NULL(vec);
+	TEST_ASSERT_NOT_NULL(vec->data);
+
+	TEST_ASSERT_NOT_NULL(ft_vecpush(vec, (void*)10));
+	TEST_ASSERT_EQUAL(1, vec->size);
+	TEST_ASSERT_EQUAL(2, vec->capacity);
+	TEST_ASSERT_EQUAL(10, (long)vec->data[0]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecpush(vec, (void*)11));
+	TEST_ASSERT_EQUAL(2, vec->size);
+	TEST_ASSERT_EQUAL(2, vec->capacity);
+	TEST_ASSERT_EQUAL(11, (long)vec->data[1]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecpush(vec, (void*)12));
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL(2 * 1.5, vec->capacity);
+	TEST_ASSERT_EQUAL(12, (long)vec->data[2]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecpush(vec, (void*)13));
+	TEST_ASSERT_EQUAL(4, vec->size);
+	TEST_ASSERT_EQUAL(2 * 1.5 * 1.5, vec->capacity);
+	TEST_ASSERT_EQUAL(13, (long)vec->data[3]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecpush(vec, (void*)14));
+	TEST_ASSERT_EQUAL(5, vec->size);
+	TEST_ASSERT_EQUAL(2 * 1.5 * 1.5 * 1.5, vec->capacity);
+	TEST_ASSERT_EQUAL(14, (long)vec->data[4]);
+
+	ft_vecdestroy(vec, NULL);
+}