Unify header ordering in unit tests

Make sure all unit tests include headers in a similar order:

 1. Three headers which must be included before <cmocka.h>.
 2. System headers.
 3. UNIT_TESTING definition, followed by the <cmocka.h> header.
 4. libisc headers.
 5. Headers from other BIND libraries.
 6. Local headers.

Also make sure header file names are sorted alphabetically within each
block of #include directives.

diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c
index 6893aee1a666a3e08f10ecf138164bd6453cc163..fde5416bd210a08ba0bc38f0a7b0ca3b557796fb 100644 (file)
--- a/lib/dns/tests/dh_test.c
+++ b/lib/dns/tests/dh_test.c
@@ -26,11 +26,12 @@
 #include <isc/util.h>
 #include <isc/string.h>
 
-#include <pk11/site.h>
-
 #include <dns/name.h>
+
 #include <dst/result.h>
 
+#include <pk11/site.h>
+
 #include "../dst_internal.h"
 
 #include "dnstest.h"

diff --git a/lib/dns/tests/dst_test.c b/lib/dns/tests/dst_test.c
index 0abe21452025e6d4671383f84c30aca10f782a61..08c02c2ea2c7ebc017a8f1a47c3110ee824a1d4a 100644 (file)
--- a/lib/dns/tests/dst_test.c
+++ b/lib/dns/tests/dst_test.c
@@ -23,13 +23,12 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isc/util.h>
-
 #include <isc/file.h>
 #include <isc/hex.h>
-#include <isc/util.h>
 #include <isc/stdio.h>
 #include <isc/string.h>
+#include <isc/util.h>
+#include <isc/util.h>
 
 #include <dst/dst.h>
 #include <dst/result.h>

diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index cbf55f4942b8b32fe69ed8120cdf2020b4798205..85ef0f0008822861e9f3a3f3d01b4e17690aed19 100644 (file)
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -24,10 +24,9 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isc/util.h>
-
 #include <isc/print.h>
 #include <isc/string.h>
+#include <isc/util.h>
 
 #include <dns/cache.h>
 #include <dns/callbacks.h>

diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c
index b4cd765e3982128518b8f6af1ad92ec29acb23e7..af450b2f3da7e724f838fcc860316ef49b471599 100644 (file)
--- a/lib/dns/tests/rbt_serialize_test.c
+++ b/lib/dns/tests/rbt_serialize_test.c
@@ -25,12 +25,6 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <dns/rbt.h>
-#include <dns/fixedname.h>
-#include <dns/result.h>
-#include <dns/compress.h>
-#include "dnstest.h"
-
 #include <isc/app.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
@@ -40,19 +34,25 @@
 #include <isc/os.h>
 #include <isc/print.h>
 #include <isc/random.h>
-#include <isc/string.h>
 #include <isc/socket.h>
 #include <isc/stdio.h>
+#include <isc/string.h>
 #include <isc/task.h>
 #include <isc/timer.h>
 #include <isc/util.h>
 
+#include <dns/compress.h>
+#include <dns/fixedname.h>
 #include <dns/log.h>
 #include <dns/name.h>
+#include <dns/rbt.h>
+#include <dns/result.h>
 #include <dns/result.h>
 
 #include <dst/dst.h>
 
+#include "dnstest.h"
+
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif

diff --git a/lib/dns/tests/resolver_test.c b/lib/dns/tests/resolver_test.c
index 3d34e9fd4f8613fefd278575a49fc7118b978036..a9476ca1e7900efafff77d4ab9e53eccf3b96b4f 100644 (file)
--- a/lib/dns/tests/resolver_test.c
+++ b/lib/dns/tests/resolver_test.c
@@ -22,14 +22,13 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isc/util.h>
-
 #include <isc/app.h>
 #include <isc/buffer.h>
 #include <isc/print.h>
 #include <isc/socket.h>
 #include <isc/task.h>
 #include <isc/timer.h>
+#include <isc/util.h>
 
 #include <dns/dispatch.h>
 #include <dns/name.h>

