summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Lohvinenko (GitHub) <OLohvinenko@luxoft.com>2018-05-16 15:03:28 +0300
committerIra Lytvynenko (GitHub) <ILytvynenko@luxoft.com>2018-06-27 18:20:28 +0300
commitee5d674965505f53f67adf040b76ff74dd32d2cc (patch)
tree0e4a3f68cd25f3f2ed799e9cec9abcb7542777f7
parentd683fa8e84be6cdee9db380498f25091d2844f9c (diff)
downloadsdl_core-ee5d674965505f53f67adf040b76ff74dd32d2cc.tar.gz
Fix UTs
Fix application manager test. Fix resource alllocation mngr UTs.
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc21
-rw-r--r--src/components/application_manager/test/application_manager_impl_test.cc4
2 files changed, 25 insertions, 0 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
index 8534345d9b..84a9e61105 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
@@ -257,6 +257,13 @@ TEST_F(RAManagerTest, AppExit_ReleaseResource) {
EXPECT_CALL(mock_app_mngr_, application(kAppId1))
.WillRepeatedly(Return(mock_app_1_));
+ RCAppExtensionPtr rc_extention_ptr =
+ utils::MakeShared<RCAppExtension>(application_manager::AppExtensionUID(
+ rc_rpc_plugin::RCRPCPlugin::kRCPluginID));
+
+ EXPECT_CALL(*mock_app_1_, QueryInterface(_))
+ .WillOnce(Return(rc_extention_ptr));
+
EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
ra_manager.AcquireResource(kModuleType1, kAppId1));
@@ -315,6 +322,12 @@ TEST_F(RAManagerTest, AppUnregistered_ReleaseResource) {
utils::MakeShared<RCAppExtension>(application_manager::AppExtensionUID(
rc_rpc_plugin::RCRPCPlugin::kRCPluginID));
+ EXPECT_CALL(*mock_app_1_, QueryInterface(_))
+ .WillOnce(Return(rc_extention_ptr));
+
+ EXPECT_CALL(mock_app_mngr_, application(kAppId1))
+ .WillRepeatedly(Return(mock_app_1_));
+
EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
ra_manager.AcquireResource(kModuleType1, kAppId1));
@@ -417,6 +430,14 @@ TEST_F(RAManagerTest, AppGotRevokedModulesWithPTU_ReleaseRevokedResource) {
EXPECT_CALL(mock_app_mngr_, application(kAppId1))
.WillRepeatedly(Return(mock_app_1_));
+ RCAppExtensionPtr rc_extention_ptr =
+ utils::MakeShared<rc_rpc_plugin::RCAppExtension>(
+ application_manager::AppExtensionUID(
+ rc_rpc_plugin::RCRPCPlugin::kRCPluginID));
+
+ EXPECT_CALL(*mock_app_1_, QueryInterface(RCRPCPlugin::kRCPluginID))
+ .WillRepeatedly(Return(rc_extention_ptr));
+
ON_CALL(*mock_app_1_, is_remote_control_supported())
.WillByDefault(Return(true));
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 f31b00c451..c13a47aae5 100644
--- a/src/components/application_manager/test/application_manager_impl_test.cc
+++ b/src/components/application_manager/test/application_manager_impl_test.cc
@@ -889,6 +889,10 @@ TEST_F(ApplicationManagerImplTest, UnregisterAnotherAppDuringAudioPassThru) {
ON_CALL(mock_application_manager_settings_, recording_file_name())
.WillByDefault(ReturnRef(dummy_file_name));
+ std::unique_ptr<plugin_manager::RPCPluginManager> mock_rpc_plugin_manager_ptr(
+ new plugin_manager::MockRPCPluginManager);
+ app_manager_impl_->SetPluginManager(mock_rpc_plugin_manager_ptr);
+
const uint32_t app_id_1 = 65537;
const uint32_t app_id_2 = 65538;