Added zone tree tests and moved relevant to unittests-libknot.

Knot.files

@@ -193,6 +193,12 @@ src/tests/knot/server_tests.h
 src/tests/knot/rrl_tests.c
 src/tests/knot/rrl_tests.h
 src/tests/libknot/unittests_libknot.c
+src/tests/libknot/dname_tests.c
+src/tests/libknot/dname_tests.h
+src/tests/libknot/wire_tests.c
+src/tests/libknot/wire_tests.h
+src/tests/libknot/ztree_tests.c
+src/tests/libknot/ztree_tests.h
 src/tests/libknot/libknot/rrset_tests.c
 src/tests/libknot/libknot/rrset_tests.h
 samples/Makefile.am
@@ -200,8 +206,6 @@ src/libknot/tsig.h
 src/libknot/tsig.c
 src/libknot/tsig-op.c
 src/libknot/tsig-op.h
-src/tests/libknot/libknot/tsig_tests.h
-src/tests/libknot/libknot/tsig_tests.c
 src/knot/zone/semantic-check.c
 src/knot/zone/semantic-check.h
 src/tests/xfr_tests.h

src/Makefile.am

@@ -110,10 +110,6 @@ unittests_SOURCES =				\
 	tests/knot/server_tests.h		\
 	tests/knot/rrl_tests.h			\
 	tests/knot/rrl_tests.c			\
-	tests/libknot/wire_tests.c		\
-	tests/libknot/wire_tests.h		\
-	tests/libknot/dname_tests.c		\
-	tests/libknot/dname_tests.h		\
 	tests/unittests_main.c
 
 unittests_xfr_SOURCES = 			\
@@ -122,6 +118,12 @@ unittests_xfr_SOURCES = 			\
 	
 unittests_libknot_SOURCES = 			\
 	tests/libknot/unittests_libknot.c	\
+	tests/libknot/dname_tests.h		\
+	tests/libknot/dname_tests.c		\
+	tests/libknot/ztree_tests.h		\
+	tests/libknot/ztree_tests.c		\
+	tests/libknot/wire_tests.h		\
+	tests/libknot/wire_tests.c		\
 	tests/libknot/libknot/rrset_tests.h	\
 	tests/libknot/libknot/rrset_tests.c
 

src/tests/libknot/unittests_libknot.c

@@ -26,6 +26,9 @@
 //#include "tests/libknot/libknot/rdata_tests.h"
 //#include "tests/libknot/libknot/response_tests.h"
 #include "tests/libknot/libknot/rrset_tests.h"
+#include "tests/libknot/wire_tests.h"
+#include "tests/libknot/dname_tests.h"
+#include "tests/libknot/ztree_tests.h"
 //#include "tests/libknot/libknot/zone_tests.h"
 //#include "tests/libknot/libknot/dname_table_tests.h"
 //#include "tests/libknot/libknot/nsec3_tests.h"
@@ -44,9 +47,15 @@ int main(int argc, char *argv[])
 	// Build test set
 	unit_api *tests[] = {
 
-		/* DNS units */
-		&rrset_tests_api,    //! DNS library (rrset) unit
-		NULL
+	        /* DNS units */
+	        &rrset_tests_api,    //! DNS library (rrset) unit
+	        
+	        /* Library. */
+	        &wire_tests_api,
+	        &dname_tests_api,
+	        &ztree_tests_api,
+	        
+	        NULL
 	};
 
 	// Plan number of tests

src/tests/unittests_main.c

@@ -31,8 +31,6 @@
 #include "tests/knot/journal_tests.h"
 #include "tests/knot/server_tests.h"
 #include "tests/knot/conf_tests.h"
-#include "tests/libknot/wire_tests.h"
-#include "tests/libknot/dname_tests.h"
 #include "tests/knot/rrl_tests.h"
 
 // Run all loaded units
@@ -58,14 +56,10 @@ int main(int argc, char *argv[])
 	        &base32hex_tests_api,	//! Base32hex encoding
 	        &descriptor_tests_api,	//! RR descriptors
 
-	        /* Library. */
-	        &wire_tests_api,
-	        &dname_tests_api,
-
 	        /* Server parts. */
 	        &conf_tests_api,	//! Configuration parser tests
 	        &server_tests_api,	//! Server unit
-		&rrl_tests_api,		//! RRL tests
+	        &rrl_tests_api,		//! RRL tests
 	        NULL
 	};