tests: adapt to libdnssec to libknot change

diff --git a/tests/.gitignore b/tests/.gitignore
index a9763744bb166c0c837a6ea22d652d913d82e6e1..a362f8cdde3a26ec005ddaf9138a250e4286be24 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -48,31 +48,28 @@
 /knot/test_zone_timers
 /knot/test_zonedb
 
-/libdnssec/test_binary
-/libdnssec/test_crypto
-/libdnssec/test_key
-/libdnssec/test_key_algorithm
-/libdnssec/test_key_ds
-/libdnssec/test_keyid
-/libdnssec/test_keystore_pkcs11
-/libdnssec/test_keystore_pkcs8
-/libdnssec/test_keystore_pkcs8_dir
-/libdnssec/test_keytag
-/libdnssec/test_list
-/libdnssec/test_nsec_bitmap
-/libdnssec/test_nsec_hash
-/libdnssec/test_random
-/libdnssec/test_sign
-/libdnssec/test_sign_der
-/libdnssec/test_shared_bignum
-/libdnssec/test_shared_dname
-/libdnssec/test_tsig
-
 /libknot/test_control
 /libknot/test_cookies
 /libknot/test_db
 /libknot/test_descriptor
 /libknot/test_dname
+/libknot/test_dnssec_binary
+/libknot/test_dnssec_crypto
+/libknot/test_dnssec_key
+/libknot/test_dnssec_key_algorithm
+/libknot/test_dnssec_key_ds
+/libknot/test_dnssec_keyid
+/libknot/test_dnssec_keystore_pkcs11
+/libknot/test_dnssec_keystore_pkcs8
+/libknot/test_dnssec_keytag
+/libknot/test_dnssec_nsec_bitmap
+/libknot/test_dnssec_nsec_hash
+/libknot/test_dnssec_random
+/libknot/test_dnssec_shared_bignum
+/libknot/test_dnssec_shared_dname
+/libknot/test_dnssec_sign
+/libknot/test_dnssec_sign_der
+/libknot/test_dnssec_tsig
 /libknot/test_dynarray
 /libknot/test_edns
 /libknot/test_edns_ecs

