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.

(cherry picked from commit 5381ac0fcc4db3c574d28ee0b0886ce430548161)

diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c
index 22da8167b946fd6df9c1d468b0941c70a2a53392..934e8fd884b19abf48e91abd5160e8ade54679ef 100644 (file)
--- a/lib/dns/tests/dh_test.c
+++ b/lib/dns/tests/dh_test.c
@@ -28,11 +28,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 87f4f6f329b717510aaf6d34b2fe0d6277943ca0..402f82387764aa9e6122b84f4d7107c38d6e6c15 100644 (file)
--- a/lib/dns/tests/dst_test.c
+++ b/lib/dns/tests/dst_test.c
@@ -25,13 +25,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 16b2f7441daf5315798beb8ee9a569091b477d6f..fb48ec84f705b54221bf8f573673be25cab6df75 100644 (file)
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -27,10 +27,9 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isc/util.h>
-
 #include <isc/print.h>
 #include <isc/string.h>
+#include <isc/util.h>
 #include <isc/xml.h>
 
 #include <dns/cache.h>

diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c
index 0867a6934eb69a6f2c7ef95664716a2282f2c080..383b04a9a6325fa033bda3a19a14b82e982830cd 100644 (file)
--- a/lib/dns/tests/rbt_serialize_test.c
+++ b/lib/dns/tests/rbt_serialize_test.c
@@ -28,12 +28,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>
@@ -43,19 +37,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 12236327be71ee3c640c90ef3a28bd4783e54b68..e89d958151e456b59d1cf19e4090bca3daec9baa 100644 (file)
--- a/lib/dns/tests/resolver_test.c
+++ b/lib/dns/tests/resolver_test.c
@@ -24,14 +24,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 517bad381e64a013d897aa419d1fb06cea5ad716..113d99a3e83b7c7efad094075ac71dc05177923f 100644 (file)
--- a/lib/dns/tests/result_test.c
+++ b/lib/dns/tests/result_test.c
@@ -15,8 +15,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 1709db7d54b7d8bb9045982943b7d17fa8edf960..6ae7ac966abfc98af62269f385faa49baccdb417 100644 (file)
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -25,6 +25,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>
@@ -41,13 +47,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 ddb420f48a1c9151ff0bbe79534efcd31a090c69..d96fc171d164602563d9492561cdd8a4a695736d 100644 (file)
--- a/lib/dns/tests/tsig_test.c
+++ b/lib/dns/tests/tsig_test.c
@@ -25,10 +25,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 c5481d4ee52bfe456c5c3b1ecb315810fd2453e6..6b50495fdb54c648eea7ef1568eaa23a0203b8a8 100644 (file)
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -13,12 +13,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 187dcaff3e7685f77adae5b05cdaf674dd5fd2d7..1b82f3b4086fdf71e0cd5f446aef71634dccdb66 100644 (file)
--- a/lib/isc/tests/crc64_test.c
+++ b/lib/isc/tests/crc64_test.c
@@ -18,8 +18,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 42a15d8cf71048540f491277750235c30430261e..c4f8beb48f00170bb5d28cd8c16697e36103d813 100644 (file)
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -13,12 +13,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 0ffe4392d614a7ebea0df4721cf5dbd83179b66a..1cb39b24f9436ae469577e2863d56a94bb04e119 100644 (file)
--- a/lib/isc/tests/hash_test.c
+++ b/lib/isc/tests/hash_test.c
@@ -29,11 +29,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 7b5920b6abdf50dc28e369913ab3af56c0d00b98..61288c001a5a6fac71ece769c406857ca0f18cdf 100644 (file)
--- a/lib/isc/tests/netaddr_test.c
+++ b/lib/isc/tests/netaddr_test.c
@@ -15,11 +15,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 86e9439caf0a101e2f7801e688cc83790869d8b9..66b6acfd6da2e530f96f879ab87c1443f748ee3f 100644 (file)
--- a/lib/isc/tests/regex_test.c
+++ b/lib/isc/tests/regex_test.c
@@ -22,13 +22,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 39f972b82c5ddfb08c7ae2f6691a4617364370d3..fb8906e3272e8242c3df3b8c7cab32985e99236e 100644 (file)
--- a/lib/isc/tests/result_test.c
+++ b/lib/isc/tests/result_test.c
@@ -15,8 +15,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 a01ba342cfc7645d67d0b8308134891d72ba8d96..33f694460fcf936c648c287307f6de2eef5e2eed 100644 (file)
--- a/lib/isc/tests/taskpool_test.c
+++ b/lib/isc/tests/taskpool_test.c
@@ -29,7 +29,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 a92331423a684bad6858d0340bedda4d1de557e3..e08f4d3012250497bffb985e06cb7adc57d60500 100644 (file)
--- a/lib/isccc/tests/result_test.c
+++ b/lib/isccc/tests/result_test.c
@@ -15,8 +15,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 9984cbd086dfdd1f1e20f0a0687be3824c030bca..c79542b9b0a7e486c3289b4dd600754cba184839 100644 (file)
--- a/lib/ns/tests/listenlist_test.c
+++ b/lib/ns/tests/listenlist_test.c
@@ -18,11 +18,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 d2462816ed6c2364511e33af9dabb22ec0bb6109..daa6a5e1b1942ca69c69b0da7f9da5a583cf3199 100644 (file)
--- a/lib/ns/tests/notify_test.c
+++ b/lib/ns/tests/notify_test.c
@@ -18,11 +18,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 6eb40fda16fabc43e9d658b55437cc0bbba13cce..fc1af8a39a143d03098a1c8721c8496ec7e7a52e 100644 (file)
--- a/lib/ns/tests/plugin_test.c
+++ b/lib/ns/tests/plugin_test.c
@@ -17,16 +17,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 c23dadc6c629d818b8ca965ca1a8fd116299bf8c..c7b4b1f21fb48bf45589f3f45991b926cd02bd66 100644 (file)
--- a/lib/ns/tests/query_test.c
+++ b/lib/ns/tests/query_test.c
@@ -17,8 +17,6 @@
 #include <stddef.h>
 #include <setjmp.h>
 
-#include <isc/util.h>
-
 #include <inttypes.h>
 #include <sched.h> /* IWYU pragma: keep */
 #include <stdbool.h>
@@ -28,13 +26,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"