From 3a403046ff241381e0f9750dfe39f1e05c73fd63 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 14 Dec 2013 16:16:46 +0000
Subject: Moved autocomplete tests to cmocka

---
 tests/test_autocomplete.c | 58 ++++++++++++++++++-----------------------------
 tests/testsuite.c         | 16 +++++++++++--
 2 files changed, 36 insertions(+), 38 deletions(-)

(limited to 'tests')

diff --git a/tests/test_autocomplete.c b/tests/test_autocomplete.c
index 58a0e596..3eea639b 100644
--- a/tests/test_autocomplete.c
+++ b/tests/test_autocomplete.c
@@ -1,66 +1,67 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <head-unit.h>
 #include <glib.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include <stdlib.h>
 
 #include "contact.h"
 #include "tools/autocomplete.h"
 
-static void clear_empty(void)
+void clear_empty(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_clear(ac);
 }
 
-static void reset_after_create(void)
+void reset_after_create(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_reset(ac);
     autocomplete_clear(ac);
 }
 
-static void find_after_create(void)
+void find_after_create(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_complete(ac, "hello");
     autocomplete_clear(ac);
 }
 
-static void get_after_create_returns_null(void)
+void get_after_create_returns_null(void **state)
 {
     Autocomplete ac = autocomplete_new();
     GSList *result = autocomplete_get_list(ac);
 
-    assert_is_null(result);
+    assert_null(result);
 
     autocomplete_clear(ac);
 }
 
-static void add_one_and_complete(void)
+void add_one_and_complete(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_add(ac, "Hello");
     char *result = autocomplete_complete(ac, "Hel");
 
-    assert_string_equals("Hello", result);
+    assert_string_equal("Hello", result);
 
     autocomplete_clear(ac);
 }
 
-static void add_two_and_complete_returns_first(void)
+void add_two_and_complete_returns_first(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_add(ac, "Hello");
     autocomplete_add(ac, "Help");
     char *result = autocomplete_complete(ac, "Hel");
 
-    assert_string_equals("Hello", result);
+    assert_string_equal("Hello", result);
 
     autocomplete_clear(ac);
 }
 
-static void add_two_and_complete_returns_second(void)
+void add_two_and_complete_returns_second(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_add(ac, "Hello");
@@ -68,36 +69,36 @@ static void add_two_and_complete_returns_second(void)
     char *result1 = autocomplete_complete(ac, "Hel");
     char *result2 = autocomplete_complete(ac, result1);
 
-    assert_string_equals("Help", result2);
+    assert_string_equal("Help", result2);
 
     autocomplete_clear(ac);
 }
 
-static void add_two_adds_two(void)
+void add_two_adds_two(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_add(ac, "Hello");
     autocomplete_add(ac, "Help");
     GSList *result = autocomplete_get_list(ac);
 
-    assert_int_equals(2, g_slist_length(result));
+    assert_int_equal(2, g_slist_length(result));
 
     autocomplete_clear(ac);
 }
 
-static void add_two_same_adds_one(void)
+void add_two_same_adds_one(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_add(ac, "Hello");
     autocomplete_add(ac, "Hello");
     GSList *result = autocomplete_get_list(ac);
 
-    assert_int_equals(1, g_slist_length(result));
+    assert_int_equal(1, g_slist_length(result));
 
     autocomplete_clear(ac);
 }
 
-static void add_two_same_updates(void)
+void add_two_same_updates(void **state)
 {
     Autocomplete ac = autocomplete_new();
     autocomplete_add(ac, "Hello");
@@ -108,22 +109,7 @@ static void add_two_same_updates(void)
 
     char *str = first->data;
 
-    assert_string_equals("Hello", str);
+    assert_string_equal("Hello", str);
 
     autocomplete_clear(ac);
 }
-
-void register_autocomplete_tests(void)
-{
-    TEST_MODULE("autocomplete tests");
-    TEST(clear_empty);
-    TEST(reset_after_create);
-    TEST(find_after_create);
-    TEST(get_after_create_returns_null);
-    TEST(add_one_and_complete);
-    TEST(add_two_and_complete_returns_first);
-    TEST(add_two_and_complete_returns_second);
-    TEST(add_two_adds_two);
-    TEST(add_two_same_adds_one);
-    TEST(add_two_same_updates);
-}
diff --git a/tests/testsuite.c b/tests/testsuite.c
index b12bacd5..6215b761 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -3,6 +3,7 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
+#include "test_autocomplete.h"
 #include "test_common.h"
 #include "test_command.h"
 
@@ -41,7 +42,18 @@ int main(int argc, char* argv[]) {
         unit_test(next_available_9_in_first_gap),
         unit_test(next_available_0_in_first_gap),
         unit_test(next_available_11_in_first_gap),
-        unit_test(next_available_24_first_big_gap)
-    };
+        unit_test(next_available_24_first_big_gap),
+
+        unit_test(clear_empty),
+        unit_test(reset_after_create),
+        unit_test(find_after_create),
+        unit_test(get_after_create_returns_null),
+        unit_test(add_one_and_complete),
+        unit_test(add_two_and_complete_returns_first),
+        unit_test(add_two_and_complete_returns_second),
+        unit_test(add_two_adds_two),
+        unit_test(add_two_same_adds_one),
+        unit_test(add_two_same_updates)
+     };
     return run_tests(tests);
 }
-- 
cgit 1.4.1-2-gfad0