aboutsummaryrefslogtreecommitdiff
path: root/test/src/lst/test_ft_lstsorted_merge.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-04-01 21:51:51 +0200
committerCharles <sircharlesaze@gmail.com>2020-04-01 21:58:05 +0200
commit65c5d5157e890e9f9445a94fb2d7f660e5492d8e (patch)
tree78613f26bdc531104c3e32d76ffcaf3c2f7013f5 /test/src/lst/test_ft_lstsorted_merge.c
parentc128213daa677d548bfc2905496257fe4a4faf79 (diff)
parenta1675f56b35f5521a91851bae8ca650706374ae6 (diff)
downloadlibft-65c5d5157e890e9f9445a94fb2d7f660e5492d8e.tar.gz
libft-65c5d5157e890e9f9445a94fb2d7f660e5492d8e.tar.bz2
libft-65c5d5157e890e9f9445a94fb2d7f660e5492d8e.zip
Merge branch 'minishell'
Diffstat (limited to 'test/src/lst/test_ft_lstsorted_merge.c')
-rw-r--r--test/src/lst/test_ft_lstsorted_merge.c24
1 files changed, 12 insertions, 12 deletions
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();
}