Merge branch 'develop' into hotfix/add_FAQ_to_READMEhotfix/add_FAQ_to_README

1 files changed, 8 insertions, 132 deletions

diff --git a/src/components/application_manager/test/request_info_test.cc b/src/components/application_manager/test/request_info_test.cc
index 886736fa97..11b2d2f259 100644
--- a/src/components/application_manager/test/request_info_test.cc
+++ b/src/components/application_manager/test/request_info_test.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/request_info.h"
+#include "application_manager/mock_request.h"
 #include <iostream>
 #include <vector>
 #include <limits>
@@ -44,30 +45,6 @@ namespace test {
 namespace components {
 namespace application_manager_test {
 
-class MockRequest : public application_manager::commands::Command {
- public:
-  MockRequest(uint32_t connection_key, uint32_t correlation_id)
-      : connection_key_(connection_key), correlation_id_(correlation_id) {}
-  MOCK_METHOD0(CheckPermissions, bool());
-  MOCK_METHOD0(Init, bool());
-  MOCK_METHOD0(Run, void());
-  MOCK_METHOD0(CleanUp, bool());
-  MOCK_CONST_METHOD0(default_timeout, uint32_t());
-  MOCK_CONST_METHOD0(function_id, int32_t());
-  MOCK_METHOD0(onTimeOut, void());
-  MOCK_METHOD0(AllowedToTerminate, bool());
-  MOCK_METHOD1(SetAllowedToTerminate, void(bool));
-
-  uint32_t connection_key_;
-  uint32_t correlation_id_;
-  virtual uint32_t connection_key() const {
-    return connection_key_;
-  }
-  virtual uint32_t correlation_id() const {
-    return correlation_id_;
-  }
-};
-
 class TestRequestInfo : public request_info::RequestInfo {
  public:
   TestRequestInfo(request_info::RequestPtr request,
@@ -115,7 +92,7 @@ class RequestInfoTest : public ::testing::Test {
 };
 
 TEST_F(RequestInfoTest, RequestInfoEqualEndTime) {
-  std::vector<utils::SharedPtr<TestRequestInfo>> requests;
+  std::vector<utils::SharedPtr<TestRequestInfo> > requests;
   const TimevalStruct& time = date_time::DateTime::getCurrentTime();
   for (uint32_t i = 0; i < count_of_requests_for_test_; ++i) {
     utils::SharedPtr<TestRequestInfo> request = CreateTestInfo(
@@ -142,7 +119,7 @@ TEST_F(RequestInfoTest, AddRemoveHMIRequests) {
 }
 
 TEST_F(RequestInfoTest, AddHMIRequests_RemoveAllRequests) {
-  std::vector<utils::SharedPtr<TestRequestInfo>> requests;
+  std::vector<utils::SharedPtr<TestRequestInfo> > requests;
 
   // Add hmi requests
   for (uint32_t i = 0; i < count_of_requests_for_test_; ++i) {
@@ -158,7 +135,7 @@ TEST_F(RequestInfoTest, AddHMIRequests_RemoveAllRequests) {
   EXPECT_EQ(count_of_requests_for_test_, request_info_set_.Size());
 
   // Delete every request
-  std::vector<utils::SharedPtr<TestRequestInfo>>::iterator req_it =
+  std::vector<utils::SharedPtr<TestRequestInfo> >::iterator req_it =
       requests.begin();
 
   for (; req_it != requests.end(); ++req_it) {
@@ -177,107 +154,6 @@ TEST_F(RequestInfoTest, AddHMIRequests_RemoveAllRequests) {
   EXPECT_EQ(0u, request_info_set_.Size());
 }
 
-TEST_F(RequestInfoTest, CheckRequestsMaxCount) {
-  const uint32_t app_hmi_level_time_scale = 100;
-  const uint32_t hmi_level_count = 1000;
-
-  // Count of added requests is less than max possible
-  std::vector<utils::SharedPtr<TestRequestInfo>> requests;
-  for (uint32_t i = 0; i < hmi_level_count - 1; ++i) {
-    utils::SharedPtr<TestRequestInfo> request =
-        CreateTestInfo(mobile_connection_key1_,
-                       i,
-                       request_info::RequestInfo::MobileRequest,
-                       date_time::DateTime::getCurrentTime(),
-                       default_timeout_);
-
-    request->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
-    requests.push_back(request);
-    EXPECT_TRUE(request_info_set_.Add(request));
-  }
-  EXPECT_EQ(hmi_level_count - 1, request_info_set_.Size());
-
-  EXPECT_TRUE(request_info_set_.CheckHMILevelTimeScaleMaxRequest(
-      mobile_apis::HMILevel::HMI_FULL,
-      mobile_connection_key1_,
-      app_hmi_level_time_scale,
-      hmi_level_count));
-
-  // Adding new request is correct
-  utils::SharedPtr<TestRequestInfo> new_request =
-      CreateTestInfo(mobile_connection_key1_,
-                     hmi_level_count,
-                     request_info::RequestInfo::MobileRequest,
-                     date_time::DateTime::getCurrentTime(),
-                     default_timeout_);
-  new_request->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
-  EXPECT_TRUE(request_info_set_.Add(new_request));
-  EXPECT_EQ(hmi_level_count, request_info_set_.Size());
-
-  // Count of added requests is max
-  EXPECT_FALSE(request_info_set_.CheckHMILevelTimeScaleMaxRequest(
-      mobile_apis::HMILevel::HMI_FULL,
-      mobile_connection_key1_,
-      app_hmi_level_time_scale,
-      hmi_level_count));
-
-  utils::SharedPtr<TestRequestInfo> new_request2 =
-      CreateTestInfo(mobile_connection_key1_,
-                     hmi_level_count + 1,
-                     request_info::RequestInfo::MobileRequest,
-                     date_time::DateTime::getCurrentTime(),
-                     default_timeout_);
-
-  EXPECT_TRUE(request_info_set_.Add(new_request2));
-}
-
-TEST_F(RequestInfoTest, CheckMaxCountOfRequest) {
-  const uint32_t app_hmi_level_time_scale = 100;
-  const uint32_t hmi_level_count = 1000;
-
-  // Count of added requests is less than max possible
-  std::vector<utils::SharedPtr<TestRequestInfo>> requests;
-  for (uint32_t i = 0; i < hmi_level_count - 1; ++i) {
-    utils::SharedPtr<TestRequestInfo> request =
-        CreateTestInfo(mobile_connection_key1_,
-                       i,
-                       request_info::RequestInfo::MobileRequest,
-                       date_time::DateTime::getCurrentTime(),
-                       default_timeout_);
-    request->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
-    requests.push_back(request);
-    EXPECT_TRUE(request_info_set_.Add(request));
-  }
-  EXPECT_EQ(hmi_level_count - 1, request_info_set_.Size());
-
-  EXPECT_TRUE(request_info_set_.CheckTimeScaleMaxRequest(
-      mobile_connection_key1_, app_hmi_level_time_scale, hmi_level_count));
-
-  // Adding new request is correct
-  utils::SharedPtr<TestRequestInfo> new_request =
-      CreateTestInfo(mobile_connection_key1_,
-                     hmi_level_count,
-                     request_info::RequestInfo::MobileRequest,
-                     date_time::DateTime::getCurrentTime(),
-                     default_timeout_);
-  new_request->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
-  EXPECT_TRUE(request_info_set_.Add(new_request));
-  EXPECT_EQ(hmi_level_count, request_info_set_.Size());
-
-  // Count of added requests is max
-  EXPECT_FALSE(request_info_set_.CheckTimeScaleMaxRequest(
-      mobile_connection_key1_, app_hmi_level_time_scale, hmi_level_count));
-
-  utils::SharedPtr<TestRequestInfo> new_request2 =
-      CreateTestInfo(mobile_connection_key1_,
-                     hmi_level_count + 1,
-                     request_info::RequestInfo::MobileRequest,
-                     date_time::DateTime::getCurrentTime(),
-                     default_timeout_);
-
-  EXPECT_TRUE(request_info_set_.Add(new_request2));
-}
-
 TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequests) {
   utils::SharedPtr<TestRequestInfo> mobile_request1 =
       CreateTestInfo(mobile_connection_key1_,
@@ -299,7 +175,7 @@ TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequests) {
 }
 
 TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequestsByConnectionKey) {
-  std::vector<utils::SharedPtr<TestRequestInfo>> requests;
+  std::vector<utils::SharedPtr<TestRequestInfo> > requests;
   const uint32_t count_of_mobile_request1 = 200;
   const uint32_t count_of_mobile_request2 = 100;
   for (uint32_t i = 0; i < count_of_mobile_request1; ++i) {
@@ -361,14 +237,14 @@ TEST_F(RequestInfoTest, RequestInfoSetFront) {
 }
 
 TEST_F(RequestInfoTest, RequestInfoSetFind) {
-  std::vector<std::pair<uint32_t, uint32_t>> appid_connection_id;
+  std::vector<std::pair<uint32_t, uint32_t> > appid_connection_id;
   for (uint32_t i = 0; i < count_of_requests_for_test_; ++i) {
     appid_connection_id.push_back(
         std::pair<uint32_t, uint32_t>(i, count_of_requests_for_test_ - i));
   }
-  std::vector<std::pair<uint32_t, uint32_t>>::iterator req_it =
+  std::vector<std::pair<uint32_t, uint32_t> >::iterator req_it =
       appid_connection_id.begin();
-  const std::vector<std::pair<uint32_t, uint32_t>>::iterator end =
+  const std::vector<std::pair<uint32_t, uint32_t> >::iterator end =
       appid_connection_id.end();
 
   for (; req_it != end; ++req_it) {