From 8bb66d25a9dae347c4da87961f8317d1d5807b88 Mon Sep 17 00:00:00 2001
From: Jan Kadlec <jan.kadlec@nic.cz>
Date: Thu, 4 Aug 2011 14:45:00 +0200
Subject: [PATCH] Fixed tests.
---
src/tests/libknot/libknot/rdata_tests.c | 34 ++++++++++-----------
src/tests/libknot/libknot/response2_tests.c | 1 +
src/tests/libknot/libknot/rrset_tests.c | 3 --
src/tests/libknot/libknot/zone_tests.c | 4 +--
src/tests/libknot/unittests_libknot.c | 2 +-
5 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/src/tests/libknot/libknot/rdata_tests.c b/src/tests/libknot/libknot/rdata_tests.c
index c132beba03..9ffd98d21e 100644
--- a/src/tests/libknot/libknot/rdata_tests.c
+++ b/src/tests/libknot/libknot/rdata_tests.c
@@ -462,8 +462,9 @@ static int test_rdata_set_item()
return 0;
}
- uint8_t *data = malloc(sizeof(uint8_t) * KNOT_MAX_RDATA_WIRE_SIZE);
- assert(data);
+// uint8_t *data = malloc(sizeof(uint8_t) * KNOT_MAX_RDATA_WIRE_SIZE);
+// assert(data);
+ uint8_t data[KNOT_MAX_RDATA_WIRE_SIZE];
generate_rdata(data, KNOT_MAX_RDATA_WIRE_SIZE);
// set items through set_items() and then call set_item()
@@ -514,9 +515,7 @@ static int test_rdata_set_item()
}
}
- free(data);
-
- knot_rdata_free(&rdata);
+// knot_rdata_free(&rdata);
return 1;
}
@@ -549,22 +548,22 @@ static int test_rdata_set_items()
if (knot_rdata_set_items(rdata, NULL, 0) != KNOT_EBADARG) {
diag("Return value of knot_rdata_set_items()"
" when items == NULL is wrong");
- knot_rdata_free(&rdata);
+// knot_rdata_free(&rdata);
return 0;
} else if (knot_rdata_set_items(rdata, item, 0) !=
KNOT_EBADARG) {
diag("Return value of knot_rdata_set_items()"
" when count == 0"
"is wrong");
- knot_rdata_free(&rdata);
+// knot_rdata_free(&rdata);
return 0;
}
- knot_rdata_free(&rdata);
+// knot_rdata_free(&rdata);
}
// generate some random data
- uint8_t *data = malloc(sizeof(uint8_t) * KNOT_MAX_RDATA_WIRE_SIZE);
- assert(data);
+// uint8_t *data = malloc(sizeof(uint8_t) * KNOT_MAX_RDATA_WIRE_SIZE);
+ uint8_t data [KNOT_MAX_RDATA_WIRE_SIZE];
generate_rdata(data, KNOT_MAX_RDATA_WIRE_SIZE);
for (int i = 0; i <= KNOT_RRTYPE_LAST; ++i) {
@@ -592,11 +591,9 @@ static int test_rdata_set_items()
}
}
- knot_rdata_free(&rdata);
+// knot_rdata_free(&rdata);
}
- free(data);
-
return (errors == 0);
}
@@ -826,19 +823,20 @@ static int test_rdata_compare()
static int test_rdata_free()
{
- knot_rdata_t *tmp_rdata;
+ return 0;
+// knot_rdata_t *tmp_rdata;
- tmp_rdata = knot_rdata_new();
+// tmp_rdata = knot_rdata_new();
- knot_rdata_free(&tmp_rdata);
+// knot_rdata_free(&tmp_rdata);
- return (tmp_rdata == NULL);
+// return (tmp_rdata == NULL);
}
/* Can't test this with current implementation
* would be trying to free pointers on stack */
static int test_rdata_deep_free()
{
- return 1;
+ return 0;
/* int errors = 0;
diff --git a/src/tests/libknot/libknot/response2_tests.c b/src/tests/libknot/libknot/response2_tests.c
index d76cd1ca39..60b294de15 100644
--- a/src/tests/libknot/libknot/response2_tests.c
+++ b/src/tests/libknot/libknot/response2_tests.c
@@ -46,6 +46,7 @@ static int test_response_init()
knot_packet_t *response =
knot_packet_new(KNOT_PACKET_PREALLOC_QUERY);
+ assert(response);
response->max_size = KNOT_WIRE_HEADER_SIZE - 1;
if (knot_response2_init(response) != KNOT_ESPACE) {
diag("Calling response_init too small packet did "
diff --git a/src/tests/libknot/libknot/rrset_tests.c b/src/tests/libknot/libknot/rrset_tests.c
index 461d80eb3c..abfc74cac2 100644
--- a/src/tests/libknot/libknot/rrset_tests.c
+++ b/src/tests/libknot/libknot/rrset_tests.c
@@ -533,7 +533,6 @@ static int test_rrset_rrsigs()
errors++;
}
errors += check_rrset(rrset, i, 0, 0, 1);
- knot_dname_free(&owner);
knot_rrset_free(&rrset);
free(item);
knot_rdata_free(&tmp);
@@ -580,8 +579,6 @@ static int test_rrset_merge()
r = check_rrset(merger1, 5, 1, 1, 0);
- knot_dname_free(&owner1);
- knot_dname_free(&owner2);
knot_rrset_free(&merger1);
knot_rrset_free(&merger2);
diff --git a/src/tests/libknot/libknot/zone_tests.c b/src/tests/libknot/libknot/zone_tests.c
index f418270475..8a042b956c 100644
--- a/src/tests/libknot/libknot/zone_tests.c
+++ b/src/tests/libknot/libknot/zone_tests.c
@@ -735,8 +735,8 @@ static int test_zone_shallow_copy()
}
#endif
- knot_zone_contents_deep_free(&from);
- knot_zone_contents_free(&to);
+// knot_zone_deep_free(&from_zone, 0);
+// knot_zone_contents_free(&to);
return (errors == 0);
}
diff --git a/src/tests/libknot/unittests_libknot.c b/src/tests/libknot/unittests_libknot.c
index ad2dbb5674..3a5e0e1655 100644
--- a/src/tests/libknot/unittests_libknot.c
+++ b/src/tests/libknot/unittests_libknot.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
&dname_tests_api, //! DNS library (dname) unit
&edns_tests_api, //! DNS library (EDNS0) unit
&zone_tests_api, //! DNS library (zone) unit
-// &node_tests_api, //! DNS library (node) unit
+ &node_tests_api, //! DNS library (node) unit
&rdata_tests_api, //! DNS library (rdata) unit
&response2_tests_api, //! DNS library (response) unit
&rrset_tests_api, //! DNS library (rrset) unit
--
GitLab