[#2757] Finished move to upgradeExtendedInfo4

diff --git a/src/lib/dhcpsrv/tests/mysql_lease_extended_info_unittest.cc b/src/lib/dhcpsrv/tests/mysql_lease_extended_info_unittest.cc
index c06fd7f8094a4de5ae7bdd135b220ad1c4cc10bd..c3529c2ac6025e4826d206b7424b8a032ad638e6 100644 (file)
--- a/src/lib/dhcpsrv/tests/mysql_lease_extended_info_unittest.cc
+++ b/src/lib/dhcpsrv/tests/mysql_lease_extended_info_unittest.cc
@@ -124,9 +124,9 @@ public:
     /// @brief Test getLease4ByRemoteId.
     void testGetLeases4ByRemoteId();
 
-    /// @brief Test upgradeExtendedInfo.
-    void testUpgradeExtendedInfo(const CfgConsistency::ExtendedInfoSanity& check,
-                                 const LeasePageSize& page_size);
+    /// @brief Test upgradeExtendedInfo4.
+    void testUpgradeExtendedInfo4(const CfgConsistency::ExtendedInfoSanity& check,
+                                  const LeasePageSize& page_size);
 
     /// @brief Lease manager.
     LeaseMgr* lease_mgr_;
@@ -621,8 +621,8 @@ TEST_F(MySqlExtendedInfoTest, getLeases4ByRemoteIdMultiThreading) {
 }
 
 void
-MySqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInfoSanity& check,
-                                               const LeasePageSize& page_size) {
+MySqlExtendedInfoTest::testUpgradeExtendedInfo4(const CfgConsistency::ExtendedInfoSanity& check,
+                                                const LeasePageSize& page_size) {
     // Lease manager is created with empty tables.
     initLease4(false);
 
@@ -738,7 +738,7 @@ MySqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInf
         setExtendedInfoSanityCheck(check);
 
     size_t updated;
-    ASSERT_NO_THROW(updated = lease_mgr_->upgradeExtendedInfo(page_size));
+    ASSERT_NO_THROW(updated = lease_mgr_->upgradeExtendedInfo4(page_size));
 
     // Verify result.
     switch (check) {
@@ -925,44 +925,44 @@ MySqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInf
 
 }
 
-TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfoNone) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_NONE,
-                            LeasePageSize(100));
+TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4None) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_NONE,
+                             LeasePageSize(100));
 }
 
-TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfoFix) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(100));
+TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4Fix) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(100));
 }
 
-TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfoStrict) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_STRICT,
-                            LeasePageSize(100));
+TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4Strict) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_STRICT,
+                             LeasePageSize(100));
 }
 
-TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfoPedantic) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_PEDANTIC,
-                            LeasePageSize(100));
+TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4Pedantic) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_PEDANTIC,
+                             LeasePageSize(100));
 }
 
-TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo10) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(10));
+TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4_10) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(10));
 }
 
-TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo5) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(5));
+TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4_5) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(5));
 }
 
-TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo2) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(2));
+TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4_2) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(2));
 }
 
-TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo1) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(1));
+TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4_1) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(1));
 }
 
 }  // namespace

diff --git a/src/lib/dhcpsrv/tests/pgsql_lease_extended_info_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_lease_extended_info_unittest.cc
index 67aa319d13d7ffe4955480f6917de07159da2eb2..be224447bb7d1bbfa1d2d3bb74de4847a7e3989d 100644 (file)
--- a/src/lib/dhcpsrv/tests/pgsql_lease_extended_info_unittest.cc
+++ b/src/lib/dhcpsrv/tests/pgsql_lease_extended_info_unittest.cc
@@ -124,9 +124,9 @@ public:
     /// @brief Test getLease4ByRemoteId.
     void testGetLeases4ByRemoteId();
 
-    /// @brief Test upgradeExtendedInfo.
-    void testUpgradeExtendedInfo(const CfgConsistency::ExtendedInfoSanity& check,
-                                 const LeasePageSize& page_size);
+    /// @brief Test upgradeExtendedInfo4.
+    void testUpgradeExtendedInfo4(const CfgConsistency::ExtendedInfoSanity& check,
+                                  const LeasePageSize& page_size);
 
     /// @brief Lease manager.
     LeaseMgr* lease_mgr_;
@@ -621,8 +621,8 @@ TEST_F(PgSqlExtendedInfoTest, getLeases4ByRemoteIdMultiThreading) {
 }
 
 void
-PgSqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInfoSanity& check,
-                                               const LeasePageSize& page_size) {
+PgSqlExtendedInfoTest::testUpgradeExtendedInfo4(const CfgConsistency::ExtendedInfoSanity& check,
+                                                const LeasePageSize& page_size) {
     // Lease manager is created with empty tables.
     initLease4(false);
 
@@ -738,7 +738,7 @@ PgSqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInf
         setExtendedInfoSanityCheck(check);
 
     size_t updated;
-    ASSERT_NO_THROW(updated = lease_mgr_->upgradeExtendedInfo(page_size));
+    ASSERT_NO_THROW(updated = lease_mgr_->upgradeExtendedInfo4(page_size));
 
     // Verify result.
     switch (check) {
@@ -925,44 +925,44 @@ PgSqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInf
 
 }
 
-TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfoNone) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_NONE,
-                            LeasePageSize(100));
+TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4None) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_NONE,
+                             LeasePageSize(100));
 }
 
-TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfoFix) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(100));
+TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4Fix) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(100));
 }
 
-TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfoStrict) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_STRICT,
-                            LeasePageSize(100));
+TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4Strict) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_STRICT,
+                             LeasePageSize(100));
 }
 
-TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfoPedantic) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_PEDANTIC,
-                            LeasePageSize(100));
+TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4Pedantic) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_PEDANTIC,
+                             LeasePageSize(100));
 }
 
-TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo10) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(10));
+TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4_10) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(10));
 }
 
-TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo5) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(5));
+TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4_5) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(5));
 }
 
-TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo2) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(2));
+TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4_2) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(2));
 }
 
-TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo1) {
-    testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
-                            LeasePageSize(1));
+TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4_1) {
+    testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
+                             LeasePageSize(1));
 }
 
 }  // namespace