From: Andrei Pavel <andrei@isc.org>
Date: Tue, 18 May 2021 12:26:57 +0000 (+0300)
Subject: [#1860] constructor, destructor -> SetUp, TearDown
X-Git-Tag: Kea-1.9.8~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bfd4518346a53b0485e62daf4e4d788179a34ef;p=thirdparty%2Fkea.git

[#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 0065e527ea..d065ec827f 100644
--- 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 d78b40b23c..bb0fc17948 100644
--- 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_;
     }