From dc274787e3aac817745327db9ad554d06603219c Mon Sep 17 00:00:00 2001 From: laentropia Date: Thu, 14 May 2026 06:48:56 -0600 Subject: [PATCH] refactor: slices take same approach for init --- include/arraylist.h | 6 +- src/arraylist.c | 7 +- test/test_arraylist.c | 376 +++++++++++++++++++++--------------------- 3 files changed, 197 insertions(+), 192 deletions(-) diff --git a/include/arraylist.h b/include/arraylist.h index 7f0af97..e49cde1 100644 --- a/include/arraylist.h +++ b/include/arraylist.h @@ -47,8 +47,8 @@ ArrayListErr arraylist_resize(ArrayList *arr, size_t new_capacity); ArrayListErr arraylist_reserve(ArrayList *arr, size_t size_to_reserve); //Slice stuff -ArraySlice *arraylist_slice(ArrayList *arr, size_t start, size_t len); -ArraySlice *arraylist_slice_unsafe(ArrayList *arr, size_t start, size_t len); +ArrayListErr arraylist_slice(ArraySlice **slice, ArrayList *arr, size_t start, size_t len); +ArrayListErr arraylist_slice_unsafe(ArraySlice **slice, ArrayList *arr, size_t start, size_t len); ArrayListErr arrayslice_destroy(ArraySlice **slice); bool arrayslice_is_valid(const ArraySlice *slice); @@ -62,6 +62,6 @@ ArrayListErr arrayslice_next(ArraySlice *slice, void *out); ArrayListErr arrayslice_reset(ArraySlice *slice); ArrayListErr arrayslice_advance(ArraySlice *slice, size_t n); -ArrayList *arrayslice_to_arraylist(const ArraySlice *slice); +ArrayListErr arrayslice_to_arraylist(ArrayList *arr, const ArraySlice *slice); #endif diff --git a/src/arraylist.c b/src/arraylist.c index e38808d..c050a0a 100644 --- a/src/arraylist.c +++ b/src/arraylist.c @@ -595,7 +595,12 @@ ArrayList *arrayslice_to_arraylist(const ArraySlice *slice) { size_t len = slice->end - slice->start; - ArrayList *new_arr = arraylist_init(arraylist_capacity(slice->arr), slice->arr->elem_size); + ArrayList *new_arr; + ArrayListErr init_err = arraylist_init( + &new_arr, + arraylist_capacity(slice->arr), + slice->arr->elem_size + ); if (new_arr == NULL) { return NULL; } diff --git a/test/test_arraylist.c b/test/test_arraylist.c index 1362d41..44af3e6 100644 --- a/test/test_arraylist.c +++ b/test/test_arraylist.c @@ -14,32 +14,32 @@ static void test_init_valid_parameters(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; + assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); arraylist_destroy(&arr); } static void test_init_zero_capacity(void **state) { (void) state; - ArrayList *arr = arraylist_init(0, sizeof(int)); - assert_null(arr); + ArrayList *arr; + assert_uint_equal(arraylist_init(&arr, 0, sizeof(int)), ARRLIST_INVALID_CAPACITY); arraylist_destroy(&arr); } static void test_init_zero_elem_size(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, 0); - assert_null(arr); + ArrayList *arr; + assert_uint_equal(arraylist_init(&arr, 0, sizeof(int)), ARRLIST_INVALID_ELEM_SIZE); arraylist_destroy(&arr); } static void test_init_large_capacity(void **state) { (void) state; - ArrayList *arr = arraylist_init(SIZE_MAX, sizeof(int)); - assert_null(arr); + ArrayList *arr; + assert_uint_equal(arraylist_init(&arr, SIZE_MAX, sizeof(int)), ARRLIST_INVALID_CAPACITY); arraylist_destroy(&arr); } @@ -48,9 +48,8 @@ static void test_init_large_capacity(void **state) { static void test_destroy_valid_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); - + ArrayList *arr; + assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); arraylist_destroy(&arr); assert_null(arr); } @@ -68,8 +67,8 @@ static void test_destroy_null_array(void **state) { static void test_destroy_double(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); ArrayListErr err = arraylist_destroy(&arr); assert_uint_equal(err, ARRLIST_OK); @@ -83,8 +82,8 @@ static void test_destroy_double(void **state) { static void test_destroy_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -104,8 +103,8 @@ static void test_destroy_while_borrowed(void **state) { static void test_capacity_after_init(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_capacity(arr), 64); @@ -115,8 +114,8 @@ static void test_capacity_after_init(void **state) { static void test_is_empty_after_init(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_true(arraylist_is_empty(arr)); @@ -126,8 +125,8 @@ static void test_is_empty_after_init(void **state) { static void test_is_empty_after_push(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -140,8 +139,8 @@ static void test_is_empty_after_push(void **state) { static void test_size_after_many_push(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -162,8 +161,8 @@ static void test_size_after_many_push(void **state) { static void test_capacity_growth_on_push(void **state) { (void) state; - ArrayList *arr = arraylist_init(2, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 2, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -181,8 +180,8 @@ static void test_capacity_growth_on_push(void **state) { static void test_capacity_shrink_on_pop(void **state) { (void) state; - ArrayList *arr = arraylist_init(8, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 8, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -196,8 +195,8 @@ static void test_capacity_shrink_on_pop(void **state) { static void test_push_back_single_element(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -213,8 +212,8 @@ static void test_push_back_single_element(void **state) { static void test_push_back_multiple_elements(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -267,7 +266,8 @@ static void test_push_back_null_array(void **state) { static void test_push_back_null_data(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); + ArrayList *arr; + arraylist_init(&arr, 64, sizeof(int)); assert_uint_equal(arraylist_push_back(arr, NULL), ARRLIST_NULL_ARG); @@ -277,8 +277,8 @@ static void test_push_back_null_data(void **state) { static void test_push_back_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -298,8 +298,8 @@ static void test_push_back_while_borrowed(void **state) { static void test_push_front_single_element(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; int m; @@ -314,8 +314,8 @@ static void test_push_front_single_element(void **state) { static void test_push_front_multiple_elements(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; int m; @@ -343,8 +343,8 @@ static void test_push_front_null_array(void **state) { static void test_push_front_null_data(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_int_equal(arraylist_push_front(arr, NULL), ARRLIST_NULL_ARG); @@ -354,8 +354,8 @@ static void test_push_front_null_data(void **state) { static void test_push_front_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -375,8 +375,8 @@ static void test_push_front_while_borrowed(void **state) { static void test_insert_at_beginning(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -396,8 +396,8 @@ static void test_insert_at_beginning(void **state) { static void test_insert_at_middle(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -417,8 +417,8 @@ static void test_insert_at_middle(void **state) { static void test_insert_at_end(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -438,8 +438,8 @@ static void test_insert_at_end(void **state) { static void test_insert_at_invalid_index(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; @@ -460,8 +460,8 @@ static void test_insert_null_array(void **state) { static void test_insert_null_data(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_insert(arr, 0, NULL), ARRLIST_NULL_ARG); @@ -472,8 +472,8 @@ static void test_insert_null_data(void **state) { static void test_insert_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -493,8 +493,8 @@ static void test_insert_while_borrowed(void **state) { static void test_pop_back_single_element(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -510,8 +510,8 @@ static void test_pop_back_single_element(void **state) { static void test_pop_back_multiple_elements(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -530,8 +530,8 @@ static void test_pop_back_multiple_elements(void **state) { static void test_pop_back_until_empty(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -552,8 +552,8 @@ static void test_pop_back_until_empty(void **state) { static void test_pop_back_empty_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n; assert_uint_equal(arraylist_pop_back(arr, &n), ARRLIST_EMPTY); @@ -573,8 +573,8 @@ static void test_pop_back_null_array(void **state) { static void test_pop_back_null_out(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -587,8 +587,8 @@ static void test_pop_back_null_out(void **state) { static void test_pop_back_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -608,8 +608,8 @@ static void test_pop_back_while_borrowed(void **state) { static void test_pop_front_single_element(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -625,8 +625,8 @@ static void test_pop_front_single_element(void **state) { static void test_pop_front_multiple_elements(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -646,8 +646,8 @@ static void test_pop_front_multiple_elements(void **state) { static void test_pop_front_until_empty(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -669,8 +669,8 @@ static void test_pop_front_until_empty(void **state) { static void test_pop_front_empty_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n; assert_uint_equal(arraylist_pop_front(arr, &n), ARRLIST_EMPTY); @@ -690,8 +690,8 @@ static void test_pop_front_null_array(void **state) { static void test_pop_front_null_out(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -704,8 +704,8 @@ static void test_pop_front_null_out(void **state) { static void test_pop_front_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -725,8 +725,8 @@ static void test_pop_front_while_borrowed(void **state) { static void test_remove_at_beginning(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -744,8 +744,8 @@ static void test_remove_at_beginning(void **state) { static void test_remove_at_middle(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -763,8 +763,8 @@ static void test_remove_at_middle(void **state) { static void test_remove_at_end(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -782,8 +782,8 @@ static void test_remove_at_end(void **state) { static void test_remove_at_invalid_index(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; @@ -804,8 +804,8 @@ static void test_remove_at_null_array(void **state) { static void test_remove_at_null_data(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); int n = 8; assert_uint_equal(arraylist_push_back(arr, &n), ARRLIST_OK); @@ -818,8 +818,8 @@ static void test_remove_at_null_data(void **state) { static void test_remove_at_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -839,8 +839,8 @@ static void test_remove_at_while_borrowed(void **state) { static void test_get_valid_index(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -856,8 +856,8 @@ static void test_get_valid_index(void **state) { static void test_get_first_element(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -873,8 +873,8 @@ static void test_get_first_element(void **state) { static void test_get_last_element(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -890,8 +890,8 @@ static void test_get_last_element(void **state) { static void test_get_invalid_index(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -916,8 +916,8 @@ static void test_get_null_array(void **state) { static void test_get_null_out(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -931,8 +931,8 @@ static void test_get_null_out(void **state) { static void test_get_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -952,8 +952,8 @@ static void test_get_while_borrowed(void **state) { static void test_set_valid_index(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -971,8 +971,8 @@ static void test_set_valid_index(void **state) { static void test_set_first_element(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -990,8 +990,8 @@ static void test_set_first_element(void **state) { static void test_set_last_element(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1009,8 +1009,8 @@ static void test_set_last_element(void **state) { static void test_set_invalid_index(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1035,8 +1035,8 @@ static void test_set_null_array(void **state) { static void test_set_null_data(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_set(arr, 8, NULL), ARRLIST_NULL_ARG); @@ -1046,8 +1046,8 @@ static void test_set_null_data(void **state) { static void test_set_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1067,8 +1067,8 @@ static void test_set_while_borrowed(void **state) { static void test_clear_non_empty_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1084,8 +1084,8 @@ static void test_clear_non_empty_array(void **state) { static void test_clear_already_empty_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_clear(arr), ARRLIST_OK); @@ -1103,8 +1103,8 @@ static void test_clear_null_array(void **state) { static void test_clear_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1123,8 +1123,8 @@ static void test_clear_while_borrowed(void **state) { static void test_resize_increase_capacity(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_resize(arr, 128), ARRLIST_OK); assert_uint_equal(arraylist_capacity(arr), 128); @@ -1135,8 +1135,8 @@ static void test_resize_increase_capacity(void **state) { static void test_resize_decrease_capacity(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_resize(arr, 32), ARRLIST_OK); assert_uint_equal(arraylist_capacity(arr), 32); @@ -1147,8 +1147,8 @@ static void test_resize_decrease_capacity(void **state) { static void test_resize_to_zero(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_resize(arr, 0), ARRLIST_INVALID_CAPACITY); assert_uint_equal(arraylist_capacity(arr), 64); @@ -1159,8 +1159,8 @@ static void test_resize_to_zero(void **state) { static void test_resize_to_size_max(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_resize(arr, SIZE_MAX), ARRLIST_ALLOC_OVERFLOW); assert_uint_equal(arraylist_capacity(arr), 64); @@ -1179,8 +1179,8 @@ static void test_resize_null_array(void **state) { static void test_resize_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1199,8 +1199,8 @@ static void test_resize_while_borrowed(void **state) { static void test_reserve_normal_capacity(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_reserve(arr, 32), ARRLIST_OK); assert_uint_equal(arraylist_capacity(arr), 96); @@ -1211,8 +1211,8 @@ static void test_reserve_normal_capacity(void **state) { static void test_reserve_size_max(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_reserve(arr, SIZE_MAX), ARRLIST_ALLOC_OVERFLOW); assert_uint_equal(arraylist_capacity(arr), 64); @@ -1223,8 +1223,8 @@ static void test_reserve_size_max(void **state) { static void test_reserve_size_0(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); assert_uint_equal(arraylist_reserve(arr, 0), ARRLIST_OK); assert_uint_equal(arraylist_capacity(arr), 64); @@ -1235,8 +1235,8 @@ static void test_reserve_size_0(void **state) { static void test_reserve_while_borrowed(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1255,8 +1255,8 @@ static void test_reserve_while_borrowed(void **state) { static void test_slice_valid_init(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1272,8 +1272,8 @@ static void test_slice_valid_init(void **state) { static void test_slice_invalid_index(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1288,8 +1288,8 @@ static void test_slice_invalid_index(void **state) { static void test_slice_invalid_len(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1304,8 +1304,8 @@ static void test_slice_invalid_len(void **state) { static void test_slice_len_zero(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1320,8 +1320,8 @@ static void test_slice_len_zero(void **state) { static void test_slice_empty_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); ArraySlice *slice = arraylist_slice(arr, 0, 10); @@ -1343,8 +1343,8 @@ static void test_slice_null_arr(void **state) { static void test_slice_unsafe_valid_init(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1360,8 +1360,8 @@ static void test_slice_unsafe_valid_init(void **state) { static void test_slice_unsafe_invalid_index(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1376,8 +1376,8 @@ static void test_slice_unsafe_invalid_index(void **state) { static void test_slice_unsafe_invalid_len(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1392,8 +1392,8 @@ static void test_slice_unsafe_invalid_len(void **state) { static void test_slice_unsafe_len_zero(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (size_t i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1408,8 +1408,8 @@ static void test_slice_unsafe_len_zero(void **state) { static void test_slice_unsafe_empty_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); ArraySlice *slice = arraylist_slice(arr, 0, 10); @@ -1431,8 +1431,8 @@ static void test_slice_unsafe_null_arr(void **state) { static void test_slice_destroy_valid(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1448,8 +1448,8 @@ static void test_slice_destroy_valid(void **state) { static void test_slice_destroy_null_slice(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1464,8 +1464,8 @@ static void test_slice_destroy_null_slice(void **state) { static void test_slice_double_destroy(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1483,8 +1483,8 @@ static void test_slice_double_destroy(void **state) { static void test_slice_peek_valid_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1504,8 +1504,8 @@ static void test_slice_peek_valid_array(void **state) { static void test_slice_peek_invalid_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1527,8 +1527,8 @@ static void test_slice_peek_invalid_array(void **state) { static void test_slice_peek_null_out(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1557,8 +1557,8 @@ static void test_slice_peek_null_slice(void **state) { static void test_slice_next_valid_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1578,8 +1578,8 @@ static void test_slice_next_valid_array(void **state) { static void test_slice_next_invalid_array(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1601,8 +1601,8 @@ static void test_slice_next_invalid_array(void **state) { static void test_slice_next_null_out(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1630,8 +1630,8 @@ static void test_slice_next_null_slice(void **state) { static void test_slice_next_until_invalid(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1655,8 +1655,8 @@ static void test_slice_next_until_invalid(void **state) { static void test_slice_reset_valid_slice(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1696,8 +1696,8 @@ static void test_slice_reset_null_slice(void **state) { static void test_slice_advance_valid_slice(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1721,8 +1721,8 @@ static void test_slice_advance_valid_slice(void **state) { static void test_slice_advance_out_of_bounds(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1746,8 +1746,8 @@ static void test_slice_advance_out_of_bounds(void **state) { static void test_slice_advance_size_max(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; +assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK); @@ -1780,8 +1780,8 @@ static void test_slice_advance_null_array(void **state) { static void test_slice_to_array_valid(void **state) { (void) state; - ArrayList *arr = arraylist_init(64, sizeof(int)); - assert_non_null(arr); + ArrayList *arr; + assert_int_equal(arraylist_init(&arr, 64, sizeof(int)), ARRLIST_OK); for (int i = 0; i < 10; i++) { assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK);