summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAKalinich-Luxoft <AKalinich@luxoft.com>2017-12-12 14:51:54 +0200
committerAKalinich-Luxoft <AKalinich@luxoft.com>2017-12-12 14:51:54 +0200
commit8df896557652eee90d8d4a3f89ec25ad98d42426 (patch)
tree60189b9e80331be910a1706e5adce85c793e7ade
parent3baea565f75bfc8cebacccc0bc04045af076e7f8 (diff)
downloadsdl_core-8df896557652eee90d8d4a3f89ec25ad98d42426.tar.gz
Fix tests and mocks after rebase
-rw-r--r--src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc3
-rw-r--r--src/components/remote_control/test/include/mock_application.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc b/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
index 21ed5a1f41..03e1187d35 100644
--- a/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
+++ b/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
@@ -1033,8 +1033,7 @@ TEST_F(HMICommandsNotificationsTest,
resumprion_test::MockResumeCtrl mock_resume_ctrl;
EXPECT_CALL(app_mngr_, resume_controller())
- .Times(2)
- .WillRepeatedly(ReturnRef(mock_resume_ctrl));
+ .WillOnce(ReturnRef(mock_resume_ctrl));
EXPECT_CALL(mock_resume_ctrl, OnSuspend());
EXPECT_CALL(app_mngr_, GetNextHMICorrelationID())
diff --git a/src/components/remote_control/test/include/mock_application.h b/src/components/remote_control/test/include/mock_application.h
index 28f279cdd3..c885a5ddf6 100644
--- a/src/components/remote_control/test/include/mock_application.h
+++ b/src/components/remote_control/test/include/mock_application.h
@@ -59,6 +59,8 @@ class MockApplication : public ::application_manager::Application {
MOCK_CONST_METHOD0(active_message, const smart_objects::SmartObject*());
MOCK_CONST_METHOD0(curHash, const std::string&());
MOCK_METHOD0(UpdateHash, void());
+ MOCK_CONST_METHOD0(IsHashChangedAfterAwake, bool());
+ MOCK_METHOD1(SetHashChangedAfterAwake, void(const bool state));
MOCK_CONST_METHOD0(flag_sending_hash_change_after_awake, bool());
MOCK_METHOD1(set_flag_sending_hash_change_after_awake, void(bool flag));
MOCK_CONST_METHOD0(is_application_data_changed, bool());