1.1 --- a/tests/test_list.c Thu May 23 20:29:28 2024 +0200
1.2 +++ b/tests/test_list.c Thu May 23 20:31:37 2024 +0200
1.3 @@ -706,7 +706,7 @@
1.4 CX_TEST_DO {
1.5 CxList *list = cxLinkedListCreate(alloc, cx_cmp_int, sizeof(int));
1.6 CX_TEST_ASSERT(list != NULL);
1.7 - CX_TEST_ASSERT(list->base.item_size == sizeof(int));
1.8 + CX_TEST_ASSERT(list->base.elem_size == sizeof(int));
1.9 CX_TEST_ASSERT(list->base.simple_destructor == NULL);
1.10 CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
1.11 CX_TEST_ASSERT(list->base.destructor_data == NULL);
1.12 @@ -724,7 +724,7 @@
1.13 CxList *list = cxLinkedListCreateSimple(sizeof(int));
1.14 CX_TEST_DO {
1.15 CX_TEST_ASSERT(list != NULL);
1.16 - CX_TEST_ASSERT(list->base.item_size == sizeof(int));
1.17 + CX_TEST_ASSERT(list->base.elem_size == sizeof(int));
1.18 CX_TEST_ASSERT(list->base.simple_destructor == NULL);
1.19 CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
1.20 CX_TEST_ASSERT(list->base.destructor_data == NULL);
1.21 @@ -741,7 +741,7 @@
1.22 CX_TEST_DO {
1.23 CX_TEST_ASSERT(!cxListIsStoringPointers(list));
1.24 cxListStorePointers(list);
1.25 - CX_TEST_ASSERT(list->base.item_size == sizeof(void *));
1.26 + CX_TEST_ASSERT(list->base.elem_size == sizeof(void *));
1.27 CX_TEST_ASSERT(list->cl != NULL);
1.28 CX_TEST_ASSERT(list->climpl != NULL);
1.29 CX_TEST_ASSERT(cxListIsStoringPointers(list));
1.30 @@ -757,7 +757,7 @@
1.31 CxList *list = cxLinkedListCreateSimple(CX_STORE_POINTERS);
1.32 CX_TEST_DO {
1.33 CX_TEST_ASSERT(list != NULL);
1.34 - CX_TEST_ASSERT(list->base.item_size == sizeof(void*));
1.35 + CX_TEST_ASSERT(list->base.elem_size == sizeof(void*));
1.36 CX_TEST_ASSERT(list->base.simple_destructor == NULL);
1.37 CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
1.38 CX_TEST_ASSERT(list->base.destructor_data == NULL);
1.39 @@ -776,7 +776,7 @@
1.40 CX_TEST_DO {
1.41 CxList *list = cxArrayListCreate(alloc, cx_cmp_int, sizeof(int), 8);
1.42 CX_TEST_ASSERT(list != NULL);
1.43 - CX_TEST_ASSERT(list->base.item_size == sizeof(int));
1.44 + CX_TEST_ASSERT(list->base.elem_size == sizeof(int));
1.45 CX_TEST_ASSERT(list->base.simple_destructor == NULL);
1.46 CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
1.47 CX_TEST_ASSERT(list->base.destructor_data == NULL);
1.48 @@ -794,7 +794,7 @@
1.49 CxList *list = cxArrayListCreateSimple(sizeof(int), 8);
1.50 CX_TEST_DO {
1.51 CX_TEST_ASSERT(list != NULL);
1.52 - CX_TEST_ASSERT(list->base.item_size == sizeof(int));
1.53 + CX_TEST_ASSERT(list->base.elem_size == sizeof(int));
1.54 CX_TEST_ASSERT(list->base.simple_destructor == NULL);
1.55 CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
1.56 CX_TEST_ASSERT(list->base.destructor_data == NULL);
1.57 @@ -810,7 +810,7 @@
1.58 CxList *list = cxArrayListCreateSimple(CX_STORE_POINTERS, 8);
1.59 CX_TEST_DO {
1.60 CX_TEST_ASSERT(list != NULL);
1.61 - CX_TEST_ASSERT(list->base.item_size == sizeof(void*));
1.62 + CX_TEST_ASSERT(list->base.elem_size == sizeof(void*));
1.63 CX_TEST_ASSERT(list->base.simple_destructor == NULL);
1.64 CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
1.65 CX_TEST_ASSERT(list->base.destructor_data == NULL);
1.66 @@ -1207,7 +1207,7 @@
1.67 int *testdata = int_test_data_added_to_list(list, isptrlist, len);
1.68
1.69 CxIterator iter = cxListIterator(list);
1.70 - CX_TEST_ASSERT(iter.elem_size == list->base.item_size);
1.71 + CX_TEST_ASSERT(iter.elem_size == list->base.elem_size);
1.72 CX_TEST_ASSERT(iter.elem_count == list->base.size);
1.73 size_t i = 0;
1.74 cx_foreach(int*, x, iter) {
1.75 @@ -1225,7 +1225,7 @@
1.76 CX_TEST_ASSERT(i == 0);
1.77 i = len / 2;
1.78 CxIterator mut_iter = cxListMutIteratorAt(list, i);
1.79 - CX_TEST_ASSERT(mut_iter.elem_size == list->base.item_size);
1.80 + CX_TEST_ASSERT(mut_iter.elem_size == list->base.elem_size);
1.81 CX_TEST_ASSERT(mut_iter.elem_count == list->base.size);
1.82 size_t j = 0;
1.83 cx_foreach(int*, x, mut_iter) {
