convert heap_test

diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile
index 8120657f55b182ecfac52aa82a47130c74690391..1b125cd0cfbdf8a0c4dad0edb5c069f4b58b48a2 100644 (file)
--- a/lib/isc/tests/Kyuafile
+++ b/lib/isc/tests/Kyuafile
@@ -7,7 +7,7 @@ tap_test_program{name='counter_test'}
 atf_test_program{name='errno_test'}
 atf_test_program{name='file_test'}
 atf_test_program{name='hash_test'}
-atf_test_program{name='heap_test'}
+tap_test_program{name='heap_test'}
 tap_test_program{name='hmac_test'}
 atf_test_program{name='ht_test'}
 atf_test_program{name='lex_test'}

diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index e1f79486176ebeca251fc7512bcaa2e52f510c6c..30b2f808ad7d00c1fa6495a718dbd1b6124649ee 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -85,8 +85,9 @@ hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
                        hash_test.@O@ ${ISCLIBS} ${LIBS}
 
 heap_test@EXEEXT@: heap_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-                       heap_test.@O@ ${ISCLIBS} ${LIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
+               ${LDFLAGS} -o $@ heap_test.@O@ \
+               ${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
 
 hmac_test@EXEEXT@: hmac_test.@O@ ${ISCDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} ${LDFLAGS} -o $@ \

diff --git a/lib/isc/tests/heap_test.c b/lib/isc/tests/heap_test.c
index 9e7d7c7f620aafe55cc0aaeeaa7419fc5766f2a3..ff975a262e39f2937f7ee62bc44f85ac72438c75 100644 (file)
--- a/lib/isc/tests/heap_test.c
+++ b/lib/isc/tests/heap_test.c
@@ -13,15 +13,20 @@
 
 #include <config.h>
 
-#include <atf-c.h>
+#if HAVE_CMOCKA
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
 
-#include <stdbool.h>
-#include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+
+#define UNIT_TESTING
+#include <cmocka.h>
 
 #include <isc/heap.h>
 #include <isc/mem.h>
-
 #include <isc/util.h>
 
 struct e {
@@ -44,44 +49,54 @@ idx(void *p, unsigned int i) {
        e->index = i;
 }
 
-ATF_TC(isc_heap_delete);
-ATF_TC_HEAD(isc_heap_delete, tc) {
-       atf_tc_set_md_var(tc, "descr", "test isc_heap_delete");
-}
-ATF_TC_BODY(isc_heap_delete, tc) {
+/* test isc_heap_delete() */
+static void
+isc_heap_delete_test(void **state) {
        isc_mem_t *mctx = NULL;
        isc_heap_t *heap = NULL;
        isc_result_t result;
        struct e e1 = { 100, 0 };
 
-       UNUSED(tc);
+       UNUSED(state);
 
        result = isc_mem_create(0, 0, &mctx);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+       assert_int_equal(result, ISC_R_SUCCESS);
 
        result = isc_heap_create(mctx, compare, idx, 0, &heap);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-       ATF_REQUIRE(heap != NULL);
+       assert_int_equal(result, ISC_R_SUCCESS);
+       assert_non_null(heap);
 
        isc_heap_insert(heap, &e1);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-       ATF_REQUIRE_EQ(e1.index, 1);
+       assert_int_equal(result, ISC_R_SUCCESS);
+       assert_int_equal(e1.index, 1);
 
        isc_heap_delete(heap, e1.index);
-       ATF_CHECK_EQ(e1.index, 0);
+       assert_int_equal(e1.index, 0);
 
        isc_heap_destroy(&heap);
-       ATF_REQUIRE_EQ(heap, NULL);
+       assert_int_equal(heap, NULL);
 
        isc_mem_detach(&mctx);
-       ATF_REQUIRE_EQ(mctx, NULL);
+       assert_int_equal(mctx, NULL);
 }
 
-/*
- * Main
- */
-ATF_TP_ADD_TCS(tp) {
-       ATF_TP_ADD_TC(tp, isc_heap_delete);
+int
+main(void) {
+       const struct CMUnitTest tests[] = {
+               cmocka_unit_test(isc_heap_delete_test),
+       };
 
-       return (atf_no_error());
+       return (cmocka_run_group_tests(tests, NULL, NULL));
 }
+
+#else /* HAVE_CMOCKA */
+
+#include <stdio.h>
+
+int
+main(void) {
+       printf("1..0 # Skipped: cmocka not available\n");
+       return (0);
+}
+
+#endif