t/unit/: Create one test binary for each *_test.c file.

[sysdb.git] / t / unit / utils / avltree_test.c

diff --git a/t/unit/utils/avltree_test.c b/t/unit/utils/avltree_test.c
index 3526e4107df078c5fa2f3aa99913f25659bccbf3..9be5e0960821626be4e842350da7314723306015 100644 (file)
--- a/t/unit/utils/avltree_test.c
+++ b/t/unit/utils/avltree_test.c
@@ -25,8 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif
+
 #include "utils/avltree.h"
-#include "libsysdb_test.h"
+#include "testutils.h"
 
 #include <check.h>
 
@@ -35,7 +39,7 @@ static sdb_avltree_t *tree;
 static void
 setup(void)
 {
-       tree = sdb_avltree_create(NULL);
+       tree = sdb_avltree_create();
        fail_unless(tree != NULL,
                        "sdb_avltree_create() = NULL; expected AVL-tree object");
 } /* setup */
@@ -162,27 +166,26 @@ START_TEST(test_lookup)
        populate();
 
        for (i = 0; i < SDB_STATIC_ARRAY_LEN(test_data); ++i) {
-               sdb_object_t ref = SDB_OBJECT_STATIC(test_data[i].name);
                sdb_object_t *obj;
 
-               obj = sdb_avltree_lookup(tree, &ref);
+               obj = sdb_avltree_lookup(tree, test_data[i].name);
                fail_unless(obj != NULL,
-                               "sdb_avltree_lookup(<tree>, <%s>) = NULL; "
-                               "expected: <obj>", ref.name);
+                               "sdb_avltree_lookup(<tree>, %s) = NULL; "
+                               "expected: <obj>", test_data[i].name);
                fail_unless(obj == &test_data[i],
-                               "sdb_avltree_lookup(<tree>, <%s>) = %p (%s); "
-                               "expected: %p, (%s)", ref.name, obj, obj->name,
+                               "sdb_avltree_lookup(<tree>, %s) = %p (%s); "
+                               "expected: %p, (%s)", test_data[i].name, obj, obj->name,
                                &test_data[i], test_data[i].name);
        }
 
        for (i = 0; i < SDB_STATIC_ARRAY_LEN(unused_names); ++i) {
-               sdb_object_t ref = SDB_OBJECT_STATIC(unused_names[i]);
                sdb_object_t *obj;
 
-               obj = sdb_avltree_lookup(tree, &ref);
+               obj = sdb_avltree_lookup(tree, unused_names[i]);
                fail_unless(obj == NULL,
-                               "sdb_avltree_lookup(<tree>, <%s> = %p (%s); "
-                               "expected: NULL", ref.name, obj, obj ? obj->name : "<nil>");
+                               "sdb_avltree_lookup(<tree>, %s) = %p (%s); "
+                               "expected: NULL", unused_names[i],
+                               obj, obj ? obj->name : "<nil>");
        }
 }
 END_TEST
@@ -237,22 +240,17 @@ START_TEST(test_iter)
 }
 END_TEST
 
-Suite *
-util_avltree_suite(void)
+TEST_MAIN("utils::avltree")
 {
-       Suite *s = suite_create("utils::avltree");
-       TCase *tc;
-
-       tc = tcase_create("core");
+       TCase *tc = tcase_create("core");
        tcase_add_checked_fixture(tc, setup, teardown);
        tcase_add_test(tc, test_null);
        tcase_add_test(tc, test_insert);
        tcase_add_test(tc, test_lookup);
        tcase_add_test(tc, test_iter);
-       suite_add_tcase(s, tc);
-
-       return s;
-} /* util_avltree_suite */
+       ADD_TCASE(tc);
+}
+TEST_MAIN_END
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */