Merge branch 'master' into ft_ssl

1 files changed, 29 insertions, 29 deletions

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);