diff --git a/lib/dns/tests/result_test.c b/lib/dns/tests/result_test.c
index 813eb746ab165de2aeb0264c46b9c0a089f497a5..4a24128de52589e9c006473c47232193332ff5ed 100644 (file)
--- a/lib/dns/tests/result_test.c
+++ b/lib/dns/tests/result_test.c
@@ -13,8 +13,9 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <setjmp.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c
index 45e68def586e6513d37a32c03def640aced3f765..78f267e0a67e4f3939b9fdc9b4fed2f88f988be6 100644 (file)
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -23,6 +23,12 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/buffer.h>
+#include <isc/list.h>
+#include <isc/region.h>
+#include <isc/result.h>
+#include <isc/stdtime.h>
+#include <isc/types.h>
 #include <isc/util.h>
 
 #include <dns/db.h>
@@ -39,13 +45,6 @@
 
 #include <dst/dst.h>
 
-#include <isc/buffer.h>
-#include <isc/list.h>
-#include <isc/region.h>
-#include <isc/stdtime.h>
-#include <isc/result.h>
-#include <isc/types.h>
-
 #include "../zone_p.h"
 
 #include "dnstest.h"

diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c
index c489fcfeffbf101ee6001e69c1cc4ff23288c6bc..ff14d2de421607461ce7d7fa3fc3ffc38792598e 100644 (file)
--- a/lib/dns/tests/tsig_test.c
+++ b/lib/dns/tests/tsig_test.c
@@ -23,10 +23,9 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isc/util.h>
-
 #include <isc/mem.h>
 #include <isc/print.h>
+#include <isc/util.h>
 
 #include <dns/rdatalist.h>
 #include <dns/rdataset.h>

diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c
index 20795fee9f272d5f7c309b57a450b8eb14aa827a..a5653ec9a64c1e37dd0a715e4c5beea6bc2612be 100644 (file)
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -11,12 +11,12 @@
 
 #if HAVE_CMOCKA
 
-#include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
+#include <setjmp.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/isc/tests/crc64_test.c b/lib/isc/tests/crc64_test.c
index 2a0a040fcb6bda316aefa66c3ef04a24ce675ff3..8d1ca7ea0abd72f3b3dd35b79d0b21fb922c6d5a 100644 (file)
--- a/lib/isc/tests/crc64_test.c
+++ b/lib/isc/tests/crc64_test.c
@@ -16,8 +16,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
-#include <stdlib.h>
 
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/isc/tests/errno_test.c b/lib/isc/tests/errno_test.c
index b17937e81572a851dc57e71a5237b5f30125f282..5d62a954d99d7691a72bffd69402369c8d4992d5 100644 (file)
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -11,12 +11,13 @@
 
 #if HAVE_CMOCKA
 
-#include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
+#include <setjmp.h>
 
+#include <stdlib.h>
 #include <string.h>
+
 #include <sys/errno.h>
 
 #define UNIT_TESTING

diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
index cb6830b373f6606a01cb8dba3b9438d012dee2c8..813a8a65ff9e945044a8b3c27e66e301975e3088 100644 (file)
--- a/lib/isc/tests/hash_test.c
+++ b/lib/isc/tests/hash_test.c
@@ -27,11 +27,10 @@
 #include <isc/buffer.h>
 #include <isc/hash.h>
 #include <isc/hex.h>
-#include <isc/region.h>
-
-#include <isc/util.h>
 #include <isc/print.h>
+#include <isc/region.h>
 #include <isc/string.h>
+#include <isc/util.h>
 
 #include <pk11/site.h>
 

diff --git a/lib/isc/tests/netaddr_test.c b/lib/isc/tests/netaddr_test.c
index 2a2ddcfd7cd41db0403fc01fd159882b997e7d5c..419c837dd3dcf3cea062ae2b464d5b5bd74bc3e0 100644 (file)
--- a/lib/isc/tests/netaddr_test.c
+++ b/lib/isc/tests/netaddr_test.c
@@ -13,11 +13,11 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <setjmp.h>
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/isc/tests/regex_test.c b/lib/isc/tests/regex_test.c
index 4502be07f9810716b3777ef2aab4e90472668b93..a09e2dbae92d7fab1e9e02f9d57477349ec18b14 100644 (file)
--- a/lib/isc/tests/regex_test.c
+++ b/lib/isc/tests/regex_test.c
@@ -20,13 +20,13 @@
 #include <string.h>
 #include <unistd.h>
 
-#define UNIT_TESTING
-#include <cmocka.h>
-
 #ifdef HAVE_REGEX_H
 #include <regex.h>
 #endif
 
