From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 28 Nov 2012 21:40:46 +0000 (-0800)
Subject: [2420] unify destroying zone data and leak check in the test dtor
X-Git-Tag: bind10-1.0.0-beta-release~52^2~1^2~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41b26fc471f6e15525a7fe5d522529eea45c73db;p=thirdparty%2Fkea.git

[2420] unify destroying zone data and leak check in the test dtor
---

diff --git a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc b/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
index 3f72fa9893..63c69c8568 100644
--- a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
@@ -45,12 +45,16 @@ protected:
         zone_data_(ZoneData::create(mem_sgmt_, zname_)),
         updater_(new ZoneDataUpdater(mem_sgmt_, zclass_, zname_, *zone_data_))
     {}
+
     ~ZoneDataUpdaterTest() {
-        // Make sure zone data is destroyed even if a test results in exception
         if (zone_data_ != NULL) {
             ZoneData::destroy(mem_sgmt_, zone_data_, zclass_);
         }
+        if (!mem_sgmt_.allMemoryDeallocated()) {
+            ADD_FAILURE() << "Memory leak detected";
+        }
     }
+
     void clearZoneData() {
         assert(zone_data_ != NULL);
         ZoneData::destroy(mem_sgmt_, zone_data_, zclass_);
@@ -59,13 +63,6 @@ protected:
                                            *zone_data_));
     }
 
-    void TearDown() {
-        if (zone_data_ != NULL) {
-            ZoneData::destroy(mem_sgmt_, zone_data_, zclass_);
-            zone_data_ = NULL;
-        }
-        EXPECT_TRUE(mem_sgmt_.allMemoryDeallocated()); // catch any leak here.
-    }
     const Name zname_;
     const RRClass zclass_;
     test::MemorySegmentTest mem_sgmt_;