From 1bac3f3a2f3286d1f5bf92ec4eab84a88719c87d Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 29 Feb 2016 01:37:48 +0100
Subject: [PATCH] tests: unittests: adapt tests-core-clist to singly linked
 clist

---
 tests/unittests/tests-core/tests-core-clist.c | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/tests/unittests/tests-core/tests-core-clist.c b/tests/unittests/tests-core/tests-core-clist.c
index 11e4fd9303..d9ec7e42fb 100644
--- a/tests/unittests/tests-core/tests-core-clist.c
+++ b/tests/unittests/tests-core/tests-core-clist.c
@@ -16,7 +16,8 @@
 
 #define TEST_CLIST_LEN    (8)
 
-static clist_node_t tests_clist_buf[TEST_CLIST_LEN];
+static list_node_t tests_clist_buf[TEST_CLIST_LEN];
+static list_node_t test_clist;
 
 static void set_up(void)
 {
@@ -25,64 +26,70 @@ static void set_up(void)
 
 static void test_clist_add_one(void)
 {
-    clist_node_t *list = NULL, *elem = &(tests_clist_buf[0]);
+    list_node_t *elem = &(tests_clist_buf[0]);
+    list_node_t *list = &test_clist;
+    list->next = NULL;
 
-    clist_add(&list, elem);
+    clist_insert(list, elem);
 
-    TEST_ASSERT_NOT_NULL(list);
-    TEST_ASSERT(list->next == list);
+    TEST_ASSERT_NOT_NULL(list->next);
+    TEST_ASSERT(list->next->next == list->next);
 }
 
 static void test_clist_add_two(void)
 {
-    clist_node_t *list = &(tests_clist_buf[0]), *elem = &(tests_clist_buf[1]);
+    list_node_t *list = &test_clist;
+    list->next = NULL;
+
+    list_node_t *elem = &(tests_clist_buf[1]);
 
     test_clist_add_one();
 
-    clist_add(&list, elem);
+    clist_insert(list, elem);
 
-    TEST_ASSERT_NOT_NULL(list);
+    TEST_ASSERT_NOT_NULL(list->next);
     TEST_ASSERT(list->next == elem);
-    TEST_ASSERT(list->next->next == list);
+    TEST_ASSERT(list->next->next->next == list->next);
 }
 
-static void test_clist_remove_one(void)
+static void test_clist_remove_head(void)
 {
-    clist_node_t *list = &(tests_clist_buf[0]), *elem = &(tests_clist_buf[1]);
+    list_node_t *list = &test_clist;
 
     test_clist_add_two();
 
-    clist_remove(&list, elem);
+    clist_remove_head(list);
 
-    TEST_ASSERT_NOT_NULL(list);
-    TEST_ASSERT(list->next == list);
+    TEST_ASSERT_NOT_NULL(list->next);
+    TEST_ASSERT(list->next->next == &tests_clist_buf[1]);
 }
 
 static void test_clist_remove_two(void)
 {
-    clist_node_t *list = &(tests_clist_buf[0]), *elem = &(tests_clist_buf[1]);
+    list_node_t *list = &test_clist;
 
     test_clist_add_two();
 
-    clist_remove(&list, elem);
-    clist_remove(&list, list);
+    clist_remove_head(list);
+    clist_remove_head(list);
 
-    TEST_ASSERT_NULL(list);
+    TEST_ASSERT_NULL(list->next);
 }
 
 static void test_clist_advance(void)
 {
-    clist_node_t *list = &(tests_clist_buf[0]);
+    list_node_t *list = &test_clist;
+    list->next = NULL;
 
     test_clist_add_two();
 
-    clist_advance(&list);
+    clist_advance(list);
 
-    TEST_ASSERT(list == &(tests_clist_buf[1]));
+    TEST_ASSERT(list->next->next == &tests_clist_buf[1]);
 
-    clist_advance(&list);
+    clist_advance(list);
 
-    TEST_ASSERT(list == &(tests_clist_buf[0]));
+    TEST_ASSERT(list->next->next == &tests_clist_buf[0]);
 }
 
 Test *tests_core_clist_tests(void)
@@ -90,7 +97,7 @@ Test *tests_core_clist_tests(void)
     EMB_UNIT_TESTFIXTURES(fixtures) {
         new_TestFixture(test_clist_add_one),
         new_TestFixture(test_clist_add_two),
-        new_TestFixture(test_clist_remove_one),
+        new_TestFixture(test_clist_remove_head),
         new_TestFixture(test_clist_remove_two),
         new_TestFixture(test_clist_advance),
     };