From: Evan Hunt <each@isc.org>
Date: Wed, 24 Oct 2018 17:10:59 +0000 (-0700)
Subject: convert listenlist_test; remove ATF from lib/ns/tests
X-Git-Tag: v9.13.4~21^2~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79ac71576354f1db753f9c5a9f1cdd84bc753402;p=thirdparty%2Fbind9.git

convert listenlist_test; remove ATF from lib/ns/tests
---

diff --git a/lib/ns/tests/Kyuafile b/lib/ns/tests/Kyuafile
index cc07b8fde50..ca15d6fb842 100644
--- a/lib/ns/tests/Kyuafile
+++ b/lib/ns/tests/Kyuafile
@@ -1,6 +1,6 @@
 syntax(2)
 test_suite('bind9')
 
-atf_test_program{name='listenlist_test'}
+tap_test_program{name='listenlist_test'}
 tap_test_program{name='notify_test'}
 tap_test_program{name='query_test'}
diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index a814c113847..61a66a9124b 100644
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -26,10 +26,9 @@ DNSDEPLIBS =	../../dns/libdns.@A@
 NSLIBS =	../libns.@A@
 NSDEPLIBS =	../libns.@A@
 
-LIBS =		@LIBS@ @ATFLIBS@
+CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
+LIBS =		@LIBS@ @CMOCKA_LIBS@
 
-CMOCKA_CFLAGS =	@CMOCKA_CFLAGS@
-CMOCKA_LIBS =	@CMOCKA_LIBS@
 
 OBJS =		nstest.@O@
 SRCS =		nstest.c \
@@ -45,19 +44,19 @@ TARGETS =	listenlist_test@EXEEXT@ \
 @BIND9_MAKE_RULES@
 
 listenlist_test@EXEEXT@: listenlist_test.@O@ nstest.@O@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-			listenlist_test.@O@ nstest.@O@ ${NSLIBS} ${DNSLIBS} \
-				${ISCLIBS} ${LIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} \
+		${LDFLAGS} -o $@ listenlist_test.@O@ nstest.@O@ \
+		${NSLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
 notify_test@EXEEXT@: notify_test.@O@ nstest.@O@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} \
 		${LDFLAGS} -o $@ notify_test.@O@ nstest.@O@ \
-		${NSLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
+		${NSLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
 query_test@EXEEXT@: query_test.@O@ nstest.@O@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} \
 		${LDFLAGS} -o $@ query_test.@O@ nstest.@O@ \
-		${NSLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
+		${NSLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
 unit::
 	sh ${top_builddir}/unit/unittest.sh
diff --git a/lib/ns/tests/listenlist_test.c b/lib/ns/tests/listenlist_test.c
index a4f7d6e78d5..4367b297b03 100644
--- a/lib/ns/tests/listenlist_test.c
+++ b/lib/ns/tests/listenlist_test.c
@@ -9,17 +9,25 @@
  * information regarding copyright ownership.
  */
 
-/*! \file */
-
 #include <config.h>
 
-#include <atf-c.h>
+#if HAVE_CMOCKA
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
 
+#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
+#define UNIT_TESTING
+#include <cmocka.h>
+
 #include <isc/list.h>
 #include <isc/print.h>
+#include <isc/util.h>
 
 #include <dns/acl.h>
 
@@ -27,30 +35,42 @@
 
 #include "nstest.h"
 
-/*
- * Helper functions
- */
+static int
+_setup(void **state) {
+	isc_result_t result;
+
+	UNUSED(state);
+
+	result = ns_test_begin(NULL, true);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	return (0);
+}
+
+static int
+_teardown(void **state) {
+	UNUSED(state);
+
+	ns_test_end();
 
-ATF_TC(ns_listenlist_default);
-ATF_TC_HEAD(ns_listenlist_default, tc) {
-	atf_tc_set_md_var(tc, "descr", "test that ns_listenlist_default works");
+	return (0);
 }
-ATF_TC_BODY(ns_listenlist_default, tc) {
+
+/* test that ns_listenlist_default() works */
+static void
+ns_listenlist_default_test(void **state) {
 	isc_result_t result;
 	ns_listenlist_t *list = NULL;
 	ns_listenelt_t *elt;
 	int count;
 
-	UNUSED(tc);
-
-	result = ns_test_begin(NULL, false);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	UNUSED(state);
 
 	result = ns_listenlist_default(mctx, 5300, -1, false, &list);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-	ATF_REQUIRE(list != NULL);
+	assert_int_equal(result, ISC_R_SUCCESS);
+	assert_non_null(list);
 
-	ATF_CHECK(!ISC_LIST_EMPTY(list->elts));
+	assert_false(ISC_LIST_EMPTY(list->elts));
 
 	count = 0;
 	elt = ISC_LIST_HEAD(list->elts);
@@ -63,42 +83,54 @@ ATF_TC_BODY(ns_listenlist_default, tc) {
 		ns_listenelt_destroy(elt);
 		elt = next;
 
-		ATF_CHECK(dns_acl_isnone(acl));
+		assert_true(dns_acl_isnone(acl));
 		dns_acl_detach(&acl);
 		count++;
 	}
 
-	ATF_CHECK(ISC_LIST_EMPTY(list->elts));
-	ATF_CHECK_EQ(count, 1);
+	assert_true(ISC_LIST_EMPTY(list->elts));
+	assert_int_equal(count, 1);
 
 	ns_listenlist_detach(&list);
 
 	result = ns_listenlist_default(mctx, 5300, -1, true, &list);
-	ATF_CHECK_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
-	ATF_CHECK(!ISC_LIST_EMPTY(list->elts));
+	assert_false(ISC_LIST_EMPTY(list->elts));
 
 	/* This time just use ns_listenlist_detach() to destroy elements */
 	count = 0;
 	elt = ISC_LIST_HEAD(list->elts);
 	while (elt != NULL) {
 		ns_listenelt_t *next = ISC_LIST_NEXT(elt, link);
-		ATF_CHECK(dns_acl_isany(elt->acl));
+		assert_true(dns_acl_isany(elt->acl));
 		elt = next;
 		count++;
 	}
 
-	ATF_CHECK_EQ(count, 1);
+	assert_int_equal(count, 1);
 
 	ns_listenlist_detach(&list);
+}
 
-	ns_test_end();
+int
+main(void) {
+	const struct CMUnitTest tests[] = {
+		cmocka_unit_test_setup_teardown(ns_listenlist_default_test,
+						_setup, _teardown),
+	};
+
+	return (cmocka_run_group_tests(tests, NULL, NULL));
 }
 
-/*
- * Main
- */
-ATF_TP_ADD_TCS(tp) {
-	ATF_TP_ADD_TC(tp, ns_listenlist_default);
-	return (atf_no_error());
+#else /* HAVE_CMOCKA */
+
+#include <stdio.h>
+
+int
+main(void) {
+	printf("1..0 # Skipped: cmocka not available\n");
+	return (0);
 }
+
+#endif