[2751] Add another minor check and adjust tests

diff --git a/src/lib/datasrc/memory/rdataset.cc b/src/lib/datasrc/memory/rdataset.cc
index 737ecd605209a2d340ce87af4530b23bdaa9007f..b60316c4f7da878f972cf326eab998f99f91ab08 100644 (file)
--- a/src/lib/datasrc/memory/rdataset.cc
+++ b/src/lib/datasrc/memory/rdataset.cc
@@ -97,6 +97,9 @@ sanityChecks(const ConstRRsetPtr& rrset, const ConstRRsetPtr &sig_rrset,
     if (sig_rrset && sig_rrset->getRdataCount() == 0) {
         isc_throw(BadValue, "Empty SIG RRset");
     }
+    if (sig_rrset && sig_rrset->getType() != RRType::RRSIG()) {
+        isc_throw(BadValue, "SIG RRset doesn't have type RRSIG");
+    }
     if (rrset && sig_rrset && rrset->getClass() != sig_rrset->getClass()) {
         isc_throw(BadValue, "RR class doesn't match between RRset and RRSIG");
     }

diff --git a/src/lib/datasrc/tests/memory/rdataset_unittest.cc b/src/lib/datasrc/tests/memory/rdataset_unittest.cc
index d5cebdd062a0345218c06e4830757e485dd4c32a..e6fd5cce970c8ff3964fe7b2dd3c9926064309bb 100644 (file)
--- a/src/lib/datasrc/tests/memory/rdataset_unittest.cc
+++ b/src/lib/datasrc/tests/memory/rdataset_unittest.cc
@@ -703,6 +703,9 @@ TEST_F(RdataSetTest, badParams) {
     const ConstRRsetPtr empty_rrset(new RRset(Name("www.example.com"),
                                              RRClass::IN(), RRType::A(),
                                              RRTTL(3600)));
+    const ConstRRsetPtr empty_rrsig(new RRset(Name("www.example.com"),
+                                             RRClass::IN(), RRType::RRSIG(),
+                                             RRTTL(3600)));
     const ConstRRsetPtr a_rrset = textToRRset("www.example.com. 3600 IN A "
                                               "192.0.2.1");
     const ConstRRsetPtr aaaa_rrset = textToRRset("www.example.com. 3600 IN AAAA "
@@ -722,7 +725,10 @@ TEST_F(RdataSetTest, badParams) {
     EXPECT_THROW(RdataSet::create(mem_sgmt_, encoder_, empty_rrset, sig_rrset),
                  isc::BadValue);
     // The same for rrsig
-    EXPECT_THROW(RdataSet::create(mem_sgmt_, encoder_, a_rrset, empty_rrset),
+    EXPECT_THROW(RdataSet::create(mem_sgmt_, encoder_, a_rrset, empty_rrsig),
+                 isc::BadValue);
+    // Mismatched type
+    EXPECT_THROW(RdataSet::create(mem_sgmt_, encoder_, empty_rrset, a_rrset),
                  isc::BadValue);
     // Similar for subtract
     EXPECT_THROW(RdataSet::subtract(mem_sgmt_, encoder_, empty_rrset,