Merge remote-tracking branch 'origin/minishell'

5 files changed, 243 insertions, 7 deletions

diff --git a/test/src/vec/test_ft_vecgrow.c b/test/src/vec/test_ft_vecgrow.c
index 0b40390..8a80c7e 100644
--- a/test/src/vec/test_ft_vecgrow.c
+++ b/test/src/vec/test_ft_vecgrow.c
@@ -6,7 +6,7 @@
 /*   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       */
+/*   Updated: 2020/04/02 10:41:28 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,24 +24,51 @@ TEST(ft_vecgrow, basic)
 {
 	t_ftvec *vec = ft_vecnew(1);
 	TEST_ASSERT_NOT_NULL(vec);
+	vec->size = 1;
+	vec->data[0] = (void*)(0xfefefefeUL << 32);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(2, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(1, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	vec->size = 2;
+	vec->data[1] = (void*)(0xfafafafaUL << 32);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(3, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(2, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	vec->size = 3;
+	vec->data[2] = (void*)(0xfbfbfbfbUL << 32);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(4, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64(0xfbfbfbfbUL << 32, vec->data[2]);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(6, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64(0xfbfbfbfbUL << 32, vec->data[2]);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(9, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64(0xfbfbfbfbUL << 32, vec->data[2]);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(13, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64(0xfbfbfbfbUL << 32, vec->data[2]);
 
 	ft_vecdestroy(vec, NULL);
 }
diff --git a/test/src/vec/test_ft_vecinsert.c b/test/src/vec/test_ft_vecinsert.c
new file mode 100644
index 0000000..9b89813
--- /dev/null
+++ b/test/src/vec/test_ft_vecinsert.c
@@ -0,0 +1,66 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecinsert.c                                :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 22:48:58 by charles           #+#    #+#             */
+/*   Updated: 2020/04/02 11:05:14 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecinsert);
+
+TEST_SETUP(ft_vecinsert)
+{}
+
+TEST_TEAR_DOWN(ft_vecinsert)
+{}
+
+TEST(ft_vecinsert, basic)
+{
+	t_ftvec *vec;
+
+	vec = ft_vecnew(2);
+	vec->data[0] = (void*)(1UL << 32);
+	vec->data[1] = (void*)(2UL << 32);
+	vec->size = 2;
+
+	TEST_ASSERT_NOT_NULL(ft_vecinsert(vec, 0, (void*)(0xfefefefeUL << 32)));
+	TEST_ASSERT_EQUAL(3, vec->capacity);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfefefefeUL << 32), vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(1UL << 32), vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(2UL << 32), vec->data[2]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecinsert(vec, 1, (void*)(0xfafafafaUL << 32)));
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+	TEST_ASSERT_EQUAL(4, vec->size);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfefefefeUL << 32), vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfafafafaUL << 32), vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(1UL << 32), vec->data[2]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(2UL << 32), vec->data[3]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecinsert(vec, 2, (void*)(0xfbfbfbfbUL << 32)));
+	TEST_ASSERT_EQUAL(6, vec->capacity);
+	TEST_ASSERT_EQUAL(5, vec->size);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfefefefeUL << 32), vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfafafafaUL << 32), vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfbfbfbfbUL << 32), vec->data[2]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(1UL << 32), vec->data[3]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecinsert(vec, vec->size, (void*)(0xfcUL << 31)));
+	TEST_ASSERT_EQUAL(6, vec->capacity);
+	TEST_ASSERT_EQUAL(6, vec->size);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfefefefeUL << 32), vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfafafafaUL << 32), vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfbfbfbfbUL << 32), vec->data[2]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(1UL << 32), vec->data[3]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(2UL << 32), vec->data[4]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfcUL << 31), vec->data[5]);
+
+	ft_vecdestroy(vec, NULL);
+}
diff --git a/test/src/vec/test_ft_vecpush_safe.c b/test/src/vec/test_ft_vecpush_safe.c
new file mode 100644
index 0000000..8546829
--- /dev/null
+++ b/test/src/vec/test_ft_vecpush_safe.c
@@ -0,0 +1,45 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecpush_safe.c                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 19:41:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 23:31:08 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecpush_safe);
+
+TEST_SETUP(ft_vecpush_safe)
+{}
+
+TEST_TEAR_DOWN(ft_vecpush_safe)
+{}
+
+TEST(ft_vecpush_safe, basic)
+{
+	t_ftvec *vec;
+
+	vec = ft_vecnew(1);
+	TEST_ASSERT_NULL(ft_vecpush_safe(vec, NULL));
+
+	TEST_ASSERT_NOT_NULL(ft_vecpush_safe(vec, (void*)0x1UL));
+	TEST_ASSERT_EQUAL_HEX(0x1, (unsigned long)vec->data[0]);
+	TEST_ASSERT_GREATER_OR_EQUAL(1, vec->capacity);
+	TEST_ASSERT_EQUAL(1, vec->size);
+
+	TEST_ASSERT_NULL(ft_vecpush_safe(vec, NULL));
+	TEST_ASSERT_NULL(ft_vecpush_safe(vec, NULL));
+
+	TEST_ASSERT_NOT_NULL(ft_vecpush_safe(vec, (void*)0x2UL));
+	TEST_ASSERT_EQUAL_HEX(0x2, (unsigned long)vec->data[1]);
+	TEST_ASSERT_GREATER_OR_EQUAL(2, vec->capacity);
+	TEST_ASSERT_EQUAL(2, vec->size);
+
+	TEST_ASSERT_NULL(ft_vecpush_safe(vec, NULL));
+	TEST_ASSERT_NULL(ft_vecpush_safe(vec, NULL));
+}
diff --git a/test/src/vec/test_ft_vecremove.c b/test/src/vec/test_ft_vecremove.c
new file mode 100644
index 0000000..8cecc19
--- /dev/null
+++ b/test/src/vec/test_ft_vecremove.c
@@ -0,0 +1,64 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecremove.c                                :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 22:48:58 by charles           #+#    #+#             */
+/*   Updated: 2020/04/01 22:56:37 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecremove);
+
+TEST_SETUP(ft_vecremove)
+{}
+
+TEST_TEAR_DOWN(ft_vecremove)
+{}
+
+TEST(ft_vecremove, basic)
+{
+	t_ftvec *vec;
+
+	vec = ft_vecnew(4);
+	for (size_t i = 0; i < 4; i++)
+		vec->data[i] = (void*)(i + 1);
+	vec->size = 4;
+
+	ft_vecremove(vec, 0, NULL);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+	TEST_ASSERT_EQUAL_UINT64(2, (size_t)vec->data[0]);
+	TEST_ASSERT_EQUAL_UINT64(3, (size_t)vec->data[1]);
+	TEST_ASSERT_EQUAL_UINT64(4, (size_t)vec->data[2]);
+
+	ft_vecremove(vec, 1, NULL);
+	TEST_ASSERT_EQUAL(2, vec->size);
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+	TEST_ASSERT_EQUAL_UINT64(2, (size_t)vec->data[0]);
+	TEST_ASSERT_EQUAL_UINT64(4, (size_t)vec->data[1]);
+
+	ft_vecremove(vec, 1, NULL);
+	TEST_ASSERT_EQUAL(1, vec->size);
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+	TEST_ASSERT_EQUAL_UINT64(2, (size_t)vec->data[0]);
+
+	ft_vecremove(vec, 1, NULL);
+	TEST_ASSERT_EQUAL(1, vec->size);
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+	TEST_ASSERT_EQUAL_UINT64(2, (size_t)vec->data[0]);
+
+	ft_vecremove(vec, 0, NULL);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+
+	ft_vecremove(vec, 0, NULL);
+	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+
+	ft_vecdestroy(vec, NULL);
+}
diff --git a/test/src/vec/test_ft_vecsort.c b/test/src/vec/test_ft_vecsort.c
new file mode 100644
index 0000000..bfdad01
--- /dev/null
+++ b/test/src/vec/test_ft_vecsort.c
@@ -0,0 +1,34 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecsort.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/04 19:31:13 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 19:45:27 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecsort);
+
+TEST_SETUP(ft_vecsort)
+{}
+
+TEST_TEAR_DOWN(ft_vecsort)
+{}
+
+TEST(ft_vecsort, basic)
+{
+	t_ftvec *vec = ft_vecnew(1);
+	char*	arr[]    = {"bonjour", "je", "suis", "lala", "z", "b"};
+	char*	sorted[] = {"bonjour", "je", "suis", "lala", "z", "b"};
+
+	for (size_t i = 0; i < sizeof(arr) / sizeof(char*); i++)
+		ft_vecpush(vec, arr[i]);
+	ft_vecsort(vec, ft_compar_str);
+	ft_qsort(sorted, sizeof(sorted) / sizeof(char*), sizeof(char*), ft_compar_str);
+	TEST_ASSERT_EQUAL_STRING_ARRAY(sorted, vec->data, vec->size);
+}