convert rdataset_test

diff --git a/lib/dns/tests/Kyuafile b/lib/dns/tests/Kyuafile
index 2a7441a618e97dd8b0d3a056c557e371aea7e38f..e2ff095cf6e2c901780db39a57476dfc96582a89 100644 (file)
--- a/lib/dns/tests/Kyuafile
+++ b/lib/dns/tests/Kyuafile
@@ -20,7 +20,7 @@ atf_test_program{name='private_test'}
 atf_test_program{name='rbt_serialize_test', is_exclusive=true}
 atf_test_program{name='rbt_test'}
 atf_test_program{name='rdata_test'}
-atf_test_program{name='rdataset_test'}
+tap_test_program{name='rdataset_test'}
 atf_test_program{name='rdatasetstats_test'}
 atf_test_program{name='resolver_test'}
 tap_test_program{name='result_test'}

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 2d9a6b95fdad0459c120d2b0f734d567e00e510c..c0c761254f1bb9a05e2ebc1f4f81248bcfb18d0f 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -201,9 +201,9 @@ rdata_test@EXEEXT@: rdata_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
                        ${ISCLIBS} ${LIBS}
 
 rdataset_test@EXEEXT@: rdataset_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-                       rdataset_test.@O@ dnstest.@O@ ${DNSLIBS} \