diff --git a/tests/libknot/test_dnssec_binary.c b/tests/libknot/test_dnssec_binary.c
index ee76ed33627a1c5a1808292864eff3a0655b9c9f..9a88d3d6c5d3bf313aa6340f18c9db139b4cbd2b 100644 (file)
--- a/tests/libknot/test_dnssec_binary.c
+++ b/tests/libknot/test_dnssec_binary.c
@@ -7,8 +7,8 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "binary.h"
-#include "error.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
 
 typedef struct test_string {
        const char *encoded;

diff --git a/tests/libknot/test_dnssec_crypto.c b/tests/libknot/test_dnssec_crypto.c
index cbbd33fcd09bf192b7534ee4b53b24d45916849b..c6888b82d55fcfc67fb497907cd2bd1129c9af19 100644 (file)
--- a/tests/libknot/test_dnssec_crypto.c
+++ b/tests/libknot/test_dnssec_crypto.c
@@ -5,7 +5,7 @@
 
 #include <tap/basic.h>
 
-#include "crypto.h"
+#include "libknot/dnssec/crypto.h"
 
 int main(void)
 {

diff --git a/tests/libknot/test_dnssec_key.c b/tests/libknot/test_dnssec_key.c
index 1bb840391dfe5322b4676c4c6129d07a2305d998..6e0d9a8b244f2600b003fd01d39295ca5a81b818 100644 (file)
--- a/tests/libknot/test_dnssec_key.c
+++ b/tests/libknot/test_dnssec_key.c
@@ -6,11 +6,10 @@
 #include <tap/basic.h>
 #include <string.h>
 
-#include "binary.h"
-#include "crypto.h"
-#include "error.h"
-#include "key.h"
-
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
 #include "libknot/dnssec/sample_keys.h"
 
 #define check_attr_scalar(key, type, name, def_val, set_val) { \

diff --git a/tests/libknot/test_dnssec_key_algorithm.c b/tests/libknot/test_dnssec_key_algorithm.c
index 4430dafba68affe941ed096e8646a773d91de3be..53cd81bdf8d922df5d57efdf5a989cc938868578 100644 (file)
--- a/tests/libknot/test_dnssec_key_algorithm.c
+++ b/tests/libknot/test_dnssec_key_algorithm.c
@@ -5,8 +5,8 @@
 
 #include <tap/basic.h>
 
-#include "error.h"
-#include "key.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
 
 static void ok_range(dnssec_key_algorithm_t algo,
                     unsigned exp_min, unsigned exp_max,

diff --git a/tests/libknot/test_dnssec_keyid.c b/tests/libknot/test_dnssec_keyid.c
index 52da3ad48aa208908cd0fcf64fd7c387b272c1e1..14aa35e7d3795199b3255ac3bba89d80241242ed 100644 (file)
--- a/tests/libknot/test_dnssec_keyid.c
+++ b/tests/libknot/test_dnssec_keyid.c
@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "error.h"
-#include "keyid.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/keyid.h"
 
 static void test_keyid_is_valid_run(const char *param, bool should_ok)
 {

diff --git a/tests/libknot/test_dnssec_keystore_pkcs11.c b/tests/libknot/test_dnssec_keystore_pkcs11.c
index 4a862a87df6b849a1cc3c531f816d64c6c273a36..21245f4e8d9178dfbc325f0910e8b8fa5c85b8a9 100644 (file)
--- a/tests/libknot/test_dnssec_keystore_pkcs11.c
+++ b/tests/libknot/test_dnssec_keystore_pkcs11.c
@@ -28,7 +28,7 @@
 #define SOFTHSM_CONF_ENV "SOFTHSM2_CONF"
 #define SOFTHSM_UTIL     "softhsm2-util"
 
-#define TOKEN_LABEL "libdnssec-test"
+#define TOKEN_LABEL "libknot-test"
 #define TOKEN_PIN   "1234"
 #define TOKEN_SOPIN "123456"
 

diff --git a/tests/libknot/test_dnssec_keystore_pkcs8.c b/tests/libknot/test_dnssec_keystore_pkcs8.c
index b77637694bd4bc8e99dc8db2bd6ce24b7d6f71f3..066b22062d62c1ebaad56282a8e90e4272f65db8 100644 (file)
--- a/tests/libknot/test_dnssec_keystore_pkcs8.c
+++ b/tests/libknot/test_dnssec_keystore_pkcs8.c
@@ -6,9 +6,9 @@
 #include <tap/basic.h>
 #include <tap/files.h>
 
-#include "error.h"
-#include "key.h"
-#include "keystore.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/keystore.h"
 
 int main(void)
 {

diff --git a/tests/libknot/test_dnssec_keytag.c b/tests/libknot/test_dnssec_keytag.c
index bf9fbc36f1fa40141e289dc3f125707a7179a671..494fa8139986efb40cc5577954625f5f3be80b8a 100644 (file)
--- a/tests/libknot/test_dnssec_keytag.c
+++ b/tests/libknot/test_dnssec_keytag.c
@@ -6,9 +6,9 @@
 #include <tap/basic.h>
 #include <stdint.h>
 
-#include "binary.h"
-#include "error.h"
-#include "keytag.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/keytag.h"
 
 int main(void)
 {

diff --git a/tests/libknot/test_dnssec_nsec_bitmap.c b/tests/libknot/test_dnssec_nsec_bitmap.c
index 58e59803fa84106b373749b24527ff38929322af..8b997bdb16842ff91bf56234262ee25444ca88f1 100644 (file)
--- a/tests/libknot/test_dnssec_nsec_bitmap.c
+++ b/tests/libknot/test_dnssec_nsec_bitmap.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "nsec.h"
+#include "libknot/dnssec/nsec.h"
 #include "libknot/descriptor.h"
 
 #define TEST_BITMAP_SIZE 18

diff --git a/tests/libknot/test_dnssec_nsec_hash.c b/tests/libknot/test_dnssec_nsec_hash.c
index e36be6820b49e6b910b45bf338b83c8678ea9442..a784dea2bf9793b99ac0de8b9b6a739483a1e044 100644 (file)
--- a/tests/libknot/test_dnssec_nsec_hash.c
+++ b/tests/libknot/test_dnssec_nsec_hash.c
@@ -6,9 +6,9 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "crypto.h"
-#include "error.h"
-#include "nsec.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/nsec.h"
 
 static const dnssec_binary_t RDATA = { .size = 9, .data = (uint8_t []) {
        0x01,                   // algorithm

diff --git a/tests/libknot/test_dnssec_random.c b/tests/libknot/test_dnssec_random.c
index a3c4103cf20ec119c85a070fb0c7607e0a661e3d..6b6d6f7c6dafd5e7cb82f97cd45c9815c9cba123 100644 (file)
--- a/tests/libknot/test_dnssec_random.c
+++ b/tests/libknot/test_dnssec_random.c
@@ -7,9 +7,9 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "crypto.h"
-#include "error.h"
-#include "random.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/random.h"
 
 int check_buffer(void)
 {

diff --git a/tests/libknot/test_dnssec_shared_bignum.c b/tests/libknot/test_dnssec_shared_bignum.c
index a0e30da0b8b741cf7fbd3b8896409ed96901c255..74254c16365a418a7857412f89ffd1aa4c58da28 100644 (file)
--- a/tests/libknot/test_dnssec_shared_bignum.c
+++ b/tests/libknot/test_dnssec_shared_bignum.c
@@ -6,8 +6,8 @@
 #include <tap/basic.h>
 #include <string.h>
 
-#include "bignum.c"
-#include "binary.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/shared/bignum.c"
 
 #define bin_init(array) { .data = array, .size = sizeof(array) }
 

diff --git a/tests/libknot/test_dnssec_shared_dname.c b/tests/libknot/test_dnssec_shared_dname.c
index cb066a0edae98530522fe926449703906521c22f..14ff9e2d08b3d2cb2edc441bea92c24a8eb684f4 100644 (file)
--- a/tests/libknot/test_dnssec_shared_dname.c
+++ b/tests/libknot/test_dnssec_shared_dname.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "dname.c"
+#include "libknot/dnssec/shared/dname.c"
 
 static void ok_length(const char *dname, size_t length, const char *info)
 {

diff --git a/tests/libknot/test_dnssec_sign.c b/tests/libknot/test_dnssec_sign.c
index 622ebd95c1e03c3949d2730013e813421d6921be..dccd016cc6c91cd02c06d36ba34fea1e92abb5d9 100644 (file)
--- a/tests/libknot/test_dnssec_sign.c
+++ b/tests/libknot/test_dnssec_sign.c
@@ -6,11 +6,11 @@
 #include <string.h>
 #include <tap/basic.h>
 
-#include "binary.h"
-#include "crypto.h"
-#include "error.h"
-#include "key.h"
-#include "sign.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/crypto.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/key.h"
+#include "libknot/dnssec/sign.h"
 
 #include "libknot/dnssec/sample_keys.h"
 

diff --git a/tests/libknot/test_dnssec_sign_der.c b/tests/libknot/test_dnssec_sign_der.c
index 3e1dd4fde79be8e8cee81e77ef410bae6cbc762b..b1755552ee46ba755c8c31c1fa80966e1d27dc5b 100644 (file)
--- a/tests/libknot/test_dnssec_sign_der.c
+++ b/tests/libknot/test_dnssec_sign_der.c
@@ -8,10 +8,10 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "bignum.c"
-#include "binary.h"
-#include "error.h"
-#include "sign/der.c"
+#include "libknot/dnssec/shared/bignum.c"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/error.h"
+#include "libknot/dnssec/sign/der.c"
 
 static int binary_eq(const dnssec_binary_t *a, const dnssec_binary_t *b)
 {

diff --git a/tests/libknot/test_dnssec_tsig.c b/tests/libknot/test_dnssec_tsig.c
index 8a65b1712102ca44ccb7cc9981b24eec0cda43f3..bc5ec6492fdbe70f252b96e1f44e08efd3ead962 100644 (file)
--- a/tests/libknot/test_dnssec_tsig.c
+++ b/tests/libknot/test_dnssec_tsig.c
@@ -6,9 +6,9 @@
 #include <tap/basic.h>
 #include <string.h>
 
-#include "binary.h"
-#include "dname.c"
-#include "tsig.h"
+#include "libknot/dnssec/binary.h"
+#include "libknot/dnssec/shared/dname.c"
+#include "libknot/dnssec/tsig.h"
 
 static const dnssec_binary_t payload = {
        .size = 40,