Browse Source

[1310] Add branch wildcard_nxrrset in query_unittest.cc

xiejiagui 13 years ago
parent
commit
fda23d6cf4
1 changed files with 10 additions and 2 deletions
  1. 10 2
      src/bin/auth/tests/query_unittest.cc

+ 10 - 2
src/bin/auth/tests/query_unittest.cc

@@ -402,9 +402,17 @@ MockZoneFinder::find(const Name& name, const RRType& type,
             domain = domains_.find(Name("*").concatenate(wild_suffix));
             domain = domains_.find(Name("*").concatenate(wild_suffix));
             assert(domain != domains_.end());
             assert(domain != domains_.end());
             RRsetStore::const_iterator found_rrset = domain->second.find(type);
             RRsetStore::const_iterator found_rrset = domain->second.find(type);
-            assert(found_rrset != domain->second.end());
-            return (FindResult(WILDCARD,
+            if (found_rrset != domain->second.end()) {
+				return (FindResult(WILDCARD,
                                substituteWild(*found_rrset->second, name)));
                                substituteWild(*found_rrset->second, name)));
+			} else {
+				found_rrset = domain->second.find(RRType::NSEC());
+				assert(found_rrset != domain->second.end());
+				Name newName = Name("*").concatenate(wild_suffix);
+				return (FindResult(WILDCARD_NXRRSET,
+							   substituteWild(*found_rrset->second,newName)));
+			}
+
         }
         }
         const Name cnamewild_suffix("cnamewild.example.com");
         const Name cnamewild_suffix("cnamewild.example.com");
         if (name.compare(cnamewild_suffix).getRelation() ==
         if (name.compare(cnamewild_suffix).getRelation() ==