diff options
| author | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-02-02 12:58:04 +0200 |
|---|---|---|
| committer | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-02-06 12:29:53 +0200 |
| commit | b96219a79297a9451f975150f70a09117518ca88 (patch) | |
| tree | 4732eecd9a6527c0450f31d28f029105364e506d | |
| parent | 4b05cf18aa66e40d42935bc8d0873d22291b29e2 (diff) | |
| download | sdl_core-b96219a79297a9451f975150f70a09117518ca88.tar.gz | |
Fix build issues on CI
Related tasks APPLINK-30588 APPLINK-30977
| -rw-r--r-- | src/components/application_manager/test/request_controller/request_controller_test.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/components/application_manager/test/request_controller/request_controller_test.cc b/src/components/application_manager/test/request_controller/request_controller_test.cc index f93240aeae..e053d51c34 100644 --- a/src/components/application_manager/test/request_controller/request_controller_test.cc +++ b/src/components/application_manager/test/request_controller/request_controller_test.cc @@ -50,6 +50,7 @@ #include "application_manager/resumption/resume_ctrl.h" #include "application_manager/mock_request_controller_settings.h" #include "application_manager/mock_application_manager.h" +#include "utils/test_async_waiter.h" namespace test { namespace components { @@ -246,15 +247,17 @@ TEST_F(RequestControllerTestClass, OnTimer_SUCCESS) { RequestPtr mock_request = GetMockRequest( kDefaultCorrelationID, kDefaultConnectionKey, request_timeout); + TestAsyncWaiter waiter; EXPECT_EQ(RequestController::SUCCESS, AddRequest(default_settings_, mock_request, RequestInfo::RequestType::MobileRequest)); - EXPECT_CALL(*mock_request, onTimeOut()); + EXPECT_CALL(*mock_request, onTimeOut()) + .WillOnce(NotifyTestAsyncWaiter(&waiter)); // Waiting for call of `onTimeOut` for `kTimeScale` seconds - testing::Mock::AsyncVerifyAndClearExpectations(kTimeScale); + EXPECT_TRUE(waiter.WaitFor(1, kTimeScale)); } } // namespace request_controller_test |