test: update tests

core-test/core-units.c

@@ -74,19 +74,21 @@ void test_btree_iterate(CuTest *tc)
 	}
 
 	int prev = -1;
-	b_btree_iterator it;
-	b_btree_foreach (&it, &tree) {
+	b_btree_node *bnode = b_btree_first(&tree);
+	while (bnode) {
 		struct test_tree_node *node
-			= b_unbox(struct test_tree_node, it.node, node);
+			= b_unbox(struct test_tree_node, bnode, node);
 		CuAssertPtrNotNull(tc, node);
 
 		if (prev == -1) {
 			prev = node->value;
+			bnode = b_btree_next(bnode);
 			continue;
 		}
 
 		CuAssertTrue(tc, prev <= node->value);
 		prev = node->value;
+		bnode = b_btree_next(bnode);
 	}
 
 	free(nodes);
@@ -134,19 +136,21 @@ void test_queue_iterate(CuTest *tc)
 	}
 
 	int prev = -1;
-	b_queue_iterator it;
-	b_queue_foreach (&it, &q) {
+	struct b_queue_entry *entry = b_queue_first(&q);
+	while (entry) {
 		struct test_queue_entry *e
-			= b_unbox(struct test_queue_entry, it.entry, entry);
+			= b_unbox(struct test_queue_entry, entry, entry);
 		CuAssertPtrNotNull(tc, e);
 
 		if (prev == -1) {
 			prev = e->value;
-			continue;
+			goto skip;
 		}
 
 		CuAssertTrue(tc, prev < e->value);
 		prev = e->value;
+	skip:
+		entry = b_queue_next(entry);
 	}
 }