Bug#33986295 Fix the deprecation warnings on Windows for router

This patch replaces occurences of deprecated INSTANTIATE_TEST_CASE_P
in the Router tests with INSTANTIATE_TEST_SUITE_P

Change-Id: Iadbc98fec0c20414101576b362354e55970d087d

Author: Andrzej Religa

router/tests/component/CMakeLists.txt

@@ -30,12 +30,6 @@ MYSQL_ADD_EXECUTABLE(master_key_test_writer
   SKIP_INSTALL
   )
 
-#TODO(Bug#33986295): fix the deprecation for router tests
-IF(MSVC)
-  STRING_APPEND(CMAKE_C_FLAGS " /wd4996")
-  STRING_APPEND(CMAKE_CXX_FLAGS " /wd4996")
-ENDIF()
-
 ADD_DEFINITIONS(-DSSL_TEST_DATA_DIR="${CMAKE_SOURCE_DIR}/mysql-test/std_data/")
 ADD_DEFINITIONS(-DCMAKE_SOURCE_DIR="${CMAKE_SOURCE_DIR}")
 FOREACH(test_file

router/tests/component/test_mock_server.cc

@@ -230,9 +230,9 @@ const MockServerCLITestParam mock_server_cli_test_param[] = {
      }},
 };
 
-INSTANTIATE_TEST_CASE_P(Spec, MockServerCLITest,
-                        ::testing::ValuesIn(mock_server_cli_test_param),
-                        [](const auto &info) { return info.param.test_name; });
+INSTANTIATE_TEST_SUITE_P(Spec, MockServerCLITest,
+                         ::testing::ValuesIn(mock_server_cli_test_param),
+                         [](const auto &info) { return info.param.test_name; });
 
 class MockServerCLITestBase : public RouterComponentTest {};
 
@@ -563,9 +563,9 @@ const MockServerConnectOkTestParam mock_server_connect_ok_test_param[] = {
      }},
 };
 
-INSTANTIATE_TEST_CASE_P(Spec, MockServerConnectOkTest,
-                        ::testing::ValuesIn(mock_server_connect_ok_test_param),
-                        [](const auto &info) { return info.param.test_name; });
+INSTANTIATE_TEST_SUITE_P(Spec, MockServerConnectOkTest,
+                         ::testing::ValuesIn(mock_server_connect_ok_test_param),
+                         [](const auto &info) { return info.param.test_name; });
 
 // custom connect tests
 
@@ -1058,9 +1058,9 @@ const MockServerConnectTestParam mock_server_connect_test_param[] = {
      }},
 };
 
-INSTANTIATE_TEST_CASE_P(Spec, MockServerConnectTest,
-                        ::testing::ValuesIn(mock_server_connect_test_param),
-                        [](const auto &info) { return info.param.test_name; });
+INSTANTIATE_TEST_SUITE_P(Spec, MockServerConnectTest,
+                         ::testing::ValuesIn(mock_server_connect_test_param),
+                         [](const auto &info) { return info.param.test_name; });
 
 int main(int argc, char *argv[]) {
   net::impl::socket::init();

router/tests/component/test_sd_notify.cc

@@ -570,7 +570,7 @@ TEST_P(NotifyTestInvalidSocketNameTest, NotifyTestInvalidSocketName) {
                         2s));
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     NotifyTestInvalidSocketName, NotifyTestInvalidSocketNameTest,
     ::testing::Values(
         "CON", "PRN",
@@ -936,7 +936,7 @@ TEST_P(NotifyBootstrapNotAffectedTest, NotifyBootstrapNotAffected) {
             stdx::make_unexpected(make_error_code(std::errc::timed_out)));
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     NotifyBootstrapNotAffected, NotifyBootstrapNotAffectedTest,
     ::testing::Values("READY=1",
                       "STOPPING=1\nSTATUS=Router shutdown in progress\n"));