Merge pull request #236 in NAR/sdl-core from fix/build_errors_in_tests to feature/Ford-WiFi

* commit 'd529b059e47f170c77137ac1edf10c0696a7bb6b':
  fallout from other changes in the Ford-WiFi branch
  revert device_type hacks
  revert device_type hacks
  UT: support newly added Application::deferred_resumption_hmi_level()
  UT: support newly added ApplicationManager::CheckResumptionRequiredTransportAvailable()
  UT: update test cases to support new protocol frames
  UT: fix CheckStringContainer() test case
  UT: fix test case TcpClientListenerTest IsInitialised
  UT: support newly added TransportAdapter::GetDeviceType()
  UT: support newly added transport_manager_tcp_adapter_network_interface() method
  Remove invalid test cases
  Add/fix mock methods for testing
  Update test code to add new arg in Connection::AddNewSession() and AddNewService()
  Update test code related to SessionContext struct
  Update test codes related to SendEndService()
  Update DeviceInfo struct in test codes
  Add mock methods for testing

1 files changed, 1 insertions, 22 deletions

diff --git a/src/components/config_profile/test/profile_test.cc b/src/components/config_profile/test/profile_test.cc
index f1527c996b..64bafdd6bf 100644
--- a/src/components/config_profile/test/profile_test.cc
+++ b/src/components/config_profile/test/profile_test.cc
@@ -690,7 +690,7 @@ TEST_F(ProfileTest, CheckStringContainer) {
   std::vector<std::string>::iterator element_mode = diagmodes_list.begin();
   element_mode++;
   element_mode++;
-  diag_mode = std::find(diagmodes_list.begin(), diagmodes_list.end(), " 0x03");
+  diag_mode = std::find(diagmodes_list.begin(), diagmodes_list.end(), "0x03");
   EXPECT_EQ(diag_mode, element_mode);
 }
 
@@ -748,27 +748,6 @@ TEST_F(ProfileTest, CheckIntContainerInSecurityData) {
 }
 #endif
 
-TEST_F(ProfileTest, CheckEmptyValue) {
-  // Set new config file
-  profile_.set_config_file_name("smartDeviceLink_test.ini");
-  EXPECT_EQ("smartDeviceLink_test.ini", profile_.config_file_name());
-
-  bool isread = false;
-  std::string output;
-
-  // specify a key with empty value
-  bool ret = profile_.ReadValue(&output, "MAIN", "AppConfigFolder");
-  EXPECT_FALSE(ret);
-
-  std::string output2 = "abc";
-  ret = profile_.ReadValueEmpty(&output2, "MAIN", "AppConfigFolder");
-  EXPECT_TRUE(ret);
-  EXPECT_EQ(output2, "");
-
-  ret = profile_.ReadValueEmpty(&output2, "MAIN", "DoesNotExistKey");
-  EXPECT_FALSE(ret);
-}
-
 }  // namespace profile_test
 }  // namespace components
 }  // namespace test