Merge pull request #290 in NAR/sdl-core from bugfix/handle_review to feature/Ford-WiFi

* commit '9d4d335347fe5ccf69c99e21d2e12e9a2bcd0fd7':
  address review comments from OSS maintainer

5 files changed, 45 insertions, 45 deletions

diff --git a/src/components/transport_manager/src/tcp/tcp_client_listener.cc b/src/components/transport_manager/src/tcp/tcp_client_listener.cc
index 8b1d587ad7..45c344ab2a 100644
--- a/src/components/transport_manager/src/tcp/tcp_client_listener.cc
+++ b/src/components/transport_manager/src/tcp/tcp_client_listener.cc
@@ -477,10 +477,10 @@ void TcpClientListener::OnIPAddressUpdated(const std::string ipv4_addr,
     oss << port_;
 
     TransportConfig config;
-    config.insert(std::make_pair(std::string("enabled"), enabled));
+    config.insert(std::make_pair(std::string(TC_ENABLED), enabled));
     config.insert(
-        std::make_pair(std::string("tcp_ip_address"), current_ip_address_));
-    config.insert(std::make_pair(std::string("tcp_port"), oss.str()));
+        std::make_pair(std::string(TC_TCP_IP_ADDRESS), current_ip_address_));
+    config.insert(std::make_pair(std::string(TC_TCP_PORT), oss.str()));
 
     controller_->TransportConfigUpdated(config);
   }
diff --git a/src/components/transport_manager/test/tcp_client_listener_test.cc b/src/components/transport_manager/test/tcp_client_listener_test.cc
index 830aae9868..20731775da 100644
--- a/src/components/transport_manager/test/tcp_client_listener_test.cc
+++ b/src/components/transport_manager/test/tcp_client_listener_test.cc
@@ -351,10 +351,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_ValidIPv4Address) {
   const std::string test_port(buf);
 
   TransportConfig expected_config;
-  expected_config.insert(std::make_pair(std::string("enabled"), "true"));
+  expected_config.insert(std::make_pair(std::string(TC_ENABLED), "true"));
   expected_config.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr));
-  expected_config.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr));
+  expected_config.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_, TransportConfigUpdated(expected_config))
       .Times(1);
@@ -388,10 +388,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_changed) {
   const std::string test_port(buf);
 
   TransportConfig expected_config_1;
-  expected_config_1.insert(std::make_pair(std::string("enabled"), "true"));
+  expected_config_1.insert(std::make_pair(std::string(TC_ENABLED), "true"));
   expected_config_1.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_1));
-  expected_config_1.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_1));
+  expected_config_1.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_,
               TransportConfigUpdated(expected_config_1)).Times(1);
@@ -400,10 +400,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_changed) {
 
   const std::string test_ipv4_addr_2 = "172.16.2.3";
   TransportConfig expected_config_2;
-  expected_config_2.insert(std::make_pair(std::string("enabled"), "true"));
+  expected_config_2.insert(std::make_pair(std::string(TC_ENABLED), "true"));
   expected_config_2.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_2));
-  expected_config_2.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_2));
+  expected_config_2.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_,
               TransportConfigUpdated(expected_config_2)).Times(1);
@@ -435,10 +435,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_same) {
   const std::string test_port(buf);
 
   TransportConfig expected_config_1;
-  expected_config_1.insert(std::make_pair(std::string("enabled"), "true"));
+  expected_config_1.insert(std::make_pair(std::string(TC_ENABLED), "true"));
   expected_config_1.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_1));
-  expected_config_1.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_1));
+  expected_config_1.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_,
               TransportConfigUpdated(expected_config_1)).Times(1);
@@ -447,10 +447,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_same) {
 
   const std::string test_ipv4_addr_2 = "192.168.1.1";  // same as before
   TransportConfig expected_config_2;
-  expected_config_2.insert(std::make_pair(std::string("enabled"), "true"));
+  expected_config_2.insert(std::make_pair(std::string(TC_ENABLED), "true"));
   expected_config_2.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_2));
-  expected_config_2.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_2));
+  expected_config_2.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   // client listener should not generate TransportConfigUpdated event
   EXPECT_CALL(adapter_controller_mock_, TransportConfigUpdated(_)).Times(0);
@@ -482,10 +482,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_disabled) {
   const std::string test_port(buf);
 
   TransportConfig expected_config_1;
-  expected_config_1.insert(std::make_pair(std::string("enabled"), "true"));
+  expected_config_1.insert(std::make_pair(std::string(TC_ENABLED), "true"));
   expected_config_1.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_1));
-  expected_config_1.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_1));
+  expected_config_1.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_,
               TransportConfigUpdated(expected_config_1)).Times(1);
@@ -494,10 +494,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_disabled) {
 
   const std::string test_ipv4_addr_2 = "";
   TransportConfig expected_config_2;
-  expected_config_2.insert(std::make_pair(std::string("enabled"), "false"));
+  expected_config_2.insert(std::make_pair(std::string(TC_ENABLED), "false"));
   expected_config_2.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_2));
-  expected_config_2.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_2));
+  expected_config_2.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_,
               TransportConfigUpdated(expected_config_2)).Times(1);
