more unit tests

git-svn-id: file:///svn/unbound/branches/edns-subnet@2959 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/edns-subnet/addrtree.c b/edns-subnet/addrtree.c
index 242fad66b9908b11948181067b54e5cffd7ba37c..6a7ebb5991bf3b045a606f86764c651ff5a3a640 100644 (file)
--- a/edns-subnet/addrtree.c
+++ b/edns-subnet/addrtree.c
@@ -150,7 +150,8 @@ void addrtree_delete(struct addrtree* tree)
 }
 
 /** Get N'th bit from address */
-int getbit(const addrkey_t* addr, addrlen_t addrlen, addrlen_t n)
+static int 
+getbit(const addrkey_t* addr, addrlen_t addrlen, addrlen_t n)
 {
        log_assert(addrlen > n);
        return (int)(addr[n/KEYWIDTH]>>((KEYWIDTH-1)-(n%KEYWIDTH))) & 1;
@@ -328,9 +329,11 @@ addrlen_t unittest_wrapper_addrtree_bits_common(const addrkey_t* s1,
                addrlen_t l1, const addrkey_t* s2, addrlen_t l2, addrlen_t skip) {
        return bits_common(s1, l1, s2, l2, skip);
 }
-
-
-//~ static struct addredge* edge_create(struct addrnode* node, const addrkey_t* addr, addrlen_t addrlen)
-//~ static struct addrnode* node_create(struct reply_info* elem, addrlen_t scope)
-//~ static void freenode_recursive(struct addrtree* tree, struct addrnode* node)
-//~ static int issub(const addrkey_t* s1, addrlen_t l1,        const addrkey_t* s2, addrlen_t l2,  addrlen_t skip)
+int unittest_wrapper_addrtree_getbit(const addrkey_t* addr, 
+               addrlen_t addrlen, addrlen_t n) {
+       return getbit(addr, addrlen, n);
+}
+int unittest_wrapper_addrtree_issub(const addrkey_t* s1, addrlen_t l1, 
+               const addrkey_t* s2, addrlen_t l2,  addrlen_t skip) {
+       return issub(s1, l1, s2, l2, skip);
+}

diff --git a/edns-subnet/addrtree.h b/edns-subnet/addrtree.h
index c7d5efb30b6cef5f3afd27aadc0ca6258e30da8f..39f619dacc98afb8f3d535f1403b6f495ac11876 100644 (file)
--- a/edns-subnet/addrtree.h
+++ b/edns-subnet/addrtree.h
@@ -112,4 +112,8 @@ int unittest_wrapper_addrtree_cmpbit(const addrkey_t* key1,
        const addrkey_t* key2, addrlen_t n);
 addrlen_t unittest_wrapper_addrtree_bits_common(const addrkey_t* s1, 
        addrlen_t l1, const addrkey_t* s2, addrlen_t l2, addrlen_t skip);
+int unittest_wrapper_addrtree_getbit(const addrkey_t* addr, 
+       addrlen_t addrlen, addrlen_t n);
+int unittest_wrapper_addrtree_issub(const addrkey_t* s1, addrlen_t l1, 
+       const addrkey_t* s2, addrlen_t l2,  addrlen_t skip);
 #endif /* ADDRTREE_H */

diff --git a/testcode/unitvandergaast.c b/testcode/unitvandergaast.c
index 3dd19d4053626d5a290a08199b74cc61c78d6669..d36c92e3c38293b5bb4f65c657039d224700f807 100644 (file)
--- a/testcode/unitvandergaast.c
+++ b/testcode/unitvandergaast.c
@@ -44,19 +44,60 @@
 #include "testcode/unitmain.h"
 #include "edns-subnet/addrtree.h"
 
+static int 
+issub(const addrkey_t* s1, addrlen_t l1, 
+       const addrkey_t* s2, addrlen_t l2,  addrlen_t skip)
+{
+       return bits_common(s1, l1, s2, l2, skip) == l1;
+}
+
+static void issub_test(void)
+{
+       unit_show_func("edns-subnet/addrtree.h", "issub");
+       addrkey_t k1[] = {0x55, 0x55, 0x5A};
+       addrkey_t k2[] = {0x55, 0x5D, 0x5A};
+       unit_assert( !unittest_wrapper_addrtree_issub(k1, 24, k2, 24,  0) );
+       unit_assert(  unittest_wrapper_addrtree_issub(k1,  8, k2, 16,  0) );
+       unit_assert(  unittest_wrapper_addrtree_issub(k2, 12, k1, 13,  0) );
+       unit_assert( !unittest_wrapper_addrtree_issub(k1, 16, k2, 12,  0) );
+       unit_assert(  unittest_wrapper_addrtree_issub(k1, 12, k2, 12,  0) );
+       unit_assert( !unittest_wrapper_addrtree_issub(k1, 13, k2, 13,  0) );
+       unit_assert(  unittest_wrapper_addrtree_issub(k1, 24, k2, 24, 13) );
+       unit_assert( !unittest_wrapper_addrtree_issub(k1, 24, k2, 20, 13) );
+       unit_assert(  unittest_wrapper_addrtree_issub(k1, 20, k2, 24, 13) );
+}
+
+static void getbit_test(void)
+{
+       unit_show_func("edns-subnet/addrtree.h", "getbit");
+       addrkey_t k1[] = {0x55, 0x55, 0x5A};
+       int i;
+       for(i = 0; i<20; i++) {
+               unit_assert( unittest_wrapper_addrtree_getbit(k1, 20, i) == (i&1) );
+       }
+}
+
 static void bits_common_test(void)
 {
        unit_show_func("edns-subnet/addrtree.h", "bits_common");
        addrkey_t k1[] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0};
-       //~ addrkey_t k2[] = {0x5A, 0xF0};
+       addrkey_t k2[] = {0,0,0,0,0,0,0,0};
        int i;
        
        for(i = 0; i<64; i++) {
                unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k1, 64, i) == 64 );
-               
-               //actually I expect the following to crash
-               //~ unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k1, 11, i) == 11 );
        }
+       for(i = 0; i<8; i++) {
+               k2[i] = k1[i]^(1<<i);
+       }
+       unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k2, 64,  0) == 0*8+7 );
+       unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k2, 64,  8) == 1*8+6 );
+       unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k2, 64, 16) == 2*8+5 );
+       unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k2, 64, 24) == 3*8+4 );
+       unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k2, 64, 32) == 4*8+3 );
+       unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k2, 64, 40) == 5*8+2 );
+       unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k2, 64, 48) == 6*8+1 );
+       unit_assert( unittest_wrapper_addrtree_bits_common(k1, 64, k2, 64, 56) == 7*8+0 );
 }
 
 static void cmpbit_test(void)
@@ -77,4 +118,6 @@ void vandergaast_test(void)
        unit_show_feature("vandergaast");
        cmpbit_test();
        bits_common_test();
+       getbit_test();
+       issub_test();
 }