1 files changed, 65 insertions, 13 deletions

diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
index 1d764526b9..353f3f05b7 100644
--- a/src/components/application_manager/test/policy_handler_test.cc
+++ b/src/components/application_manager/test/policy_handler_test.cc
@@ -199,7 +199,9 @@ class PolicyHandlerTest : public ::testing::Test {
 
   virtual void TearDown() OVERRIDE {
     Mock::VerifyAndClearExpectations(&mock_message_helper_);
-    ON_CALL(mock_event_dispatcher_, remove_observer(_, _));
+    ON_CALL(
+        mock_event_dispatcher_,
+        remove_observer(_, testing::Matcher<event_engine::EventObserver&>(_)));
   }
 
   void ChangePolicyManagerToMock() {
@@ -292,6 +294,10 @@ class PolicyHandlerTest : public ::testing::Test {
   }
 };
 
+ACTION_P(SetDeviceParamsMacAdress, mac_adress) {
+  *arg3 = mac_adress;
+}
+
 TEST_F(PolicyHandlerTest, LoadPolicyLibrary_Method_ExpectLibraryLoaded) {
   // Check before policy enabled from ini file
   EXPECT_CALL(policy_settings_, enable_policy()).WillRepeatedly(Return(false));
@@ -1583,6 +1589,56 @@ TEST_F(PolicyHandlerTest, OnGetListOfPermissions) {
               GetDataOnDeviceID(
                   testing::An<transport_manager::DeviceHandle>(), _, _, _, _));
 
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  policy::ExternalConsentStatus external_consent_status =
+      policy::ExternalConsentStatus();
+  EXPECT_CALL(mock_message_helper_,
+              SendGetListOfPermissionsResponse(
+                  _, external_consent_status, corr_id, _, true));
+  EXPECT_CALL(*mock_policy_manager_, GetExternalConsentStatus())
+      .WillOnce(Return(external_consent_status));
+#else
+  EXPECT_CALL(mock_message_helper_,
+              SendGetListOfPermissionsResponse(_, corr_id, _, true));
+#endif  // #ifdef EXTERNAL_PROPRIETARY_MODE
+
+  policy_handler_.OnGetListOfPermissions(app_id, corr_id);
+}
+
+TEST_F(PolicyHandlerTest, OnGetListOfPermissions_CollectResult_false) {
+  // Arrange
+  EnablePolicyAndPolicyManagerMock();
+
+  const uint32_t app_id = 10u;
+  const uint32_t corr_id = 1u;
+  test_app.insert(mock_app_);
+
+  EXPECT_CALL(app_manager_, application(app_id))
+      .WillRepeatedly(Return(mock_app_));
+  EXPECT_CALL(conn_handler, get_session_observer())
+      .WillOnce(ReturnRef(mock_session_observer));
+  EXPECT_CALL(*mock_app_, device()).WillOnce(Return(0));
+  EXPECT_CALL(mock_session_observer,
+              GetDataOnDeviceID(
+                  testing::An<transport_manager::DeviceHandle>(), _, _, _, _))
+      .WillRepeatedly(
+          DoAll(SetDeviceParamsMacAdress(std::string()), (Return(1u))));
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  policy::ExternalConsentStatus external_consent_status =
+      policy::ExternalConsentStatus();
+  EXPECT_CALL(mock_message_helper_,
+              SendGetListOfPermissionsResponse(
+                  _, external_consent_status, corr_id, _, false))
+      .WillOnce(Return());
+  EXPECT_CALL(*mock_policy_manager_, GetExternalConsentStatus())
+      .WillOnce(Return(external_consent_status));
+#else
+  EXPECT_CALL(mock_message_helper_,
+              SendGetListOfPermissionsResponse(_, corr_id, _, false))
+      .WillOnce(Return());
+#endif  // #ifdef EXTERNAL_PROPRIETARY_MODE
+
   policy_handler_.OnGetListOfPermissions(app_id, corr_id);
 }
 
@@ -1614,14 +1670,14 @@ TEST_F(PolicyHandlerTest, OnGetListOfPermissions_WithoutConnectionKey) {
 #ifdef EXTERNAL_PROPRIETARY_MODE
   policy::ExternalConsentStatus external_consent_status =
       policy::ExternalConsentStatus();
-  EXPECT_CALL(
-      mock_message_helper_,
-      SendGetListOfPermissionsResponse(_, external_consent_status, corr_id, _));
+  EXPECT_CALL(mock_message_helper_,
+              SendGetListOfPermissionsResponse(
+                  _, external_consent_status, corr_id, _, true));
   EXPECT_CALL(*mock_policy_manager_, GetExternalConsentStatus())
       .WillOnce(Return(external_consent_status));
 #else
   EXPECT_CALL(mock_message_helper_,
-              SendGetListOfPermissionsResponse(_, corr_id, _));
+              SendGetListOfPermissionsResponse(_, corr_id, _, true));
 #endif  // #ifdef EXTERNAL_PROPRIETARY_MODE
 
   policy_handler_.OnGetListOfPermissions(app_id, corr_id);
@@ -1690,14 +1746,14 @@ TEST_F(PolicyHandlerTest, OnGetListOfPermissions_GroupPermissions_SUCCESS) {
 #ifdef EXTERNAL_PROPRIETARY_MODE
   policy::ExternalConsentStatus external_consent_status =
       policy::ExternalConsentStatus();
-  EXPECT_CALL(
-      mock_message_helper_,
-      SendGetListOfPermissionsResponse(_, external_consent_status, corr_id, _));
+  EXPECT_CALL(mock_message_helper_,
+              SendGetListOfPermissionsResponse(
+                  _, external_consent_status, corr_id, _, true));
   EXPECT_CALL(*mock_policy_manager_, GetExternalConsentStatus())
       .WillOnce(Return(external_consent_status));
 #else
   EXPECT_CALL(mock_message_helper_,
-              SendGetListOfPermissionsResponse(_, corr_id, _));
+              SendGetListOfPermissionsResponse(_, corr_id, _, true));
 #endif  // #ifdef EXTERNAL_PROPRIETARY_MODE
 
   policy_handler_.OnGetListOfPermissions(app_id, corr_id);
@@ -2318,10 +2374,6 @@ TEST_F(PolicyHandlerTest,
   EXPECT_FALSE(waiter->WaitFor(kCallsCount_, kTimeout_));
 }
 
-ACTION_P(SetDeviceParamsMacAdress, mac_adress) {
-  *arg3 = mac_adress;
-}
-
 TEST_F(PolicyHandlerTest,
        OnAppPermissionConsentInternal_ExistAppsPreviouslyStored_SUCCESS) {
   EnablePolicyAndPolicyManagerMock();