From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 4 Oct 2012 04:48:57 +0000 (+0530)
Subject: [2206] Make a common function out of duplicate code
X-Git-Tag: trac2351_base~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47c013b000db7235e1ab798eadebc3b42984b06e;p=thirdparty%2Fkea.git

[2206] Make a common function out of duplicate code
---

diff --git a/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
index e6a8a97893..efee347b82 100644
--- a/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
@@ -54,22 +54,25 @@ TEST_F(ZoneTableSegmentTest, create) {
     EXPECT_NE(static_cast<void*>(NULL), segment_);
 }
 
-TEST_F(ZoneTableSegmentTest, getHeader) {
-    ZoneTableHeader& header = segment_->getHeader();
+// Helper function to check const and non-const methods.
+template <typename TS, typename TH>
+void
+testGetHeader(ZoneTableSegment* segment) {
+    TH& header = static_cast<TS*>(segment)->getHeader();
 
     // The zone table is unset.
-    ZoneTable* table = header.getTable();
+    const ZoneTable* table = header.getTable();
     EXPECT_EQ(static_cast<void*>(NULL), table);
 }
 
-TEST_F(ZoneTableSegmentTest, getHeaderConst) {
-    // Test const methods
-    const ZoneTableHeader& header =
-         static_cast<const ZoneTableSegment*>(segment_)->getHeader();
+TEST_F(ZoneTableSegmentTest, getHeader) {
+    // non-const version.
+    testGetHeader<ZoneTableSegment, ZoneTableHeader>(segment_);
+}
 
-    // The zone table is unset.
-    const ZoneTable* table = header.getTable();
-    EXPECT_EQ(static_cast<void*>(NULL), table);
+TEST_F(ZoneTableSegmentTest, getHeaderConst) {
+    // const version.
+    testGetHeader<const ZoneTableSegment, const ZoneTableHeader>(segment_);
 }
 
 TEST_F(ZoneTableSegmentTest, getMemorySegment) {