dname unit test work.

git-svn-id: file:///svn/unbound/trunk@274 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index ccc43e452f5432a5fc8f88203d5c3ae579ad0b80..bfaa4ce70618f320a0d50fb15ca0706c2d9dbcd8 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+2 May 2007: Wouter
+       - dname unit tests in own file and spread out neatly in functions.
+       - more dname unit tests.
+
 1 May 2007: Wouter
        - decompress query section, extremely lenient acceptance.
          But only for answers from other servers, not for plain queries.

diff --git a/testcode/unitdname.c b/testcode/unitdname.c
new file mode 100644 (file)
index 0000000..d47c1cd
--- /dev/null
+++ b/testcode/unitdname.c
@@ -0,0 +1,271 @@
+/*
+ * testcode/unitdname.c - unit test for dname routines.
+ *
+ * Copyright (c) 2007, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/**
+ * \file
+ * Calls dname unit tests. Exits with code 1 on a failure. 
+ */
+
+#include "config.h"
+#include "util/log.h"
+#include "testcode/unitmain.h"
+#include "util/data/dname.h"
+
+/** put dname into buffer */
+static ldns_buffer*
+dname_to_buf(ldns_buffer* b, const char* str)
+{
+       ldns_rdf* rdf;
+       ldns_status status;
+       ldns_buffer_clear(b);
+       rdf = ldns_dname_new_frm_str(str);      
+       status = ldns_dname2buffer_wire(b, rdf);
+       if(status != LDNS_STATUS_OK)
+               fatal_exit("%s ldns: %s", __func__, 
+                       ldns_get_errorstr_by_id(status));
+       ldns_rdf_deep_free(rdf);
+       ldns_buffer_flip(b);
+       return b;
+}
+
+/** test query_dname_len function */
+static void 
+dname_test_qdl(ldns_buffer* buff)
+{
+       unit_assert( query_dname_len(buff) == 0);
+       unit_assert( query_dname_len(dname_to_buf(buff, ".")) == 1 );
+       unit_assert( query_dname_len(dname_to_buf(buff, "bla.foo.")) == 9 );
+       unit_assert( query_dname_len(dname_to_buf(buff, "x.y.z.example.com."
+               )) == 19 );
+}
+
+/** test query_dname_tolower */
+static void
+dname_test_qdtl(ldns_buffer* buff)
+{
+       ldns_buffer_write_at(buff, 0, "\012abCDeaBCde\003cOm\000", 16);
+       query_dname_tolower(ldns_buffer_begin(buff), 16);
+       unit_assert( memcmp(ldns_buffer_begin(buff), 
+               "\012abcdeabcde\003com\000", 16) == 0);
+
+       ldns_buffer_write_at(buff, 0, "\001+\012abC{e-ZYXe\003NET\000", 18);
+       query_dname_tolower(ldns_buffer_begin(buff), 18);
+       unit_assert( memcmp(ldns_buffer_begin(buff), 
+               "\001+\012abc{e-zyxe\003net\000", 18) == 0);
+
+       ldns_buffer_write_at(buff, 0, "\000", 1);
+       query_dname_tolower(ldns_buffer_begin(buff), 1);
+       unit_assert( memcmp(ldns_buffer_begin(buff), "\000", 1) == 0);
+
+       ldns_buffer_write_at(buff, 0, "\002NL\000", 4);
+       query_dname_tolower(ldns_buffer_begin(buff), 4);
+       unit_assert( memcmp(ldns_buffer_begin(buff), "\002nl\000", 4) == 0);
+}
+
+/** test query_dname_compare */
+static void
+dname_test_query_dname_compare()
+{
+       unit_assert(query_dname_compare((uint8_t*)"", (uint8_t*)"") == 0);
+       unit_assert(query_dname_compare((uint8_t*)"\001a", 
+                                       (uint8_t*)"\001a") == 0);
+       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
+                                       (uint8_t*)"\003abc\001a") == 0);
+       unit_assert(query_dname_compare((uint8_t*)"\003aBc\001a", 
+                                       (uint8_t*)"\003AbC\001A") == 0);
+       unit_assert(query_dname_compare((uint8_t*)"\003abc", 
+                                       (uint8_t*)"\003abc\001a") == -1);
+       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
+                                       (uint8_t*)"\003abc") == +1);
+       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
+                                       (uint8_t*)"") == +1);
+       unit_assert(query_dname_compare((uint8_t*)"", 
+                                       (uint8_t*)"\003abc\001a") == -1);
+       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
+                                       (uint8_t*)"\003xxx\001a") == -1);
+       unit_assert(query_dname_compare((uint8_t*)"\003axx\001a", 
+                                       (uint8_t*)"\003abc\001a") == 1);
+       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
+                                       (uint8_t*)"\003abc\001Z") == -1);
+       unit_assert(query_dname_compare((uint8_t*)"\003abc\001Z", 
+                                       (uint8_t*)"\003abc\001a") == 1);
+}
+
+/** test dname_count_labels */
+static void
+dname_test_count_labels()
+{
+       unit_assert(dname_count_labels((uint8_t*)"") == 1);
+       unit_assert(dname_count_labels((uint8_t*)"\003com") == 2);
+       unit_assert(dname_count_labels((uint8_t*)"\003org") == 2);
+       unit_assert(dname_count_labels((uint8_t*)"\007example\003com") == 3);
+       unit_assert(dname_count_labels((uint8_t*)"\003bla\007example\003com") 
+               == 4);
+}
+
+/** test dname_count_size_labels */
+static void
+dname_test_count_size_labels()
+{
+       size_t sz = 0;
+       unit_assert(dname_count_size_labels((uint8_t*)"", &sz) == 1);
+       unit_assert(sz == 1);
+       unit_assert(dname_count_size_labels((uint8_t*)"\003com", &sz) == 2);
+       unit_assert(sz == 5);
+       unit_assert(dname_count_size_labels((uint8_t*)"\003org", &sz) == 2);
+       unit_assert(sz == 5);
+       unit_assert(dname_count_size_labels((uint8_t*)"\007example\003com", 
+               &sz) == 3);
+       unit_assert(sz == 13);
+       unit_assert(dname_count_size_labels((uint8_t*)"\003bla\007example"
+               "\003com", &sz) == 4);
+       unit_assert(sz == 17);
+}
+
+
+/** test pkt_dname_len */
+/** test dname_pkt_compare */
+/** test dname_query_hash and dname_pkt_hash */
+/** test dname_pkt_copy */
+/** test dname_buffer_write */
+
+/** test dname_lab_cmp */
+static void
+dname_test_dname_lab_cmp()
+{
+       int ml = 0; /* number of labels that matched exactly */
+
+       /* test for equality succeeds */
+       unit_assert(dname_lab_cmp((uint8_t*)"", 1, (uint8_t*)"", 1, &ml) == 0);
+       unit_assert(ml == 1);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\003net", 2, 
+               (uint8_t*)"\003net", 2, 
+               &ml) == 0);
+       unit_assert(ml == 2);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\007example\003net", 3, 
+               (uint8_t*)"\007example\003net", 3, 
+               &ml) == 0);
+       unit_assert(ml == 3);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\004test\007example\003net", 4, 
+               (uint8_t*)"\004test\007example\003net", 4, 
+               &ml) == 0);
+       unit_assert(ml == 4);
+
+       /* root is smaller than anything else */
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"", 1, 
+               (uint8_t*)"\003net", 2, 
+               &ml) == -1);
+       unit_assert(ml == 1);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\003net", 2, 
+               (uint8_t*)"", 1, 
+               &ml) == 1);
+       unit_assert(ml == 1);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"", 1, 
+               (uint8_t*)"\007example\003net", 3, 
+               &ml) == -1);
+       unit_assert(ml == 1);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\007example\003net", 3, 
+               (uint8_t*)"", 1, 
+               &ml) == 1);
+       unit_assert(ml == 1);
+
+       /* label length makes a difference */
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\004neta", 2, 
+               (uint8_t*)"\003net", 2, 
+               &ml) != 0);
+       unit_assert(ml == 1);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\002ne", 2, 
+               (uint8_t*)"\004neta", 2, 
+               &ml) != 0);
+       unit_assert(ml == 1);
+
+       /* contents follow the zone apex */
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\003bla\007example\003net", 4, 
+               (uint8_t*)"\007example\003net", 3, 
+               &ml) == 1);
+       unit_assert(ml == 3);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\007example\003net", 3, 
+               (uint8_t*)"\003bla\007example\003net", 4, 
+               &ml) == -1);
+       unit_assert(ml == 3);
+
+       /* label content makes a difference */
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\003aag\007example\003net", 4, 
+               (uint8_t*)"\003bla\007example\003net", 4, 
+               &ml) == -1);
+       unit_assert(ml == 3);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\003aag\007example\003net", 4, 
+               (uint8_t*)"\003bla\007example\003net", 4, 
+               &ml) == -1);
+       unit_assert(ml == 3);
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\003bla\003aag\007example\003net", 5, 
+               (uint8_t*)"\003aag\003bla\007example\003net", 5, 
+               &ml) == -1);
+       unit_assert(ml == 3);
+
+       /* but lowercase/uppercase does not make a difference. */
+       unit_assert(dname_lab_cmp(
+               (uint8_t*)"\003bLa\007examPLe\003net", 4, 
+               (uint8_t*)"\003bla\007eXAmple\003nET", 4, 
+               &ml) == 0);
+       unit_assert(ml == 4);
+}
+
+void dname_test()
+{
+       ldns_buffer* buff = ldns_buffer_new(65800);
+       ldns_buffer_flip(buff);
+       dname_test_qdl(buff);
+       dname_test_qdtl(buff);
+       dname_test_query_dname_compare();
+       dname_test_count_labels();
+       dname_test_count_size_labels();
+       dname_test_dname_lab_cmp();
+       ldns_buffer_free(buff);
+}

diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 30dfbb3ac2fa4a58b396277ed8f3869cac68d510..d8a28e0ad52b9278445c47380c717d82d5064853 100644 (file)
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -119,89 +119,6 @@ net_test()
        unit_assert( !is_pow2(259) );
 }
 
-/** put dname into buffer */
-static ldns_buffer*
-dname_to_buf(ldns_buffer* b, const char* str)
-{
-       ldns_rdf* rdf;
-       ldns_status status;
-       ldns_buffer_clear(b);
-       rdf = ldns_dname_new_frm_str(str);      
-       status = ldns_dname2buffer_wire(b, rdf);
-       if(status != LDNS_STATUS_OK)
-               fatal_exit("%s ldns: %s", __func__, 
-                       ldns_get_errorstr_by_id(status));
-       ldns_rdf_deep_free(rdf);
-       ldns_buffer_flip(b);
-       return b;
-}
-
-#include "util/data/msgreply.h"
-#include "util/data/dname.h"
-/** test query parse code */
-static void
-msgreply_test()
-{
-       ldns_buffer* buff = ldns_buffer_new(65800);
-       ldns_buffer_flip(buff);
-       unit_assert( query_dname_len(buff) == 0);
-       unit_assert( query_dname_len(dname_to_buf(buff, ".")) == 1 );
-       unit_assert( query_dname_len(dname_to_buf(buff, "bla.foo.")) == 9 );
-       unit_assert( query_dname_len(dname_to_buf(buff, "x.y.z.example.com.")) == 19 );
-
-       ldns_buffer_write_at(buff, 0, "\012abCDeaBCde\003cOm\000", 16);
-       query_dname_tolower(ldns_buffer_begin(buff), 16);
-       unit_assert( memcmp(ldns_buffer_begin(buff), 
-               "\012abcdeabcde\003com\000", 16) == 0);
-
-       ldns_buffer_write_at(buff, 0, "\001+\012abC{e-ZYXe\003NET\000", 18);
-       query_dname_tolower(ldns_buffer_begin(buff), 18);
-       unit_assert( memcmp(ldns_buffer_begin(buff), 
-               "\001+\012abc{e-zyxe\003net\000", 18) == 0);
-
-       ldns_buffer_write_at(buff, 0, "\000", 1);
-       query_dname_tolower(ldns_buffer_begin(buff), 1);
-       unit_assert( memcmp(ldns_buffer_begin(buff), "\000", 1) == 0);
-
-       ldns_buffer_write_at(buff, 0, "\002NL\000", 4);
-       query_dname_tolower(ldns_buffer_begin(buff), 4);
-       unit_assert( memcmp(ldns_buffer_begin(buff), "\002nl\000", 4) == 0);
-
-       /* test query_dname_compare */
-       unit_assert(query_dname_compare((uint8_t*)"", (uint8_t*)"") == 0);
-       unit_assert(query_dname_compare((uint8_t*)"\001a", 
-                                       (uint8_t*)"\001a") == 0);
-       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
-                                       (uint8_t*)"\003abc\001a") == 0);
-       unit_assert(query_dname_compare((uint8_t*)"\003aBc\001a", 
-                                       (uint8_t*)"\003AbC\001A") == 0);
-       unit_assert(query_dname_compare((uint8_t*)"\003abc", 
-                                       (uint8_t*)"\003abc\001a") == -1);
-       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
-                                       (uint8_t*)"\003abc") == +1);
-       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
-                                       (uint8_t*)"") == +1);
-       unit_assert(query_dname_compare((uint8_t*)"", 
-                                       (uint8_t*)"\003abc\001a") == -1);
-       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
-                                       (uint8_t*)"\003xxx\001a") == -1);
-       unit_assert(query_dname_compare((uint8_t*)"\003axx\001a", 
-                                       (uint8_t*)"\003abc\001a") == 1);
-       unit_assert(query_dname_compare((uint8_t*)"\003abc\001a", 
-                                       (uint8_t*)"\003abc\001Z") == -1);
-       unit_assert(query_dname_compare((uint8_t*)"\003abc\001Z", 
-                                       (uint8_t*)"\003abc\001a") == 1);
-
-       unit_assert(dname_count_labels((uint8_t*)"") == 1);
-       unit_assert(dname_count_labels((uint8_t*)"\003com") == 2);
-       unit_assert(dname_count_labels((uint8_t*)"\003org") == 2);
-       unit_assert(dname_count_labels((uint8_t*)"\007example\003com") == 3);
-       unit_assert(dname_count_labels((uint8_t*)"\003bla\007example\003com") 
-               == 4);
-
-       ldns_buffer_free(buff);
-}
-
 /**
  * Main unit test program. Setup, teardown and report errors.
  * @param argc: arg count.
@@ -219,8 +136,8 @@ main(int argc, char* argv[])
        printf("Start of %s unit test.\n", PACKAGE_STRING);
        checklock_start();
        net_test();
+       dname_test();
        alloc_test();
-       msgreply_test();
        lruhash_test();
        slabhash_test();
        msgparse_test();

diff --git a/testcode/unitmain.h b/testcode/unitmain.h
index 3f60d68ea70c278cd6a4c4c58ac7decbafedaa17..2d0633e244eb570097aefd0d3402225db86039a5 100644 (file)
--- a/testcode/unitmain.h
+++ b/testcode/unitmain.h
@@ -53,5 +53,7 @@ void lruhash_test();
 void slabhash_test();
 /** unit test for msgreply and msgparse */
 void msgparse_test();
+/** unit test dname handling functions */
+void dname_test();
 
 #endif /* TESTCODE_UNITMAIN_H */

diff --git a/testcode/unitmsgparse.c b/testcode/unitmsgparse.c
index ffa342ca629a921b31512505f251b99e67e60502..14e943b8d78986dcda54aaf920404a0e91493a95 100644 (file)
--- a/testcode/unitmsgparse.c
+++ b/testcode/unitmsgparse.c
@@ -35,8 +35,7 @@
  */
 /**
  * \file
- * Unit test main program. Calls all the other unit tests.
- * Exits with code 1 on a failure. 0 if all unit tests are successfull.
+ * Calls msg parse unit tests. Exits with code 1 on a failure. 
  */
 
 #include "config.h"