[#3710] fixed warning

diff --git a/src/hooks/dhcp/forensic_log/tests/legal_log4_unittests.cc b/src/hooks/dhcp/forensic_log/tests/legal_log4_unittests.cc
index bc2f7ee23b9bfb17f763c75f5d75b6103215e4a4..1013be4832280d2b1335147d0db274c9704519b4 100644 (file)
--- a/src/hooks/dhcp/forensic_log/tests/legal_log4_unittests.cc
+++ b/src/hooks/dhcp/forensic_log/tests/legal_log4_unittests.cc
@@ -72,7 +72,7 @@ struct CalloutTestv4 : CalloutTest {
     }
 
     /// @brief Called before each test.
-    virtual void SetUp() final override {
+    virtual void SetUp() override {
         RotatingFileTest::SetUp();
         // Various entities used in tests.
         client_id_ = boost::make_shared<ClientId>(CLIENTID);

diff --git a/src/hooks/dhcp/forensic_log/tests/legal_log6_unittests.cc b/src/hooks/dhcp/forensic_log/tests/legal_log6_unittests.cc
index c32f0f032753e81d44f55dbea258b3fdc245e7a2..306b51da7bee8ca01ea2c24c2c72763d7222b0d8 100644 (file)
--- a/src/hooks/dhcp/forensic_log/tests/legal_log6_unittests.cc
+++ b/src/hooks/dhcp/forensic_log/tests/legal_log6_unittests.cc
@@ -72,7 +72,7 @@ struct CalloutTestv6 : CalloutTest {
     }
 
     /// @brief Called before each test.
-    virtual void SetUp() final override {
+    virtual void SetUp() override {
         RotatingFileTest::SetUp();
         // Various entities used in tests.
         duid_ = boost::make_shared<DUID>(DUID_DATA);

diff --git a/src/hooks/dhcp/forensic_log/tests/legal_log_mgr_unittests.cc b/src/hooks/dhcp/forensic_log/tests/legal_log_mgr_unittests.cc
index 9f2f1bd66f4da271423518e3f12975a3baa38d5e..b7d27a5429e47097dbdf8c5849ea0e9a5fc2ae8a 100644 (file)
--- a/src/hooks/dhcp/forensic_log/tests/legal_log_mgr_unittests.cc
+++ b/src/hooks/dhcp/forensic_log/tests/legal_log_mgr_unittests.cc
@@ -41,13 +41,13 @@ struct LegalLogMgrTest : ::testing::Test {
     virtual ~LegalLogMgrTest() = default;
 
     /// @brief Called before each test.
-    virtual void SetUp() final override {
+    virtual void SetUp() override {
         // Clean up from past tests.
         LegalLogMgrFactory::delAllBackends();
     }
 
     /// @brief Called after each test.
-    virtual void TearDown() {
+    virtual void TearDown() override {
         // Clean up from past tests.
         LegalLogMgrFactory::delAllBackends();
         reset();

diff --git a/src/lib/dhcp/tests/opaque_data_tuple_unittest.cc b/src/lib/dhcp/tests/opaque_data_tuple_unittest.cc
index 4b97aae7a81891915b30c9a5b61b1bb511c42646..1e8b24b9a00648627c74d451e022a48a6a29ebb5 100644 (file)
--- a/src/lib/dhcp/tests/opaque_data_tuple_unittest.cc
+++ b/src/lib/dhcp/tests/opaque_data_tuple_unittest.cc
@@ -22,7 +22,7 @@ using namespace isc::util;
 namespace {
 
 struct OpaqueDataTupleLenientParsing : ::testing::Test {
-    void SetUp() final override {
+    void SetUp() override {
         // Retain the current setting for future restoration.
         previous_ = Option::lenient_parsing_;
 
@@ -30,7 +30,7 @@ struct OpaqueDataTupleLenientParsing : ::testing::Test {
         Option::lenient_parsing_ = true;
     }
 
-    void TearDown() final override {
+    void TearDown() 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 39826441ea3b320648ff236018cdff12847827ef..4b83222ba3c7ebbd4b96271481b7e1c2017df99c 100644 (file)
--- a/src/lib/dhcp/tests/option_vendor_class_unittest.cc
+++ b/src/lib/dhcp/tests/option_vendor_class_unittest.cc
@@ -19,7 +19,7 @@ using namespace isc::util;
 namespace {
 
 struct OptionVendorClassLenientParsing : ::testing::Test {
-    void SetUp() final override {
+    void SetUp() override {
         // Retain the current setting for future restoration.
         previous_ = Option::lenient_parsing_;
 
@@ -27,7 +27,7 @@ struct OptionVendorClassLenientParsing : ::testing::Test {
         Option::lenient_parsing_ = true;
     }
 
-    void TearDown() final override {
+    void TearDown() override {
         // Restore.
         Option::lenient_parsing_ = previous_;
     }

diff --git a/src/lib/dhcpsrv/testutils/Makefile.am b/src/lib/dhcpsrv/testutils/Makefile.am
index fc87c1567c951a9a444a7d4caa3bbc40cda1c75b..7b45026e9c4f206e16aac6724efa439333055c76 100644 (file)
--- a/src/lib/dhcpsrv/testutils/Makefile.am
+++ b/src/lib/dhcpsrv/testutils/Makefile.am
@@ -18,6 +18,7 @@ libdhcpsrvtest_la_SOURCES += config_result_check.cc config_result_check.h
 libdhcpsrvtest_la_SOURCES += dhcp4o6_test_ipc.cc dhcp4o6_test_ipc.h
 libdhcpsrvtest_la_SOURCES += host_data_source_utils.cc host_data_source_utils.h
 libdhcpsrvtest_la_SOURCES += lib_load_test_fixture.h
+libdhcpsrvtest_la_SOURCES += forensic_test_utils.h
 libdhcpsrvtest_la_SOURCES += memory_host_data_source.cc memory_host_data_source.h
 libdhcpsrvtest_la_SOURCES += test_utils.cc test_utils.h
 libdhcpsrvtest_la_SOURCES += generic_backend_unittest.cc generic_backend_unittest.h