@@ -529,10 +529,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_reenabled) {
   const std::string test_port(buf);
 
   TransportConfig expected_config_1;
-  expected_config_1.insert(std::make_pair(std::string("enabled"), "true"));
+  expected_config_1.insert(std::make_pair(std::string(TC_ENABLED), "true"));
   expected_config_1.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_1));
-  expected_config_1.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_1));
+  expected_config_1.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_,
               TransportConfigUpdated(expected_config_1)).Times(1);
@@ -541,10 +541,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_reenabled) {
 
   const std::string test_ipv4_addr_2 = "";
   TransportConfig expected_config_2;
-  expected_config_2.insert(std::make_pair(std::string("enabled"), "false"));
+  expected_config_2.insert(std::make_pair(std::string(TC_ENABLED), "false"));
   expected_config_2.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_2));
-  expected_config_2.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_2));
+  expected_config_2.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_,
               TransportConfigUpdated(expected_config_2)).Times(1);
@@ -553,10 +553,10 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_reenabled) {
 
   const std::string test_ipv4_addr_3 = "192.168.1.1";
   TransportConfig expected_config_3;
-  expected_config_3.insert(std::make_pair(std::string("enabled"), "true"));
+  expected_config_3.insert(std::make_pair(std::string(TC_ENABLED), "true"));
   expected_config_3.insert(
-      std::make_pair(std::string("tcp_ip_address"), test_ipv4_addr_3));
-  expected_config_3.insert(std::make_pair(std::string("tcp_port"), test_port));
+      std::make_pair(std::string(TC_TCP_IP_ADDRESS), test_ipv4_addr_3));
+  expected_config_3.insert(std::make_pair(std::string(TC_TCP_PORT), test_port));
 
   EXPECT_CALL(adapter_controller_mock_,
               TransportConfigUpdated(expected_config_3)).Times(1);
diff --git a/src/components/transport_manager/test/tcp_transport_adapter_test.cc b/src/components/transport_manager/test/tcp_transport_adapter_test.cc
index d6abf5e813..9f6b67fd84 100644
--- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc
+++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc
@@ -355,9 +355,9 @@ TEST_F(TcpAdapterTest, NotifyTransportConfigUpdated) {
   transport_adapter.AddListener(&mock_adapter_listener);
 
   TransportConfig config;
-  config["enabled"] = std::string("enabled");
-  config["tcp_ip_address"] = std::string("192.168.1.1");
-  config["tcp_port"] = std::string("12345");
+  config[TC_ENABLED] = std::string("true");
+  config[TC_TCP_IP_ADDRESS] = std::string("192.168.1.1");
+  config[TC_TCP_PORT] = std::string("12345");
 
   EXPECT_CALL(mock_adapter_listener, OnTransportConfigUpdated(_)).Times(1);
 
@@ -369,9 +369,9 @@ TEST_F(TcpAdapterTest, GetTransportConfiguration) {
       port, last_state_, transport_manager_settings);
 
   TransportConfig config;
-  config["enabled"] = std::string("enabled");
-  config["tcp_ip_address"] = std::string("192.168.1.1");
-  config["tcp_port"] = std::string("12345");
+  config[TC_ENABLED] = std::string("true");
+  config[TC_TCP_IP_ADDRESS] = std::string("192.168.1.1");
+  config[TC_TCP_PORT] = std::string("12345");
 
   transport_adapter.TransportConfigUpdated(config);
 
diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc
index ab2683193c..06ee8e3572 100644
--- a/src/components/transport_manager/test/transport_adapter_test.cc
+++ b/src/components/transport_manager/test/transport_adapter_test.cc
@@ -819,9 +819,9 @@ TEST_F(TransportAdapterTest, TransportConfigUpdated) {
   transport_adapter.AddListener(&mock_listener);
 
   TransportConfig config;
-  config["enabled"] = std::string("enabled");
-  config["tcp_ip_address"] = std::string("192.168.1.1");
-  config["tcp_port"] = std::string("12345");
+  config[TC_ENABLED] = std::string("true");
+  config[TC_TCP_IP_ADDRESS] = std::string("192.168.1.1");
+  config[TC_TCP_PORT] = std::string("12345");
 
   EXPECT_CALL(mock_listener, OnTransportConfigUpdated(_));
   transport_adapter.TransportConfigUpdated(config);
diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc
index b2643f2938..35b15e3a35 100644
--- a/src/components/transport_manager/test/transport_manager_impl_test.cc
+++ b/src/components/transport_manager/test/transport_manager_impl_test.cc
@@ -1332,9 +1332,9 @@ TEST_F(TransportManagerImplTest, OnTransportConfigUpdated) {
                                    error_);
 
   transport_adapter::TransportConfig config;
-  config["enabled"] = std::string("enabled");
-  config["tcp_ip_address"] = std::string("192.168.1.1");
-  config["tcp_port"] = std::string("12345");
+  config[TC_ENABLED] = std::string("true");
+  config[TC_TCP_IP_ADDRESS] = std::string("192.168.1.1");
+  config[TC_TCP_PORT] = std::string("12345");
 
   EXPECT_CALL(*mock_adapter_, GetTransportConfiguration())
       .WillOnce(Return(config));