convert radix_test

diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile
index 1b125cd0cfbdf8a0c4dad0edb5c069f4b58b48a2..1148f76f5c8f1536dcca468f0286a01bef3bf37c 100644 (file)
--- a/lib/isc/tests/Kyuafile
+++ b/lib/isc/tests/Kyuafile
@@ -17,7 +17,7 @@ atf_test_program{name='netaddr_test'}
 tap_test_program{name='parse_test'}
 atf_test_program{name='pool_test'}
 atf_test_program{name='queue_test'}
-atf_test_program{name='radix_test'}
+tap_test_program{name='radix_test'}
 atf_test_program{name='regex_test'}
 tap_test_program{name='result_test'}
 atf_test_program{name='safe_test'}

diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 30b2f808ad7d00c1fa6495a718dbd1b6124649ee..e3fd51825afbbb6e7af3b743069ff68e7bdda704 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -127,8 +127,9 @@ queue_test@EXEEXT@: queue_test.@O@ isctest.@O@ ${ISCDEPLIBS}
                        queue_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
 
 radix_test@EXEEXT@: radix_test.@O@ isctest.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-                       radix_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
+               ${LDFLAGS} -o $@ radix_test.@O@ isctest.@O@ \
+               ${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
 
 random_test@EXEEXT@: random_test.@O@ isctest.@O@ ${ISCDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \

diff --git a/lib/isc/tests/radix_test.c b/lib/isc/tests/radix_test.c
index 66466bcaf7321641888ccbae3ebe9d1177f265a5..b17391ef798eada63211d5cd476084965a1a5a2d 100644 (file)
--- a/lib/isc/tests/radix_test.c
+++ b/lib/isc/tests/radix_test.c
@@ -11,23 +11,50 @@
 
 #include <config.h>
 
+#if HAVE_CMOCKA
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#define UNIT_TESTING
+#include <cmocka.h>
+
 #include <isc/mem.h>
 #include <isc/netaddr.h>
 #include <isc/radix.h>
 #include <isc/result.h>
 #include <isc/util.h>
 
-#include <atf-c.h>
+#include "isctest.h"
 
-#include <stdlib.h>
+static int
+_setup(void **state) {
+       isc_result_t result;
 
-#include "isctest.h"
+       UNUSED(state);
+
+       result = isc_test_begin(NULL, true, 0);
+       assert_int_equal(result, ISC_R_SUCCESS);
+
+       return (0);
+}
 
-ATF_TC(isc_radix_search);
-ATF_TC_HEAD(isc_radix_search, tc) {
-       atf_tc_set_md_var(tc, "descr", "test radix seaching");
+static int
+_teardown(void **state) {
+       UNUSED(state);
+
+       isc_test_end();
+
+       return (0);
 }
-ATF_TC_BODY(isc_radix_search, tc) {
+
+/* test radix searching */
+static void
+isc_radix_search_test(void **state) {
        isc_radix_tree_t *radix = NULL;
        isc_radix_node_t *node;
        isc_prefix_t prefix;
@@ -35,13 +62,10 @@ ATF_TC_BODY(isc_radix_search, tc) {
        struct in_addr in_addr;
        isc_netaddr_t netaddr;
 
-       UNUSED(tc);
-
-       result = isc_test_begin(NULL, true, 0);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+       UNUSED(state);
 
        result = isc_radix_create(mctx, &radix, 32);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+       assert_int_equal(result, ISC_R_SUCCESS);
 
        in_addr.s_addr = inet_addr("3.3.3.0");
        isc_netaddr_fromin(&netaddr, &in_addr);
@@ -49,7 +73,7 @@ ATF_TC_BODY(isc_radix_search, tc) {
 
        node = NULL;
        result = isc_radix_insert(radix, &node, NULL, &prefix);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+       assert_int_equal(result, ISC_R_SUCCESS);
        node->data[0] = (void *)1;
        isc_refcount_destroy(&prefix.refcount);
 
@@ -59,7 +83,7 @@ ATF_TC_BODY(isc_radix_search, tc) {
 
        node = NULL;
        result = isc_radix_insert(radix, &node, NULL, &prefix);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+       assert_int_equal(result, ISC_R_SUCCESS);
        node->data[0] = (void *)2;
        isc_refcount_destroy(&prefix.refcount);
 
@@ -69,21 +93,32 @@ ATF_TC_BODY(isc_radix_search, tc) {
 
        node = NULL;
        result = isc_radix_search(radix, &node, &prefix);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-       ATF_REQUIRE_EQ(node->data[0], (void *)2);
+       assert_int_equal(result, ISC_R_SUCCESS);
+       assert_int_equal(node->data[0], (void *)2);
 
        isc_refcount_destroy(&prefix.refcount);
 
        isc_radix_destroy(radix, NULL);
+}
 
-       isc_test_end();
+int
+main(void) {
+       const struct CMUnitTest tests[] = {
+               cmocka_unit_test_setup_teardown(isc_radix_search_test,
+                                               _setup, _teardown),
+       };
+
+       return (cmocka_run_group_tests(tests, NULL, NULL));
 }
 
-/*
- * Main
- */
-ATF_TP_ADD_TCS(tp) {
-       ATF_TP_ADD_TC(tp, isc_radix_search);
+#else /* HAVE_CMOCKA */
+
+#include <stdio.h>
 
-       return (atf_no_error());
+int
+main(void) {
+       printf("1..0 # Skipped: cmocka not available\n");
+       return (0);
 }
+
+#endif