[#1860] constructor, destructor -> SetUp, TearDown

diff --git a/src/lib/dhcp/tests/opaque_data_tuple_unittest.cc b/src/lib/dhcp/tests/opaque_data_tuple_unittest.cc
index 0065e527ea0a28bfe3c3b88a8bb828300cce2db8..d065ec827f54e28fa2a7b2897fafbc43deecab7c 100644 (file)
--- a/src/lib/dhcp/tests/opaque_data_tuple_unittest.cc
+++ b/src/lib/dhcp/tests/opaque_data_tuple_unittest.cc
@@ -22,12 +22,15 @@ using namespace isc::util;
 namespace {
 
 struct OpaqueDataTupleLenientParsing : ::testing::Test {
-    OpaqueDataTupleLenientParsing() : previous_(Option::lenient_parsing_) {
+    void SetUp() final override {
+        // Retain the current setting for future restoration.
+        previous_ = Option::lenient_parsing_;
+
         // Enable lenient parsing.
         Option::lenient_parsing_ = true;
     }
 
-    ~OpaqueDataTupleLenientParsing() {
+    void TearDown() final override {
         // Restore.
         Option::lenient_parsing_ = previous_;
     }

diff --git a/src/lib/dhcp/tests/option_vendor_class_unittest.cc b/src/lib/dhcp/tests/option_vendor_class_unittest.cc
index d78b40b23ced8ee2e4ba1c8bac0a4f07c26c2e72..bb0fc17948d20e9c8af067421ec029ca4e6e2008 100644 (file)
--- a/src/lib/dhcp/tests/option_vendor_class_unittest.cc
+++ b/src/lib/dhcp/tests/option_vendor_class_unittest.cc
@@ -19,12 +19,15 @@ using namespace isc::util;
 namespace {
 
 struct OptionVendorClassLenientParsing : ::testing::Test {
-    OptionVendorClassLenientParsing() : previous_(Option::lenient_parsing_) {
+    void SetUp() final override {
+        // Retain the current setting for future restoration.
+        previous_ = Option::lenient_parsing_;
+
         // Enable lenient parsing.
         Option::lenient_parsing_ = true;
     }
 
-    ~OptionVendorClassLenientParsing() {
+    void TearDown() final override {
         // Restore.
         Option::lenient_parsing_ = previous_;
     }