+#define UNIT_TESTING
+#include <cmocka.h>
+
 #include <isc/commandline.h>
 #include <isc/regex.h>
 #include <isc/print.h>

diff --git a/lib/isc/tests/result_test.c b/lib/isc/tests/result_test.c
index 9be8cb5b78e6627bba361b1b73feccba7c924c9b..20bf6101af46b8f547fcbe4d5ea358daa2567386 100644 (file)
--- a/lib/isc/tests/result_test.c
+++ b/lib/isc/tests/result_test.c
@@ -13,8 +13,9 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <setjmp.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/isc/tests/taskpool_test.c b/lib/isc/tests/taskpool_test.c
index a7453d96e801364afafa098b1c8103fc8c399523..0dfdc0b93e5454859cd633c85ed8164f6fc173d6 100644 (file)
--- a/lib/isc/tests/taskpool_test.c
+++ b/lib/isc/tests/taskpool_test.c
@@ -27,7 +27,6 @@
 #include <isc/taskpool.h>
 #include <isc/util.h>
 
-
 #include "isctest.h"
 
 static int

diff --git a/lib/isccc/tests/result_test.c b/lib/isccc/tests/result_test.c
index a18c958446938d92f86742a8e03053824e10bf71..ce960ed5b52041965148935ac129a062b12151f4 100644 (file)
--- a/lib/isccc/tests/result_test.c
+++ b/lib/isccc/tests/result_test.c
@@ -13,8 +13,9 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <setjmp.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #define UNIT_TESTING

diff --git a/lib/ns/tests/listenlist_test.c b/lib/ns/tests/listenlist_test.c
index 5d4fd8763e50b3d4b47fbc338253645483510d4b..32466d1e0c2acd3d3d85e279d210c3260ffce857 100644 (file)
--- a/lib/ns/tests/listenlist_test.c
+++ b/lib/ns/tests/listenlist_test.c
@@ -16,11 +16,8 @@
 #include <setjmp.h>
 
 #include <sched.h> /* IWYU pragma: keep */
-#include <stdlib.h>
-
-#include <isc/util.h>
-
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 

diff --git a/lib/ns/tests/notify_test.c b/lib/ns/tests/notify_test.c
index 1094c26391a86471f811dccf3879b4e93ca7c888..8cae165209314545568e43ad352627aba3cbea2b 100644 (file)
--- a/lib/ns/tests/notify_test.c
+++ b/lib/ns/tests/notify_test.c
@@ -16,11 +16,8 @@
 #include <setjmp.h>
 
 #include <sched.h> /* IWYU pragma: keep */
-#include <stdlib.h>
-
-#include <isc/util.h>
-
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 

diff --git a/lib/ns/tests/plugin_test.c b/lib/ns/tests/plugin_test.c
index de910a9bd948e11ad17d1b7b4a7386515f7854b0..91627b682647cf1508b6e91c6be256a2766a68dc 100644 (file)
--- a/lib/ns/tests/plugin_test.c
+++ b/lib/ns/tests/plugin_test.c
@@ -15,16 +15,15 @@
 #include <stddef.h>
 #include <setjmp.h>
 
+#include <limits.h>
 #include <sched.h> /* IWYU pragma: keep */
+#include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <limits.h>
-#include <stdbool.h>
-#include <string.h>
-
 #include <isc/mem.h>
 #include <isc/platform.h>
 #include <isc/result.h>

diff --git a/lib/ns/tests/query_test.c b/lib/ns/tests/query_test.c
index bcbeecc1677fc243553ee44de9f9f48486b0cab1..415de2a88742a4fce88041d530129a362207a095 100644 (file)
--- a/lib/ns/tests/query_test.c
+++ b/lib/ns/tests/query_test.c
@@ -15,8 +15,6 @@
 #include <stddef.h>
 #include <setjmp.h>
 
-#include <isc/util.h>
-
 #include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <stdbool.h>
@@ -26,13 +24,14 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
+#include <isc/util.h>
+
 #include <dns/badcache.h>
 #include <dns/view.h>
 
 #include <ns/client.h>
 #include <ns/hooks.h>
 #include <ns/query.h>
-#include <isc/util.h>
 
 #include "nstest.h"