From 9a04ab51aa9ea24134174b664cacd2488405d431 Mon Sep 17 00:00:00 2001 From: Shobhit Adlakha Date: Tue, 30 Apr 2019 09:45:58 -0400 Subject: Added macro to application manager and unit tests --- .../src/commands/hmi/on_exit_application_notification.cc | 3 +++ .../application_manager/src/application_manager_impl.cc | 14 ++++++++++++++ .../test/application_manager_impl_test.cc | 8 ++++++-- .../transport_manager/test/transport_adapter_test.cc | 2 ++ .../transport_manager/test/transport_manager_impl_test.cc | 4 ++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc index b6d44a4511..6658f41005 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc @@ -106,10 +106,13 @@ void OnExitApplicationNotification::Run() { application_manager_.UnregisterApplication(app_id, Result::SUCCESS); return; } +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) case Common_ApplicationExitReason::CLOSE_CLOUD_CONNECTION: { application_manager_.DisconnectCloudApp(app_impl); break; } +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT + default: { LOG4CXX_WARN(logger_, "Unhandled reason"); return; diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index b0a0514e77..a071edbbfc 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -892,6 +892,10 @@ void ApplicationManagerImpl::SetIconFileFromSystemRequest( } void ApplicationManagerImpl::DisconnectCloudApp(ApplicationSharedPtr app) { +#if !defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) + LOG4CXX_TRACE(logger_, "Cloud app support is disabled. Exiting function"); + return; +#else std::string endpoint; std::string certificate; std::string auth_token; @@ -929,9 +933,14 @@ void ApplicationManagerImpl::DisconnectCloudApp(ApplicationSharedPtr app) { // Create device in pending state LOG4CXX_DEBUG(logger_, "Re-adding the cloud app device"); connection_handler().AddCloudAppDevice(policy_app_id, properties); +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT } void ApplicationManagerImpl::RefreshCloudAppInformation() { +#if !defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) + LOG4CXX_TRACE(logger_, "Cloud app support is disabled. Exiting function"); + return; +#else LOG4CXX_AUTO_TRACE(logger_); if (is_stopping()) { return; @@ -1082,6 +1091,7 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() { LOG4CXX_DEBUG(logger_, "Removed " << removed_app_count << " disabled apps"); SendUpdateAppList(); } +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT } void ApplicationManagerImpl::CreatePendingApplication( @@ -1216,6 +1226,9 @@ void ApplicationManagerImpl::OnConnectionStatusUpdated() { hmi_apis::Common_CloudConnectionStatus::eType ApplicationManagerImpl::GetCloudAppConnectionStatus( ApplicationConstSharedPtr app) const { +#if !defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) + return hmi_apis::Common_CloudConnectionStatus::INVALID_ENUM; +#else transport_manager::ConnectionStatus status = connection_handler().GetConnectionStatus(app->device()); switch (status) { @@ -1229,6 +1242,7 @@ ApplicationManagerImpl::GetCloudAppConnectionStatus( default: return hmi_apis::Common_CloudConnectionStatus::INVALID_ENUM; } +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT } uint32_t ApplicationManagerImpl::GetNextMobileCorrelationID() { diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc index e4951880de..83e7717b7c 100644 --- a/src/components/application_manager/test/application_manager_impl_test.cc +++ b/src/components/application_manager/test/application_manager_impl_test.cc @@ -103,6 +103,7 @@ const std::string kAppId = "someID"; const uint32_t kConnectionKey = 1232u; const std::string kAppName = "appName"; +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) // Cloud application params const std::string kEndpoint = "endpoint"; const std::string kEndpoint2 = "https://fakesdlcloudapptesting.com:8080"; @@ -113,6 +114,7 @@ const mobile_api::HybridAppPreference::eType kHybridAppPreference = mobile_api::HybridAppPreference::CLOUD; const std::string kHybridAppPreferenceStr = "CLOUD"; const bool kEnabled = true; +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT } // namespace class ApplicationManagerImplTest : public ::testing::Test { @@ -224,8 +226,9 @@ class ApplicationManagerImplTest : public ::testing::Test { connection_handler::DeviceHandle secondary_device_handle, std::string secondary_transport_device_string); +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) void AddCloudAppToPendingDeviceMap(); - +#endif uint32_t app_id_; NiceMock mock_policy_settings_; std::shared_ptr > mock_storage_; @@ -1447,6 +1450,7 @@ TEST_F(ApplicationManagerImplTest, EXPECT_TRUE(file_system::RemoveDirectory(kDirectoryName, true)); } +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) void ApplicationManagerImplTest::AddCloudAppToPendingDeviceMap() { app_manager_impl_->SetMockPolicyHandler(mock_policy_handler_); std::vector enabled_apps{"1234"}; @@ -1659,7 +1663,7 @@ TEST_F(ApplicationManagerImplTest, app_manager_impl_->RegisterApplication(request_for_registration_ptr); EXPECT_EQ(0, application.use_count()); } - +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT } // namespace application_manager_test } // namespace components } // namespace test diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc index 5abfa4dfdd..1c707678a0 100644 --- a/src/components/transport_manager/test/transport_adapter_test.cc +++ b/src/components/transport_manager/test/transport_adapter_test.cc @@ -478,6 +478,7 @@ TEST_F(TransportAdapterTest, Disconnect_ConnectDoneSuccess) { EXPECT_CALL(*serverMock, Terminate()); } +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) TEST_F(TransportAdapterTest, FindPending) { MockServerConnectionFactory* serverMock = new MockServerConnectionFactory(); MockTransportAdapterImpl transport_adapter( @@ -608,6 +609,7 @@ TEST_F(TransportAdapterTest, EXPECT_CALL(*serverMock, Terminate()); } +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT TEST_F(TransportAdapterTest, DisconnectDevice_DeviceAddedConnectionCreated) { MockServerConnectionFactory* serverMock = new MockServerConnectionFactory(); 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 dbf0899a1b..c7d7024658 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -190,6 +190,7 @@ class TransportManagerImplTest : public ::testing::Test { tm_.TestHandle(test_event); } +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) void HandlePending() { TransportAdapterEvent test_event(EventTypeEnum::ON_CONNECT_PENDING, mock_adapter_, @@ -207,6 +208,7 @@ class TransportManagerImplTest : public ::testing::Test { tm_.TestHandle(test_event); } +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT void HandleConnectionFailed() { TransportAdapterEvent test_event(EventTypeEnum::ON_CONNECT_FAIL, @@ -423,6 +425,7 @@ TEST_F(TransportManagerImplTest, DisconnectDevice_DeviceNotConnected) { EXPECT_EQ(E_INVALID_HANDLE, tm_.DisconnectDevice(device_handle_)); } +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) TEST_F(TransportManagerImplTest, Pending) { // Calling HandlePending twice verifies the connection_id stays the same if // the connection exists. @@ -448,6 +451,7 @@ TEST_F(TransportManagerImplTest, Pending) { tm_.TestHandle(test_event); } +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT TEST_F(TransportManagerImplTest, Disconnect) { // Arrange -- cgit v1.2.1