From: Joey <joey@isc.org>
Date: Wed, 14 Nov 2018 12:33:45 +0000 (+0800)
Subject: convert hash_test
X-Git-Tag: v9.13.4~21^2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72f60bdd8485fe0708c510ab1913d43b8bbb894f;p=thirdparty%2Fbind9.git

convert hash_test
---

diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile
index 66035d55e11..e42e83d44cd 100644
--- a/lib/isc/tests/Kyuafile
+++ b/lib/isc/tests/Kyuafile
@@ -6,7 +6,7 @@ tap_test_program{name='buffer_test'}
 tap_test_program{name='counter_test'}
 tap_test_program{name='errno_test'}
 tap_test_program{name='file_test'}
-atf_test_program{name='hash_test'}
+tap_test_program{name='hash_test'}
 tap_test_program{name='heap_test'}
 tap_test_program{name='hmac_test'}
 tap_test_program{name='ht_test'}
diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index cdd1b16b733..cbc43de7b2d 100644
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -83,8 +83,9 @@ file_test@EXEEXT@: file_test.@O@ ${ISCDEPLIBS}
 		${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
 
 hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-			hash_test.@O@ ${ISCLIBS} ${LIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
+		${LDFLAGS} -o $@ hash_test.@O@ \
+		${ISCLIBS} ${LIBS} ${CMOCKA_LIBS}
 
 heap_test@EXEEXT@: heap_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} \
diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
index 0c6d7001d78..22bb6e478f9 100644
--- a/lib/isc/tests/hash_test.c
+++ b/lib/isc/tests/hash_test.c
@@ -9,15 +9,22 @@
  * 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 <inttypes.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define UNIT_TESTING
+#include <cmocka.h>
 
 #include <isc/buffer.h>
 #include <isc/hash.h>
@@ -39,15 +46,13 @@ typedef struct hash_testcase {
 	int repeats;
 } hash_testcase_t;
 
-ATF_TC(isc_hash_function);
-ATF_TC_HEAD(isc_hash_function, tc) {
-	atf_tc_set_md_var(tc, "descr", "Hash function test");
-}
-ATF_TC_BODY(isc_hash_function, tc) {
+/*Hash function test */
+static void
+isc_hash_function_test(void **state) {
 	unsigned int h1;
 	unsigned int h2;
 
-	UNUSED(tc);
+	UNUSED(state);
 
 	/* Incremental hashing */
 
@@ -59,42 +64,40 @@ ATF_TC_BODY(isc_hash_function, tc) {
 	h2 = isc_hash_function("This is a long test", 20,
 			       true, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	/* Immutability of hash function */
 	h1 = isc_hash_function(NULL, 0, true, NULL);
 	h2 = isc_hash_function(NULL, 0, true, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	/* Hash function characteristics */
 	h1 = isc_hash_function("Hello world", 12, true, NULL);
 	h2 = isc_hash_function("Hello world", 12, true, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	/* Case */
 	h1 = isc_hash_function("Hello world", 12, false, NULL);
 	h2 = isc_hash_function("heLLo WorLd", 12, false, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	/* Unequal */
 	h1 = isc_hash_function("Hello world", 12, true, NULL);
 	h2 = isc_hash_function("heLLo WorLd", 12, true, NULL);
 
-	ATF_CHECK(h1 != h2);
+	assert_int_not_equal(h1, h2);
 }
 
-ATF_TC(isc_hash_function_reverse);
-ATF_TC_HEAD(isc_hash_function_reverse, tc) {
-	atf_tc_set_md_var(tc, "descr", "Reverse hash function test");
-}
-ATF_TC_BODY(isc_hash_function_reverse, tc) {
+/* Reverse hash function test */
+static void
+isc_hash_function_reverse_test(void **state) {
 	unsigned int h1;
 	unsigned int h2;
 
-	UNUSED(tc);
+	UNUSED(state);
 
 	/* Incremental hashing */
 
@@ -106,67 +109,73 @@ ATF_TC_BODY(isc_hash_function_reverse, tc) {
 	h2 = isc_hash_function_reverse("\007example\003org\000", 13,
 				       true, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	/* Immutability of hash function */
 	h1 = isc_hash_function_reverse(NULL, 0, true, NULL);
 	h2 = isc_hash_function_reverse(NULL, 0, true, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	/* Hash function characteristics */
 	h1 = isc_hash_function_reverse("Hello world", 12, true, NULL);
 	h2 = isc_hash_function_reverse("Hello world", 12, true, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	/* Case */
 	h1 = isc_hash_function_reverse("Hello world", 12, false, NULL);
 	h2 = isc_hash_function_reverse("heLLo WorLd", 12, false, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	/* Unequal */
 	h1 = isc_hash_function_reverse("Hello world", 12, true, NULL);
 	h2 = isc_hash_function_reverse("heLLo WorLd", 12, true, NULL);
 
-	ATF_CHECK(h1 != h2);
+	assert_true(h1 != h2);
 }
 
-ATF_TC(isc_hash_initializer);
-ATF_TC_HEAD(isc_hash_initializer, tc) {
-	atf_tc_set_md_var(tc, "descr", "Hash function initializer test");
-}
-ATF_TC_BODY(isc_hash_initializer, tc) {
+/* Hash function initializer test */
+static void
+isc_hash_initializer_test(void **state) {
 	unsigned int h1;
 	unsigned int h2;
 
-	UNUSED(tc);
+	UNUSED(state);
 
 	h1 = isc_hash_function("Hello world", 12, true, NULL);
 	h2 = isc_hash_function("Hello world", 12, true, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 
 	isc_hash_set_initializer(isc_hash_get_initializer());
 
 	/* Hash value must not change */
 	h2 = isc_hash_function("Hello world", 12, true, NULL);
 
-	ATF_CHECK_EQ(h1, h2);
+	assert_int_equal(h1, h2);
 }
 
-/*
- * Main
- */
-ATF_TP_ADD_TCS(tp) {
-	/*
-	 * Tests of isc_hash functions.
-	 */
+int
+main(void) {
+	const struct CMUnitTest tests[] = {
+		cmocka_unit_test(isc_hash_function_test),
+		cmocka_unit_test(isc_hash_function_reverse_test),
+		cmocka_unit_test(isc_hash_initializer_test),
+	};
+
+	return (cmocka_run_group_tests(tests, NULL, NULL));
+}
 
-	ATF_TP_ADD_TC(tp, isc_hash_function);
-	ATF_TP_ADD_TC(tp, isc_hash_function_reverse);
-	ATF_TP_ADD_TC(tp, isc_hash_initializer);
+#else /* HAVE_CMOCKA */
 
-	return (atf_no_error());
+#include <stdio.h>
+
+int
+main(void) {
+	printf("1..0 # Skipped: cmocka not available\n");
+	return (0);
 }
+
+#endif