diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2019-01-23 09:21:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-23 09:21:35 -0500 |
commit | 2919256b27889639ce4daa74a9f1e75bf1f25111 (patch) | |
tree | 601a4d43fa830948d234de0567ddcb8b48825fa1 | |
parent | 9118267dfbd79c9c76232606ead02097c7df3ccb (diff) | |
parent | 9d16c63644d88380aaee1791b5141579ea50c826 (diff) | |
download | sdl_core-2919256b27889639ce4daa74a9f1e75bf1f25111.tar.gz |
Merge branch 'feature/cloud_app_transport' into feature/cloud_app_connection_status_disconnect
11 files changed, 12 insertions, 19 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index d86e95488e..475dff895b 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -845,8 +845,7 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() { } // If the device was disconnected, this will reinitialize the device - connection_handler().AddCloudAppDevice( - *enabled_it, endpoint, cloud_transport_type); + connection_handler().AddCloudAppDevice(endpoint, cloud_transport_type); } pending_device_map_lock_ptr_->Release(); @@ -965,7 +964,7 @@ void ApplicationManagerImpl::CreatePendingApplication( mobile_apis::HybridAppPreference::eType>:: StringToEnum(hybrid_app_preference_str, &hybrid_app_preference_enum); - if (!convert_result) { + if (!hybrid_app_preference_str.empty() && !convert_result) { LOG4CXX_ERROR( logger_, "Could not convert string to enum: " << hybrid_app_preference_str); diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h index e9e7ba47a3..96cb9f600d 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h @@ -130,8 +130,7 @@ class ConnectionHandlerImpl void ConnectToAllDevices() OVERRIDE; - void AddCloudAppDevice(const std::string& policy_app_id, - const std::string& endpoint, + void AddCloudAppDevice(const std::string& endpoint, const std::string& cloud_transport_type) OVERRIDE; void RemoveCloudAppDevice(const DeviceHandle device_id) OVERRIDE; diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index 41d6e1dd54..b58700834f 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -1327,9 +1327,7 @@ void ConnectionHandlerImpl::ConnectToAllDevices() { } void ConnectionHandlerImpl::AddCloudAppDevice( - const std::string& policy_app_id, - const std::string& endpoint, - const std::string& cloud_transport_type) { + const std::string& endpoint, const std::string& cloud_transport_type) { transport_manager_.AddCloudDevice(endpoint, cloud_transport_type); } diff --git a/src/components/include/connection_handler/connection_handler.h b/src/components/include/connection_handler/connection_handler.h index a4058c7078..e409460a96 100644 --- a/src/components/include/connection_handler/connection_handler.h +++ b/src/components/include/connection_handler/connection_handler.h @@ -103,8 +103,7 @@ class ConnectionHandler { virtual void ConnectToAllDevices() = 0; - virtual void AddCloudAppDevice(const std::string& policy_app_id, - const std::string& endpoint, + virtual void AddCloudAppDevice(const std::string& endpoint, const std::string& cloud_transport_type) = 0; virtual void RemoveCloudAppDevice(const DeviceHandle device_id) = 0; diff --git a/src/components/include/test/connection_handler/mock_connection_handler.h b/src/components/include/test/connection_handler/mock_connection_handler.h index 219ee7b561..5aed5da58c 100644 --- a/src/components/include/test/connection_handler/mock_connection_handler.h +++ b/src/components/include/test/connection_handler/mock_connection_handler.h @@ -66,9 +66,8 @@ class MockConnectionHandler : public connection_handler::ConnectionHandler { MOCK_CONST_METHOD2(RunAppOnDevice, void(const std::string&, const std::string&)); MOCK_METHOD0(ConnectToAllDevices, void()); - MOCK_METHOD3(AddCloudAppDevice, - void(const std::string& policy_app_id, - const std::string& endpoint, + MOCK_METHOD2(AddCloudAppDevice, + void(const std::string& endpoint, const std::string& cloud_transport_type)); MOCK_METHOD1(RemoveCloudAppDevice, void(const DeviceHandle device_id)); MOCK_METHOD1(CloseRevokedConnection, void(uint32_t connection_key)); diff --git a/src/components/policy/policy_external/src/policy_table/types.cc b/src/components/policy/policy_external/src/policy_table/types.cc index 977448dacd..0fe54a683d 100644 --- a/src/components/policy/policy_external/src/policy_table/types.cc +++ b/src/components/policy/policy_external/src/policy_table/types.cc @@ -242,7 +242,7 @@ ApplicationParams::ApplicationParams(const Json::Value* value__) , memory_kb(impl::ValueMember(value__, "memory_kb"), 0) , heart_beat_timeout_ms(impl::ValueMember(value__, "heart_beat_timeout_ms")) , moduleType(impl::ValueMember(value__, "moduleType")) - , certificate(impl::ValueMember(value__, "certificate"), "not_specified") + , certificate(impl::ValueMember(value__, "certificate")) , hybrid_app_preference(impl::ValueMember(value__, "hybrid_app_preference")) , endpoint(impl::ValueMember(value__, "endpoint")) , enabled(impl::ValueMember(value__, "enabled")) diff --git a/src/components/policy/policy_regular/include/policy/policy_table/types.h b/src/components/policy/policy_regular/include/policy/policy_table/types.h index 58f07492c4..18f909bb99 100644 --- a/src/components/policy/policy_regular/include/policy/policy_table/types.h +++ b/src/components/policy/policy_regular/include/policy/policy_table/types.h @@ -142,7 +142,7 @@ struct ApplicationParams : PolicyBase { Optional<RequestSubTypes> RequestSubType; Optional<Integer<uint16_t, 0, 65225> > memory_kb; Optional<Integer<uint32_t, 0, UINT_MAX> > heart_beat_timeout_ms; - Optional<String<0, 255> > certificate; + Optional<String<0, 65535> > certificate; mutable Optional<ModuleTypes> moduleType; // Cloud application params Optional<Enum<HybridAppPreference> > hybrid_app_preference; diff --git a/src/components/policy/policy_regular/src/policy_table/types.cc b/src/components/policy/policy_regular/src/policy_table/types.cc index 88564df050..5faf96a232 100644 --- a/src/components/policy/policy_regular/src/policy_table/types.cc +++ b/src/components/policy/policy_regular/src/policy_table/types.cc @@ -167,7 +167,7 @@ ApplicationParams::ApplicationParams(const Json::Value* value__) , RequestSubType(impl::ValueMember(value__, "RequestSubType")) , memory_kb(impl::ValueMember(value__, "memory_kb"), 0) , heart_beat_timeout_ms(impl::ValueMember(value__, "heart_beat_timeout_ms")) - , certificate(impl::ValueMember(value__, "certificate"), "not_specified") + , certificate(impl::ValueMember(value__, "certificate")) , moduleType(impl::ValueMember(value__, "moduleType")) , hybrid_app_preference(impl::ValueMember(value__, "hybrid_app_preference")) , endpoint(impl::ValueMember(value__, "endpoint")) diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h index 6c8bb359af..960ca10e21 100644 --- a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h +++ b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h @@ -206,6 +206,7 @@ String<minlen, maxlen>::String(const Json::Value* value, if (!is_initialized()) { value_state_ = kValid; } else if (is_valid()) { + value_ = value->asString(); value_state_ = length_range_.Includes(value_.length()) ? kValid : kInvalid; } } diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h index f64009317f..1de5eac702 100644 --- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h @@ -44,7 +44,7 @@ using namespace ::transport_manager::transport_adapter; class MockTransportAdapterController : public TransportAdapterController { public: - MOCK_METHOD1(AddDevice, DeviceSptr(std::string device)); + MOCK_METHOD1(AddDevice, DeviceSptr(DeviceSptr device)); MOCK_METHOD1(SearchDeviceDone, void(DeviceVector device)); MOCK_METHOD1(ApplicationListUpdated, ApplicationListUpdated(const DeviceUID& device_handle)); diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc index 72cf0ba76e..dafabf4504 100644 --- a/src/components/transport_manager/test/transport_adapter_test.cc +++ b/src/components/transport_manager/test/transport_adapter_test.cc @@ -504,7 +504,6 @@ TEST_F(TransportAdapterTest, DisconnectDevice_DeviceAddedConnectionCreated) { .WillOnce(Return(TransportAdapter::OK)); EXPECT_CALL(transport_adapter, FindDevice(uniq_id)) .WillRepeatedly(Return(mockdev)); - // EXPECT_CALL(transport_adapter, ConnectionStatusUpdated(_, _)); TransportAdapter::Error res = transport_adapter.ConnectDevice(uniq_id); EXPECT_EQ(TransportAdapter::OK, res); EXPECT_EQ(ConnectionStatus::CONNECTED, mockdev->connection_status()); @@ -515,7 +514,6 @@ TEST_F(TransportAdapterTest, DisconnectDevice_DeviceAddedConnectionCreated) { EXPECT_CALL(*mock_connection, Disconnect()) .WillOnce(Return(TransportAdapter::OK)); - // EXPECT_CALL(transport_adapter, ConnectionStatusUpdated(_, _)); TransportAdapter::Error new_res = transport_adapter.DisconnectDevice(uniq_id); EXPECT_EQ(TransportAdapter::OK, new_res); EXPECT_EQ(ConnectionStatus::CLOSING, mockdev->connection_status()); |