Mercurial > hg > ucx / file diff

--- a/tests/test_list.c	Fri Oct 17 15:04:56 2025 +0200
+++ b/tests/test_list.c	Fri Oct 17 16:53:24 2025 +0200
@@ -1119,8 +1119,25 @@
 
     CxIterator it1 = cxListIterator(list);
     CxIterator it2 = cxListBackwardsIterator(list);
-    CxIterator it3 = cxListMutIterator(list);
-    CxIterator it4 = cxListMutBackwardsIterator(list);
+
+    CX_TEST_DO {
+        CX_TEST_ASSERT(!cxIteratorValid(it1));
+        CX_TEST_ASSERT(!cxIteratorValid(it2));
+
+        int c = 0;
+        cx_foreach(void*, data, it1) c++;
+        cx_foreach(void*, data, it2) c++;
+        CX_TEST_ASSERT(c == 0);
+    }
+}
+
+CX_TEST(test_null_list_iterator) {
+    CxList *list = NULL;
+
+    CxIterator it1 = cxListIterator(list);
+    CxIterator it2 = cxListBackwardsIterator(list);
+    CxIterator it3 = cxListIteratorAt(list, 0);
+    CxIterator it4 = cxListBackwardsIteratorAt(list, 0);
 
     CX_TEST_DO {
         CX_TEST_ASSERT(!cxIteratorValid(it1));
@@ -1137,35 +1154,6 @@
     }
 }
 
-CX_TEST(test_null_list_iterator) {
-    CxList *list = NULL;
-
-    CxIterator it1 = cxListIterator(list);
-    CxIterator it2 = cxListBackwardsIterator(list);
-    CxIterator it3 = cxListMutIterator(list);
-    CxIterator it4 = cxListMutBackwardsIterator(list);
-    CxIterator it5 = cxListMutIteratorAt(list, 0);
-    CxIterator it6 = cxListMutBackwardsIteratorAt(list, 0);
-
-    CX_TEST_DO {
-        CX_TEST_ASSERT(!cxIteratorValid(it1));
-        CX_TEST_ASSERT(!cxIteratorValid(it2));
-        CX_TEST_ASSERT(!cxIteratorValid(it3));
-        CX_TEST_ASSERT(!cxIteratorValid(it4));
-        CX_TEST_ASSERT(!cxIteratorValid(it5));
-        CX_TEST_ASSERT(!cxIteratorValid(it6));
-
-        int c = 0;
-        cx_foreach(void*, data, it1) c++;
-        cx_foreach(void*, data, it2) c++;
-        cx_foreach(void*, data, it3) c++;
-        cx_foreach(void*, data, it4) c++;
-        cx_foreach(void*, data, it5) c++;
-        cx_foreach(void*, data, it6) c++;
-        CX_TEST_ASSERT(c == 0);
-    }
-}
-
 CX_TEST(test_empty_list_noops) {
     CX_TEST_DO {
         CxList copy = *cxEmptyList;
@@ -2279,7 +2267,7 @@
     }
     CX_TEST_ASSERT(i == 0);
     i = len / 2;
-    CxIterator mut_iter = cxListMutIteratorAt(list, i);
+    CxIterator mut_iter = cxListIteratorAt(list, i);
     CX_TEST_ASSERT(mut_iter.elem_size == list->collection.elem_size);
     CX_TEST_ASSERT(mut_iter.elem_count == list->collection.size);
     size_t j = 0;
@@ -2293,7 +2281,7 @@
     CX_TEST_ASSERT(i == len);
     i = len / 2;
     j = 0;
-    mut_iter = cxListMutBackwardsIteratorAt(list, i - 1);
+    mut_iter = cxListBackwardsIteratorAt(list, i - 1);
     cx_foreach(int*, x, mut_iter) {
         CX_TEST_ASSERT(mut_iter.index == len / 2 - 1 - j);
         CX_TEST_ASSERT(*x == testdata[i - 1]);
@@ -2318,7 +2306,7 @@
     }
     int newdata[] = array_init(10, 20, 30, 40, 50);
 
-    CxIterator iter = cxListMutIteratorAt(list, 2);
+    CxIterator iter = cxListIteratorAt(list, 2);
     CX_TEST_ASSERT(cxIteratorValid(iter));
     CX_TEST_ASSERT(iter.index == 2);
     CX_TEST_ASSERT(*(int *) cxIteratorCurrent(iter) == 2);
@@ -2334,18 +2322,18 @@
     CX_TEST_ASSERT(*(int *) cxIteratorCurrent(iter) == 2);
     CX_TEST_ASSERT(iter.elem_count == 7);
 
-    iter = cxListMutIterator(list);
+    iter = cxListIterator(list);
     cxListInsertBefore(&iter, &newdata[2]);
     CX_TEST_ASSERT(cxIteratorValid(iter));
     CX_TEST_ASSERT(iter.index == 1);
     CX_TEST_ASSERT(*(int *) cxIteratorCurrent(iter) == 0);
     CX_TEST_ASSERT(iter.elem_count == 8);
-    iter = cxListMutIteratorAt(list, cxListSize(list));
+    iter = cxListIteratorAt(list, cxListSize(list));
     cxListInsertBefore(&iter, &newdata[3]);
     CX_TEST_ASSERT(!cxIteratorValid(iter));
     CX_TEST_ASSERT(iter.index == 9);
     CX_TEST_ASSERT(iter.elem_count == 9);
-    iter = cxListMutIteratorAt(list, cxListSize(list));
+    iter = cxListIteratorAt(list, cxListSize(list));
     cxListInsertAfter(&iter, &newdata[4]);
     CX_TEST_ASSERT(!cxIteratorValid(iter));
     CX_TEST_ASSERT(iter.index == 10);
@@ -2444,7 +2432,7 @@
     CX_TEST_ASSERT(testdata[48] == destr_last_value + off);
     CX_TEST_ASSERT(testdata_len - destr_test_ctr == cxListSize(list));
 
-    CxIterator iter = cxListMutIteratorAt(list, 7);
+    CxIterator iter = cxListIteratorAt(list, 7);
     CX_TEST_ASSERT(iter.elem_count == testdata_len - 2);
     cxIteratorNext(iter);
     CX_TEST_ASSERT(2 == destr_test_ctr);
@@ -2457,7 +2445,7 @@
     CX_TEST_ASSERT(testdata[8] == destr_last_value + off);
     CX_TEST_ASSERT(testdata_len - destr_test_ctr == cxListSize(list));
 
-    iter = cxListMutBackwardsIteratorAt(list, 5);
+    iter = cxListBackwardsIteratorAt(list, 5);
     cxIteratorNext(iter);
     CX_TEST_ASSERT(3 == destr_test_ctr);
     CX_TEST_ASSERT(testdata[8] == destr_last_value + off);