[svn] commit: r1144 - /trunk/src/lib/auth/data_source_static_unittest.cc

BIND 10 source code commits bind10-changes at lists.isc.org
Sat Mar 6 00:08:12 UTC 2010


Author: jinmei
Date: Sat Mar  6 00:08:12 2010
New Revision: 1144

Log:
added some more tests for static data source

Modified:
    trunk/src/lib/auth/data_source_static_unittest.cc

Modified: trunk/src/lib/auth/data_source_static_unittest.cc
==============================================================================
--- trunk/src/lib/auth/data_source_static_unittest.cc (original)
+++ trunk/src/lib/auth/data_source_static_unittest.cc Sat Mar  6 00:08:12 2010
@@ -46,8 +46,7 @@
                              authors_name("authors.bind"),
                              nomatch_name("example.com"),
                              rrclass(RRClass::CH()), rrtype(RRType::TXT()),
-                             find_flags(0),
-                             matched_rdata(0)
+                             rrttl(RRTTL(0)), find_flags(0), matched_rdata(0)
     {
         // static data source will ignore the message, and the encapsulating
         // query object so the content doesn't matter.
@@ -84,6 +83,7 @@
     const Name nomatch_name;
     const RRClass rrclass;
     RRType rrtype;              // we allow this to be modified in the test
+    RRTTL rrttl;
     RRsetList result_sets;
     uint32_t find_flags;
     unsigned matched_rdata;
@@ -96,11 +96,12 @@
 void
 checkRRset(ConstRRsetPtr rrset, const Name& expected_name,
            const RRClass& expected_class, const RRType& expected_type,
-           const vector<string>& expected_data)
+           const RRTTL& rrttl, const vector<string>& expected_data)
 {
     EXPECT_EQ(expected_name, rrset->getName());
     EXPECT_EQ(expected_class, rrset->getClass());
     EXPECT_EQ(expected_type, rrset->getType());
+    EXPECT_EQ(rrttl, rrset->getTTL());
 
     RdataIteratorPtr rdata_iterator = rrset->getRdataIterator();
     rdata_iterator->first();
@@ -168,12 +169,13 @@
     EXPECT_EQ(DataSrc::SUCCESS,
               data_source.findRRset(*query, version_name, rrclass, rrtype,
                                     result_sets, find_flags, NULL));
+    EXPECT_EQ(0, find_flags);
     // There should be only item in result_sets, which should be
     // version_name/TXT.
     RRsetList::iterator it = result_sets.begin();
     for (; it != result_sets.end(); ++it) {
         if ((*it)->getType() == rrtype) {
-            checkRRset(*it, version_name, rrclass, rrtype, version_data);
+            checkRRset(*it, version_name, rrclass, rrtype, rrttl, version_data);
             ++matched_rdata;
         }
     }
@@ -185,10 +187,12 @@
     EXPECT_EQ(DataSrc::SUCCESS,
               data_source.findRRset(*query, version_name, rrclass, rrtype,
                                     result_sets, find_flags, NULL));
+    EXPECT_EQ(0, find_flags);
     RRsetList::iterator it = result_sets.begin();
     for (; it != result_sets.end(); ++it) {
         if ((*it)->getType() == rrtype) {
-            checkRRset(*it, version_name, rrclass, rrtype, version_ns_data);
+            checkRRset(*it, version_name, rrclass, rrtype, rrttl,
+                       version_ns_data);
             ++matched_rdata;
         }
     }
@@ -199,10 +203,11 @@
     EXPECT_EQ(DataSrc::SUCCESS,
               data_source.findRRset(*query, authors_name, rrclass, rrtype,
                                     result_sets, find_flags, NULL));
+    EXPECT_EQ(0, find_flags);
     RRsetList::iterator it = result_sets.begin();
     for (; it != result_sets.end(); ++it) {
         if ((*it)->getType() == RRType::TXT()) {
-            checkRRset(*it, authors_name, rrclass, rrtype, authors_data);
+            checkRRset(*it, authors_name, rrclass, rrtype, rrttl, authors_data);
             ++matched_rdata;
         }
     }
@@ -214,14 +219,16 @@
     EXPECT_EQ(DataSrc::SUCCESS,
               data_source.findRRset(*query, authors_name, rrclass, rrtype,
                                     result_sets, find_flags, NULL));
+    EXPECT_EQ(0, find_flags);
     RRsetList::iterator it = result_sets.begin();
     for (; it != result_sets.end(); ++it) {
         if ((*it)->getType() == rrtype) {
-            checkRRset(*it, authors_name, rrclass, rrtype, authors_ns_data);
-            ++matched_rdata;
-        }
-    }
-    EXPECT_EQ(1, matched_rdata);
-}
-
-}
+            checkRRset(*it, authors_name, rrclass, rrtype, rrttl,
+                       authors_ns_data);
+            ++matched_rdata;
+        }
+    }
+    EXPECT_EQ(1, matched_rdata);
+}
+
+}




More information about the bind10-changes mailing list