From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 15 Aug 2012 19:44:36 +0000 (+0530)
Subject: [2165] Add the attached RRSIG when dumping RRsets
X-Git-Tag: trac2351_base~110^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d057be8fd1bb48ad6ccead205fd81056c8289713;p=thirdparty%2Fkea.git

[2165] Add the attached RRSIG when dumping RRsets

This realistically belongs in RRset::toText(), but I think current
code expects RRset::toText() to just return text for that RRset and
not any attached RRSIGs.
---

diff --git a/src/lib/testutils/dnsmessage_test.h b/src/lib/testutils/dnsmessage_test.h
index 21a3f9ab52..fbcb185b88 100644
--- a/src/lib/testutils/dnsmessage_test.h
+++ b/src/lib/testutils/dnsmessage_test.h
@@ -168,6 +168,10 @@ public:
     {}
     void operator()(isc::dns::ConstRRsetPtr rrset) {
         output_ += "  " + rrset->toText();
+
+        if (rrset->getRRsig()) {
+            output_ += "  " + rrset->getRRsig()->toText();
+        }
     }
 private:
     std::string& output_;
@@ -256,6 +260,7 @@ rrsetsCheck(EXPECTED_ITERATOR expected_begin, EXPECTED_ITERATOR expected_end,
         if (found_rrset_it != expected_end) {
             rrsetCheck(*found_rrset_it, *it);
             ++rrset_matched;
+            rrset_matched += (*it)->getRRsigDataCount();
         }
     }