-                               ${ISCLIBS} ${LIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
+               ${LDFLAGS} -o $@ rdataset_test.@O@ dnstest.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
 
 rdatasetstats_test@EXEEXT@: rdatasetstats_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \

diff --git a/lib/dns/tests/rdataset_test.c b/lib/dns/tests/rdataset_test.c
index b0558463bc00d35d6b8f96b04b1eaf26daeca403..36d4e2dc4e616ae14eecba7d84320442655f8868 100644 (file)
--- a/lib/dns/tests/rdataset_test.c
+++ b/lib/dns/tests/rdataset_test.c
@@ -9,33 +9,52 @@
  * 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 <string.h>
 #include <unistd.h>
 
+#define UNIT_TESTING
+#include <cmocka.h>
+
+#include <isc/util.h>
+
 #include <dns/rdataset.h>
 #include <dns/rdatastruct.h>
 
 #include "dnstest.h"
 
+static int
+_setup(void **state) {
+       isc_result_t result;
 
-/*
- * Individual unit tests
- */
+       UNUSED(state);
+
+       result = dns_test_begin(NULL, false);
+       assert_int_equal(result, ISC_R_SUCCESS);
 
-/* Successful load test */
-ATF_TC(trimttl);
-ATF_TC_HEAD(trimttl, tc) {
-       atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() loads a "
-                                      "valid master file and returns success");
+       return (0);
 }
-ATF_TC_BODY(trimttl, tc) {
-       isc_result_t result;
+
+static int
+_teardown(void **state) {
+       UNUSED(state);
+
+       dns_test_end();
+
+       return (0);
+}
+
+/* test trimming of rdataset TTLs */
+static void
+trimttl(void **state) {
        dns_rdataset_t rdataset, sigrdataset;
        dns_rdata_rrsig_t rrsig;
        isc_stdtime_t ttltimenow, ttltimeexpire;
@@ -43,14 +62,11 @@ ATF_TC_BODY(trimttl, tc) {
        ttltimenow = 10000000;
        ttltimeexpire = ttltimenow + 800;
 
-       UNUSED(tc);
+       UNUSED(state);
 
        dns_rdataset_init(&rdataset);
        dns_rdataset_init(&sigrdataset);
 
-       result = dns_test_begin(NULL, false);
-       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-
        rdataset.ttl = 900;
        sigrdataset.ttl = 1000;
        rrsig.timeexpire = ttltimeexpire;
@@ -58,8 +74,8 @@ ATF_TC_BODY(trimttl, tc) {
 
        dns_rdataset_trimttl(&rdataset, &sigrdataset, &rrsig, ttltimenow,
                             true);
-       ATF_REQUIRE_EQ(rdataset.ttl, 800);
-       ATF_REQUIRE_EQ(sigrdataset.ttl, 800);
+       assert_int_equal(rdataset.ttl, 800);
+       assert_int_equal(sigrdataset.ttl, 800);
 
        rdataset.ttl = 900;
        sigrdataset.ttl = 1000;
@@ -68,8 +84,8 @@ ATF_TC_BODY(trimttl, tc) {
 
        dns_rdataset_trimttl(&rdataset, &sigrdataset, &rrsig, ttltimenow,
                             true);
-       ATF_REQUIRE_EQ(rdataset.ttl, 120);
-       ATF_REQUIRE_EQ(sigrdataset.ttl, 120);
+       assert_int_equal(rdataset.ttl, 120);
+       assert_int_equal(sigrdataset.ttl, 120);
 
        rdataset.ttl = 900;
        sigrdataset.ttl = 1000;
@@ -78,8 +94,8 @@ ATF_TC_BODY(trimttl, tc) {
 
        dns_rdataset_trimttl(&rdataset, &sigrdataset, &rrsig, ttltimenow,
                             false);
-       ATF_REQUIRE_EQ(rdataset.ttl, 0);
-       ATF_REQUIRE_EQ(sigrdataset.ttl, 0);
+       assert_int_equal(rdataset.ttl, 0);
+       assert_int_equal(sigrdataset.ttl, 0);
 
        sigrdataset.ttl = 900;
        rdataset.ttl = 1000;
@@ -88,8 +104,8 @@ ATF_TC_BODY(trimttl, tc) {
 
        dns_rdataset_trimttl(&rdataset, &sigrdataset, &rrsig, ttltimenow,
                             true);
-       ATF_REQUIRE_EQ(rdataset.ttl, 800);
-       ATF_REQUIRE_EQ(sigrdataset.ttl, 800);
+       assert_int_equal(rdataset.ttl, 800);
+       assert_int_equal(sigrdataset.ttl, 800);
 
        sigrdataset.ttl = 900;
        rdataset.ttl = 1000;
@@ -98,8 +114,8 @@ ATF_TC_BODY(trimttl, tc) {
 
        dns_rdataset_trimttl(&rdataset, &sigrdataset, &rrsig, ttltimenow,
                             true);
-       ATF_REQUIRE_EQ(rdataset.ttl, 120);
-       ATF_REQUIRE_EQ(sigrdataset.ttl, 120);
+       assert_int_equal(rdataset.ttl, 120);
+       assert_int_equal(sigrdataset.ttl, 120);
 
        sigrdataset.ttl = 900;
        rdataset.ttl = 1000;
@@ -108,18 +124,27 @@ ATF_TC_BODY(trimttl, tc) {
 
        dns_rdataset_trimttl(&rdataset, &sigrdataset, &rrsig, ttltimenow,
                             false);
-       ATF_REQUIRE_EQ(rdataset.ttl, 0);
-       ATF_REQUIRE_EQ(sigrdataset.ttl, 0);
+       assert_int_equal(rdataset.ttl, 0);
+       assert_int_equal(sigrdataset.ttl, 0);
+}
 
-       dns_test_end();
+int
+main(void) {
+       const struct CMUnitTest tests[] = {
+               cmocka_unit_test_setup_teardown(trimttl, _setup, _teardown),
+       };
+
+       return (cmocka_run_group_tests(tests, NULL, NULL));
 }
 
-/*
- * Main
- */
-ATF_TP_ADD_TCS(tp) {
-       ATF_TP_ADD_TC(tp, trimttl);
+#else /* HAVE_CMOCKA */
+
+#include <stdio.h>
 
-       return (atf_no_error());
+int
+main(void) {
+       printf("1..0 # Skipped: cmocka not available\n");
+       return (0);
 }
 
+#endif