Merge pull request #2328 from ZhdanovP/fix/remove_commented_code

Remove commented code

5 files changed, 35 insertions, 51 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc
index 7052830d49..8e95f43752 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc
@@ -139,48 +139,48 @@ TEST_F(DialNumberRequestTest, Run_SUCCESS) {
 }
 
 TEST_F(DialNumberRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
-  //  MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
-  //  (*command_msg)[am::strings::params][am::strings::connection_key] =
-  //      kConnectionKey;
+ MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
+ (*command_msg)[am::strings::params][am::strings::connection_key] =
+     kConnectionKey;
 
-  //  DialNumberRequestPtr
-  //  command(CreateCommand<DialNumberRequest>(command_msg));
+ DialNumberRequestPtr
+ command(CreateCommand<DialNumberRequest>(command_msg));
 
-  //  MockAppPtr app(CreateMockApp());
-  //  EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
+ MockAppPtr app(CreateMockApp());
+ EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
 
-  //  Event event(hmi_apis::FunctionID::INVALID_ENUM);
-  //  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
+ Event event(hmi_apis::FunctionID::INVALID_ENUM);
+ EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
 
-  //  command->on_event(event);
+  command->on_event(event);
 }
 
 TEST_F(DialNumberRequestTest, OnEvent_SUCCESS) {
-  //  MessageSharedPtr event_msg(CreateMessage(smart_objects::SmartType_Map));
-  //  (*event_msg)[am::strings::params][am::hmi_response::code] =
-  //      mobile_apis::Result::SUCCESS;
-  //  (*event_msg)[am::strings::params][am::strings::info] = "test_info";
-
-  //  Event event(hmi_apis::FunctionID::BasicCommunication_DialNumber);
-  //  event.set_smart_object(*event_msg);
-
-  //  MockAppPtr app(CreateMockApp());
-  //  EXPECT_CALL(app_mngr_, application(kConnectionKey))
-  //      .WillRepeatedly(Return(app));
-  //  ON_CALL(app_mngr_,
-  //  GetRPCService()).WillByDefault(ReturnRef(mock_rpc_service_));
-  //  EXPECT_CALL(
-  //      mock_rpc_service_,
-  //      ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS),
-  //      _));
-
-  //  MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
-  //  (*command_msg)[am::strings::params][am::strings::connection_key] =
-  //      kConnectionKey;
-
-  //  DialNumberRequestPtr
-  //  command(CreateCommand<DialNumberRequest>(command_msg));
-  //  command->on_event(event);
+   MessageSharedPtr event_msg(CreateMessage(smart_objects::SmartType_Map));
+   (*event_msg)[am::strings::params][am::hmi_response::code] =
+       mobile_apis::Result::SUCCESS;
+   (*event_msg)[am::strings::params][am::strings::info] = "test_info";
+
+   Event event(hmi_apis::FunctionID::BasicCommunication_DialNumber);
+   event.set_smart_object(*event_msg);
+
+   MockAppPtr app(CreateMockApp());
+   EXPECT_CALL(app_mngr_, application(kConnectionKey))
+       .WillRepeatedly(Return(app));
+   ON_CALL(app_mngr_,
+   GetRPCService()).WillByDefault(ReturnRef(mock_rpc_service_));
+   EXPECT_CALL(
+       mock_rpc_service_,
+       ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS),
+       _));
+
+   MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
+   (*command_msg)[am::strings::params][am::strings::connection_key] =
+       kConnectionKey;
+
+   DialNumberRequestPtr
+   command(CreateCommand<DialNumberRequest>(command_msg));
+   command->on_event(event);
 }
 
 }  // namespace dial_number_request
diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt
index 2a6c973bdc..02cf58485a 100755
--- a/src/components/application_manager/test/CMakeLists.txt
+++ b/src/components/application_manager/test/CMakeLists.txt
@@ -135,7 +135,6 @@ set(CMAKE_EXE_LINKER_FLAGS
 )
 create_test("application_manager_test" "${testSources}" "${LIBRARIES}")
 create_test("application_manager_mock_hmi_test" "${testSourcesMockHmi}" "${LIBRARIES}")
-#add_dependencies("application_manager_test" libbson)
 
 create_test("help_prompt_manager_test" "${testSourcesHelpPromptManager}" "${LIBRARIES}")
 
diff --git a/src/components/application_manager/test/commands/CMakeLists.txt b/src/components/application_manager/test/commands/CMakeLists.txt
index ab412c7e4e..165b5fc0fb 100644
--- a/src/components/application_manager/test/commands/CMakeLists.txt
+++ b/src/components/application_manager/test/commands/CMakeLists.txt
@@ -36,9 +36,6 @@ include_directories(
   ${COMPONENTS_DIR}/application_manager/include/application_manager/
   ${COMPONENTS_DIR}/application_manager/include/application_manager/commands/
 )
-#${COMPONENTS_DIR}/application_manager/test/include/
-#${COMPONENTS_DIR}/application_manager/test/include/application_manager/
-#${COMPONENTS_DIR}/application_manager/src/commands/
 
 set(COMMANDS_TEST_DIR ${AM_TEST_DIR}/commands)
 
@@ -51,8 +48,6 @@ file(GLOB SOURCES
   ${COMPONENTS_DIR}/application_manager/test/commands/command_response_impl_test.cc
 )
 
-#${COMPONENTS_DIR}/application_manager/src/smart_object_keys.cc
-#${COMPONENTS_DIR}/application_manager/src/message.cc
 set(LIBRARIES
   gmock
   Utils
@@ -66,9 +61,3 @@ set(LIBRARIES
 )
 
 create_test("commands_test" "${SOURCES}" "${LIBRARIES}")
-#${COMMANDS_TEST_DIR}/hmi/*
-#${COMMANDS_TEST_DIR}/hmi/hmi_notifications/*
-#${COMMANDS_TEST_DIR}/mobile/*
-#ApplicationManager
-#AMHMICommandsLibrary
-#AMMobileCommandsLibrary
diff --git a/src/components/application_manager/test/include/application_manager/mock_command_factory.h b/src/components/application_manager/test/include/application_manager/mock_command_factory.h
index e4bdc3abe1..c49b5e7ce2 100644
--- a/src/components/application_manager/test/include/application_manager/mock_command_factory.h
+++ b/src/components/application_manager/test/include/application_manager/mock_command_factory.h
@@ -52,9 +52,6 @@ class MockCommandFactory : public application_manager::CommandFactory {
       IsAbleToProcess,
       bool(const int32_t,
            const application_manager::commands::Command::CommandSource));
-
-  //               const commands::MessageSharedPtr& message,
-  //                   application_manager::commands::Command::CommandSource));
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/protocol_handler/CMakeLists.txt b/src/components/protocol_handler/CMakeLists.txt
index d57211040a..ff8678b826 100644
--- a/src/components/protocol_handler/CMakeLists.txt
+++ b/src/components/protocol_handler/CMakeLists.txt
@@ -65,7 +65,6 @@ endforeach()
 
 
 add_library(ProtocolHandler ${SOURCES})
-#add_dependencies(ProtocolHandler libbson)
 target_link_libraries(ProtocolHandler ${LIBRARIES})
 
 if(BUILD_TESTS)