1.1 --- a/test/test_list.c Sun Oct 03 18:51:44 2021 +0200
1.2 +++ b/test/test_list.c Tue Oct 05 11:19:32 2021 +0200
1.3 @@ -181,18 +181,18 @@
1.4 CxList list = cxLinkedListCreate(cxTestingAllocator, (CxListComparator) cmp_int, sizeof(int));
1.5
1.6 data = 5;
1.7 - CU_ASSERT_EQUAL(cxTypedListAdd(int, list, &data), 0)
1.8 + CU_ASSERT_EQUAL(cxListAdd(list, &data), 0)
1.9 data = 47;
1.10 - CU_ASSERT_EQUAL(cxTypedListAdd(int, list, &data), 0)
1.11 + CU_ASSERT_EQUAL(cxListAdd(list, &data), 0)
1.12 data = 13;
1.13 - CU_ASSERT_EQUAL(cxTypedListAdd(int, list, &data), 0)
1.14 + CU_ASSERT_EQUAL(cxListAdd(list, &data), 0)
1.15
1.16 CU_ASSERT_EQUAL(list->size, 3)
1.17 CU_ASSERT_TRUE(list->capacity >= list->size)
1.18
1.19 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 0), 5)
1.20 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 1), 47)
1.21 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 2), 13)
1.22 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 0), 5)
1.23 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 1), 47)
1.24 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 2), 13)
1.25
1.26 cxLinkedListDestroy(list);
1.27 CU_ASSERT_TRUE(cxTestingAllocatorVerify())
1.28 @@ -204,15 +204,15 @@
1.29 int data;
1.30 CxList list = cxLinkedListCreate(cxTestingAllocator, (CxListComparator) cmp_int, sizeof(int));
1.31
1.32 - CU_ASSERT_PTR_NULL(cxTypedListLast(int, list))
1.33 + CU_ASSERT_PTR_NULL(cxListLast(list))
1.34
1.35 data = 5;
1.36 - CU_ASSERT_EQUAL(cxTypedListAdd(int, list, &data), 0)
1.37 - CU_ASSERT_EQUAL(*cxTypedListLast(int, list), 5)
1.38 + CU_ASSERT_EQUAL(cxListAdd(list, &data), 0)
1.39 + CU_ASSERT_EQUAL(*(int*)cxListLast(list), 5)
1.40
1.41 data = 47;
1.42 - CU_ASSERT_EQUAL(cxTypedListAdd(int, list, &data), 0)
1.43 - CU_ASSERT_EQUAL(*cxTypedListLast(int, list), 47)
1.44 + CU_ASSERT_EQUAL(cxListAdd(list, &data), 0)
1.45 + CU_ASSERT_EQUAL(*(int*)cxListLast(list), 47)
1.46
1.47 cxLinkedListDestroy(list);
1.48 CU_ASSERT_TRUE(cxTestingAllocatorVerify())
1.49 @@ -225,26 +225,26 @@
1.50 CxList list = cxLinkedListCreate(cxTestingAllocator, (CxListComparator) cmp_int, sizeof(int));
1.51
1.52 data = 5;
1.53 - CU_ASSERT_NOT_EQUAL(cxTypedListInsert(int, list, 1, &data), 0)
1.54 + CU_ASSERT_NOT_EQUAL(cxListInsert(list, 1, &data), 0)
1.55 CU_ASSERT_EQUAL(list->size, 0)
1.56 - CU_ASSERT_EQUAL(cxTypedListInsert(int, list, 0, &data), 0)
1.57 + CU_ASSERT_EQUAL(cxListInsert(list, 0, &data), 0)
1.58 CU_ASSERT_EQUAL(list->size, 1)
1.59 data = 47;
1.60 - CU_ASSERT_EQUAL(cxTypedListInsert(int, list, 0, &data), 0)
1.61 + CU_ASSERT_EQUAL(cxListInsert(list, 0, &data), 0)
1.62 CU_ASSERT_EQUAL(list->size, 2)
1.63 data = 13;
1.64 - CU_ASSERT_EQUAL(cxTypedListInsert(int, list, 1, &data), 0)
1.65 + CU_ASSERT_EQUAL(cxListInsert(list, 1, &data), 0)
1.66 CU_ASSERT_EQUAL(list->size, 3)
1.67 data = 42;
1.68 - CU_ASSERT_EQUAL(cxTypedListInsert(int, list, 3, &data), 0)
1.69 + CU_ASSERT_EQUAL(cxListInsert(list, 3, &data), 0)
1.70
1.71 CU_ASSERT_EQUAL(list->size, 4)
1.72 CU_ASSERT_TRUE(list->capacity >= list->size)
1.73
1.74 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 0), 47)
1.75 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 1), 13)
1.76 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 2), 5)
1.77 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 3), 42)
1.78 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 0), 47)
1.79 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 1), 13)
1.80 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 2), 5)
1.81 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 3), 42)
1.82
1.83 cxLinkedListDestroy(list);
1.84 CU_ASSERT_TRUE(cxTestingAllocatorVerify())
1.85 @@ -257,13 +257,13 @@
1.86 CxList list = cxLinkedListCreate(cxTestingAllocator, (CxListComparator) cmp_int, sizeof(int));
1.87
1.88 data = 5;
1.89 - cxTypedListAdd(int, list, &data);
1.90 + cxListAdd(list, &data);
1.91 data = 47;
1.92 - cxTypedListAdd(int, list, &data);
1.93 + cxListAdd(list, &data);
1.94 data = 42;
1.95 - cxTypedListAdd(int, list, &data);
1.96 + cxListAdd(list, &data);
1.97 data = 13;
1.98 - cxTypedListAdd(int, list, &data);
1.99 + cxListAdd(list, &data);
1.100
1.101 CU_ASSERT_EQUAL(list->size, 4)
1.102 CU_ASSERT_TRUE(list->capacity >= list->size)
1.103 @@ -273,20 +273,20 @@
1.104 CU_ASSERT_EQUAL(cxListRemove(list, 2), 0)
1.105 CU_ASSERT_EQUAL(list->size, 3)
1.106 CU_ASSERT_TRUE(list->capacity >= list->size)
1.107 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 0), 5)
1.108 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 1), 47)
1.109 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 2), 13)
1.110 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 0), 5)
1.111 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 1), 47)
1.112 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 2), 13)
1.113
1.114 CU_ASSERT_EQUAL(cxListRemove(list, 0), 0)
1.115 CU_ASSERT_EQUAL(list->size, 2)
1.116 CU_ASSERT_TRUE(list->capacity >= list->size)
1.117 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 0), 47)
1.118 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 1), 13)
1.119 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 0), 47)
1.120 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 1), 13)
1.121
1.122 CU_ASSERT_EQUAL(cxListRemove(list, 1), 0)
1.123 CU_ASSERT_EQUAL(list->size, 1)
1.124 CU_ASSERT_TRUE(list->capacity >= list->size)
1.125 - CU_ASSERT_EQUAL(*cxTypedListAt(int, list, 0), 47)
1.126 + CU_ASSERT_EQUAL(*(int*)cxListAt(list, 0), 47)
1.127
1.128 CU_ASSERT_EQUAL(cxListRemove(list, 0), 0)
1.129 CU_ASSERT_EQUAL(list->size, 0)
1.130 @@ -305,25 +305,25 @@
1.131 CxList list = cxLinkedListCreate(cxTestingAllocator, (CxListComparator) cmp_int, sizeof(int));
1.132
1.133 data = 5;
1.134 - cxTypedListAdd(int, list, &data);
1.135 + cxListAdd(list, &data);
1.136 data = 47;
1.137 - cxTypedListAdd(int, list, &data);
1.138 + cxListAdd(list, &data);
1.139 data = 13;
1.140 - cxTypedListAdd(int, list, &data);
1.141 + cxListAdd(list, &data);
1.142
1.143 CU_ASSERT_EQUAL(list->size, 3)
1.144 CU_ASSERT_TRUE(list->capacity >= list->size)
1.145
1.146 criteria = 5;
1.147 - CU_ASSERT_EQUAL(cxTypedListFind(int, list, &criteria), 0)
1.148 + CU_ASSERT_EQUAL(cxListFind(list, &criteria), 0)
1.149 criteria = 47;
1.150 - CU_ASSERT_EQUAL(cxTypedListFind(int, list, &criteria), 1)
1.151 + CU_ASSERT_EQUAL(cxListFind(list, &criteria), 1)
1.152 criteria = 13;
1.153 - CU_ASSERT_EQUAL(cxTypedListFind(int, list, &criteria), 2)
1.154 + CU_ASSERT_EQUAL(cxListFind(list, &criteria), 2)
1.155 criteria = 9000;
1.156 - CU_ASSERT_EQUAL(cxTypedListFind(int, list, &criteria), 3)
1.157 + CU_ASSERT_EQUAL(cxListFind(list, &criteria), 3)
1.158 criteria = -5;
1.159 - CU_ASSERT_EQUAL(cxTypedListFind(int, list, &criteria), 3)
1.160 + CU_ASSERT_EQUAL(cxListFind(list, &criteria), 3)
1.161
1.162 cxLinkedListDestroy(list);
1.163 CU_ASSERT_TRUE(cxTestingAllocatorVerify())
