BIND 10 trac2432, updated. b5aa1d1b12636ba96e3fff48e27fb6acf6e38333 [2432] Unify common test code

[BIND 10 source code commits]

The branch, trac2432 has been updated
       via  b5aa1d1b12636ba96e3fff48e27fb6acf6e38333 (commit)
       via  2fc0ce200dfa85a5f7baa577750b3c3fe8032f7d (commit)
      from  d33dd125553aa9702e1a29a6c0e30da9ffffe53b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b5aa1d1b12636ba96e3fff48e27fb6acf6e38333
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Dec 24 14:20:39 2012 +0530

    [2432] Unify common test code

commit 2fc0ce200dfa85a5f7baa577750b3c3fe8032f7d
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Dec 24 14:11:29 2012 +0530

    [2432] Update comment about ignoring error and warning callbacks

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/rrset_collection.cc                |    2 +-
 src/lib/dns/tests/rrset_collection_unittest.cc |   39 ++++++++----------------
 2 files changed, 14 insertions(+), 27 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/rrset_collection.cc b/src/lib/dns/rrset_collection.cc
index 8594c93..bf535c7 100644
--- a/src/lib/dns/rrset_collection.cc
+++ b/src/lib/dns/rrset_collection.cc
@@ -24,7 +24,7 @@ namespace dns {
 void
 RRsetCollection::loaderCallback(const std::string&, size_t, const std::string&)
 {
-     // We just ignore errors and warnings.
+     // We just ignore callbacks for errors and warnings.
 }
 
 void
diff --git a/src/lib/dns/tests/rrset_collection_unittest.cc b/src/lib/dns/tests/rrset_collection_unittest.cc
index 1c3f4f7..d29fc32 100644
--- a/src/lib/dns/tests/rrset_collection_unittest.cc
+++ b/src/lib/dns/tests/rrset_collection_unittest.cc
@@ -60,11 +60,10 @@ TEST_F(RRsetCollectionTest, findBase) {
     EXPECT_NE(static_cast<AbstractRRset*>(NULL), rrset);
 }
 
-TEST_F(RRsetCollectionTest, findConst) {
+template <typename T, typename TP>
+void doFind(T& collection, const RRClass& rrclass) {
     // Test the find() that returns ConstRRsetPtr
-    const RRsetCollection& ccln = collection;
-    ConstRRsetPtr rrset = ccln.find(Name("www.example.org"), rrclass,
-                                    RRType::A());
+    TP rrset = collection.find(Name("www.example.org"), rrclass, RRType::A());
     EXPECT_TRUE(rrset);
     EXPECT_EQ(RRType::A(), rrset->getType());
     EXPECT_EQ(RRTTL(3600), rrset->getTTL());
@@ -72,39 +71,27 @@ TEST_F(RRsetCollectionTest, findConst) {
     EXPECT_EQ(Name("www.example.org"), rrset->getName());
 
     // foo.example.org doesn't exist
-    rrset = ccln.find(Name("foo.example.org"), rrclass, RRType::A());
+    rrset = collection.find(Name("foo.example.org"), rrclass, RRType::A());
     EXPECT_FALSE(rrset);
 
     // www.example.org exists, but not with MX
-    rrset = ccln.find(Name("www.example.org"), rrclass, RRType::MX());
+    rrset = collection.find(Name("www.example.org"), rrclass, RRType::MX());
     EXPECT_FALSE(rrset);
 
     // www.example.org exists, with AAAA
-    rrset = ccln.find(Name("www.example.org"), rrclass, RRType::AAAA());
+    rrset = collection.find(Name("www.example.org"), rrclass, RRType::AAAA());
     EXPECT_TRUE(rrset);
 }
 
-TEST_F(RRsetCollectionTest, find) {
+TEST_F(RRsetCollectionTest, findConst) {
     // Test the find() that returns ConstRRsetPtr
-    RRsetPtr rrset = collection.find(Name("www.example.org"), rrclass,
-                                     RRType::A());
-    EXPECT_TRUE(rrset);
-    EXPECT_EQ(RRType::A(), rrset->getType());
-    EXPECT_EQ(RRTTL(3600), rrset->getTTL());
-    EXPECT_EQ(RRClass("IN"), rrset->getClass());
-    EXPECT_EQ(Name("www.example.org"), rrset->getName());
-
-    // foo.example.org doesn't exist
-    rrset = collection.find(Name("foo.example.org"), rrclass, RRType::A());
-    EXPECT_FALSE(rrset);
-
-    // www.example.org exists, but not with MX
-    rrset = collection.find(Name("www.example.org"), rrclass, RRType::MX());
-    EXPECT_FALSE(rrset);
+    const RRsetCollection& ccln = collection;
+    doFind<const RRsetCollection, ConstRRsetPtr>(ccln, rrclass);
+}
 
-    // www.example.org exists, with AAAA
-    rrset = collection.find(Name("www.example.org"), rrclass, RRType::AAAA());
-    EXPECT_TRUE(rrset);
+TEST_F(RRsetCollectionTest, find) {
+    // Test the find() that returns RRsetPtr
+    doFind<RRsetCollection, RRsetPtr>(collection, rrclass);
 }
 
 TEST_F(RRsetCollectionTest, addAndRemove) {