From: Evan Hunt <each@isc.org>
Date: Wed, 24 Oct 2018 17:19:45 +0000 (-0700)
Subject: convert acl_test
X-Git-Tag: v9.13.4~21^2~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a33bca5d55f508d68452a763c12cee48f9d8273a;p=thirdparty%2Fbind9.git

convert acl_test
---

diff --git a/lib/dns/tests/Kyuafile b/lib/dns/tests/Kyuafile
index af447964509..2a7441a618e 100644
--- a/lib/dns/tests/Kyuafile
+++ b/lib/dns/tests/Kyuafile
@@ -1,7 +1,7 @@
 syntax(2)
 test_suite('bind9')
 
-atf_test_program{name='acl_test'}
+tap_test_program{name='acl_test'}
 atf_test_program{name='db_test'}
 atf_test_program{name='dbdiff_test'}
 atf_test_program{name='dbiterator_test'}
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 50d03e56cb8..2d9a6b95fda 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -98,9 +98,9 @@ TARGETS =	acl_test@EXEEXT@ \
 @BIND9_MAKE_RULES@
 
 acl_test@EXEEXT@: acl_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-			acl_test.@O@ dnstest.@O@ ${DNSLIBS} \
-				${ISCLIBS} ${LIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
+		${LDFLAGS} -o $@ acl_test.@O@ dnstest.@O@ ${DNSLIBS} \
+		${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
 
 db_test@EXEEXT@: db_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
diff --git a/lib/dns/tests/acl_test.c b/lib/dns/tests/acl_test.c
index 311fa8c0f8f..fea128d0203 100644
--- a/lib/dns/tests/acl_test.c
+++ b/lib/dns/tests/acl_test.c
@@ -9,34 +9,58 @@
  * 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/print.h>
 #include <isc/string.h>
+#include <isc/util.h>
 
 #include <dns/acl.h>
+
 #include "dnstest.h"
 
-/*
- * Helper functions
- */
+static int
+_setup(void **state) {
+	isc_result_t result;
+
+	UNUSED(state);
+
+	result = dns_test_begin(NULL, false);
+	assert_int_equal(result, ISC_R_SUCCESS);
+
+	return (0);
+}
+
+static int
+_teardown(void **state) {
+	UNUSED(state);
+
+	dns_test_end();
+
+	return (0);
+}
 
 #define	BUFLEN		255
 #define	BIGBUFLEN	(70 * 1024)
 #define TEST_ORIGIN	"test"
 
-ATF_TC(dns_acl_isinsecure);
-ATF_TC_HEAD(dns_acl_isinsecure, tc) {
-	atf_tc_set_md_var(tc, "descr", "test that dns_acl_isinsecure works");
-}
-ATF_TC_BODY(dns_acl_isinsecure, tc) {
+/* test that dns_acl_isinsecure works */
+static void
+dns_acl_isinsecure_test(void **state) {
 	isc_result_t result;
 	dns_acl_t *any = NULL;
 	dns_acl_t *none = NULL;
@@ -48,60 +72,57 @@ ATF_TC_BODY(dns_acl_isinsecure, tc) {
 	dns_aclelement_t *de;
 #endif
 
-	UNUSED(tc);
-
-	result = dns_test_begin(NULL, false);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	UNUSED(state);
 
 	result = dns_acl_any(mctx, &any);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
 	result = dns_acl_none(mctx, &none);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
 	result = dns_acl_create(mctx, 1, &notnone);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
 	result = dns_acl_create(mctx, 1, &notany);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
 	result = dns_acl_merge(notnone, none, false);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
 	result = dns_acl_merge(notany, any, false);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
 #ifdef HAVE_GEOIP
 	result = dns_acl_create(mctx, 1, &geoip);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
 	de = geoip->elements;
-	ATF_REQUIRE(de != NULL);
+	assert_non_null(de);
 	strlcpy(de->geoip_elem.as_string, "AU",
 		sizeof(de->geoip_elem.as_string));
 	de->geoip_elem.subtype = dns_geoip_country_code;
 	de->type = dns_aclelementtype_geoip;
 	de->negative = false;
-	ATF_REQUIRE(geoip->length < geoip->alloc);
+	assert_true(geoip->length < geoip->alloc);
 	geoip->node_count++;
 	de->node_num = geoip->node_count;
 	geoip->length++;
 
 	result = dns_acl_create(mctx, 1, &notgeoip);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 
 	result = dns_acl_merge(notgeoip, geoip, false);
-	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	assert_int_equal(result, ISC_R_SUCCESS);
 #endif
 
-	ATF_CHECK(dns_acl_isinsecure(any));		/* any; */
-	ATF_CHECK(!dns_acl_isinsecure(none));		/* none; */
-	ATF_CHECK(!dns_acl_isinsecure(notany));		/* !any; */
-	ATF_CHECK(!dns_acl_isinsecure(notnone));	/* !none; */
+	assert_true(dns_acl_isinsecure(any));		/* any; */
+	assert_false(dns_acl_isinsecure(none));		/* none; */
+	assert_false(dns_acl_isinsecure(notany));	/* !any; */
+	assert_false(dns_acl_isinsecure(notnone));	/* !none; */
 
 #ifdef HAVE_GEOIP
-	ATF_CHECK(dns_acl_isinsecure(geoip));		/* geoip; */
-	ATF_CHECK(!dns_acl_isinsecure(notgeoip));	/* !geoip; */
+	assert_true(dns_acl_isinsecure(geoip));		/* geoip; */
+	assert_false(dns_acl_isinsecure(notgeoip));	/* !geoip; */
 #endif
 
 	dns_acl_detach(&any);
@@ -112,14 +133,26 @@ ATF_TC_BODY(dns_acl_isinsecure, tc) {
 	dns_acl_detach(&geoip);
 	dns_acl_detach(&notgeoip);
 #endif
+}
 
-	dns_test_end();
+int
+main(void) {
+	const struct CMUnitTest tests[] = {
+		cmocka_unit_test_setup_teardown(dns_acl_isinsecure_test,
+						_setup, _teardown),
+	};
+
+	return (cmocka_run_group_tests(tests, NULL, NULL));
 }
 
-/*
- * Main
- */
-ATF_TP_ADD_TCS(tp) {
-	ATF_TP_ADD_TC(tp, dns_acl_isinsecure);
-	return (atf_no_error());
+#else /* HAVE_CMOCKA */
+
+#include <stdio.h>
+
+int
+main(void) {
+	printf("1..0 # Skipped: cmocka not available\n");
+	return (0);
 }
+
+#endif