diff options
Diffstat (limited to 'src/components/application_manager/test/request_info_test.cc')
| -rw-r--r-- | src/components/application_manager/test/request_info_test.cc | 127 |
1 files changed, 64 insertions, 63 deletions
diff --git a/src/components/application_manager/test/request_info_test.cc b/src/components/application_manager/test/request_info_test.cc index 11b2d2f259..0abef44e9a 100644 --- a/src/components/application_manager/test/request_info_test.cc +++ b/src/components/application_manager/test/request_info_test.cc @@ -36,8 +36,6 @@ #include <vector> #include <limits> #include "gmock/gmock.h" -#include "utils/shared_ptr.h" -#include "utils/make_shared.h" namespace request_info = application_manager::request_controller; @@ -48,11 +46,11 @@ namespace application_manager_test { class TestRequestInfo : public request_info::RequestInfo { public: TestRequestInfo(request_info::RequestPtr request, - const RequestType requst_type, - const TimevalStruct& start_time, + const RequestType request_type, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec) - : RequestInfo(request, requst_type, start_time, timeout_msec) {} - void SetEndTime(const TimevalStruct& end_time) { + : RequestInfo(request, request_type, start_time, timeout_msec) {} + void SetEndTime(const date_time::TimeDuration& end_time) { end_time_ = end_time; } }; @@ -76,26 +74,26 @@ class RequestInfoTest : public ::testing::Test { uint32_t default_timeout_; uint32_t mobile_correlation_id; - utils::SharedPtr<TestRequestInfo> CreateTestInfo( + std::shared_ptr<TestRequestInfo> CreateTestInfo( uint32_t connection_key, uint32_t correlation_id, - request_info::RequestInfo::RequestType requst_type, - const TimevalStruct& start_time, + request_info::RequestInfo::RequestType request_type, + const date_time::TimeDuration& start_time, uint64_t timeout_msec) { - utils::SharedPtr<MockRequest> mock_request = - utils::MakeShared<MockRequest>(connection_key, correlation_id); - utils::SharedPtr<TestRequestInfo> request = - utils::MakeShared<TestRequestInfo>( - mock_request, requst_type, start_time, timeout_msec); + std::shared_ptr<MockRequest> mock_request = + std::make_shared<MockRequest>(connection_key, correlation_id); + std::shared_ptr<TestRequestInfo> request = + std::make_shared<TestRequestInfo>( + mock_request, request_type, start_time, timeout_msec); return request; } }; TEST_F(RequestInfoTest, RequestInfoEqualEndTime) { - std::vector<utils::SharedPtr<TestRequestInfo> > requests; - const TimevalStruct& time = date_time::DateTime::getCurrentTime(); + std::vector<std::shared_ptr<TestRequestInfo> > requests; + const date_time::TimeDuration& time = date_time::getCurrentTime(); for (uint32_t i = 0; i < count_of_requests_for_test_; ++i) { - utils::SharedPtr<TestRequestInfo> request = CreateTestInfo( + std::shared_ptr<TestRequestInfo> request = CreateTestInfo( i, i, request_info::RequestInfo::MobileRequest, time, default_timeout_); request->SetEndTime(time); EXPECT_TRUE(request_info_set_.Add(request)); @@ -105,11 +103,11 @@ TEST_F(RequestInfoTest, RequestInfoEqualEndTime) { TEST_F(RequestInfoTest, AddRemoveHMIRequests) { for (uint32_t i = 0; i < count_of_requests_for_test_; ++i) { - utils::SharedPtr<TestRequestInfo> request = + std::shared_ptr<TestRequestInfo> request = CreateTestInfo(hmi_connection_key_, i, request_info::RequestInfo::HMIRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), default_timeout_); EXPECT_TRUE(request_info_set_.Add(request)); EXPECT_TRUE(request_info_set_.RemoveRequest(request)); @@ -119,15 +117,15 @@ TEST_F(RequestInfoTest, AddRemoveHMIRequests) { } TEST_F(RequestInfoTest, AddHMIRequests_RemoveAllRequests) { - std::vector<utils::SharedPtr<TestRequestInfo> > requests; + std::vector<std::shared_ptr<TestRequestInfo> > requests; // Add hmi requests for (uint32_t i = 0; i < count_of_requests_for_test_; ++i) { - utils::SharedPtr<TestRequestInfo> request = + std::shared_ptr<TestRequestInfo> request = CreateTestInfo(hmi_connection_key_, i, request_info::RequestInfo::HMIRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), default_timeout_); requests.push_back(request); EXPECT_TRUE(request_info_set_.Add(request)); @@ -135,7 +133,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<std::shared_ptr<TestRequestInfo> >::iterator req_it = requests.begin(); for (; req_it != requests.end(); ++req_it) { @@ -155,18 +153,18 @@ TEST_F(RequestInfoTest, AddHMIRequests_RemoveAllRequests) { } TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequests) { - utils::SharedPtr<TestRequestInfo> mobile_request1 = + std::shared_ptr<TestRequestInfo> mobile_request1 = CreateTestInfo(mobile_connection_key1_, 12345, request_info::RequestInfo::MobileRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), default_timeout_); EXPECT_TRUE(request_info_set_.Add(mobile_request1)); - utils::SharedPtr<TestRequestInfo> mobile_request2 = + std::shared_ptr<TestRequestInfo> mobile_request2 = CreateTestInfo(mobile_connection_key2_, 54321, request_info::RequestInfo::MobileRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), default_timeout_); EXPECT_TRUE(request_info_set_.Add(mobile_request2)); EXPECT_EQ(2u, request_info_set_.Size()); @@ -175,15 +173,15 @@ TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequests) { } TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequestsByConnectionKey) { - std::vector<utils::SharedPtr<TestRequestInfo> > requests; + std::vector<std::shared_ptr<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) { - utils::SharedPtr<TestRequestInfo> mobile_request1 = + std::shared_ptr<TestRequestInfo> mobile_request1 = CreateTestInfo(mobile_connection_key1_, i, request_info::RequestInfo::MobileRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), default_timeout_); requests.push_back(mobile_request1); @@ -192,11 +190,11 @@ TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequestsByConnectionKey) { EXPECT_EQ(count_of_mobile_request1, request_info_set_.Size()); for (uint32_t i = 0; i < count_of_mobile_request2; ++i) { - utils::SharedPtr<TestRequestInfo> mobile_request2 = + std::shared_ptr<TestRequestInfo> mobile_request2 = CreateTestInfo(mobile_connection_key2_, i, request_info::RequestInfo::MobileRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), default_timeout_); requests.push_back(mobile_request2); @@ -214,20 +212,20 @@ TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequestsByConnectionKey) { TEST_F(RequestInfoTest, RequestInfoSetFront) { for (uint32_t i = 0; i < count_of_requests_for_test_; ++i) { - utils::SharedPtr<TestRequestInfo> request = + std::shared_ptr<TestRequestInfo> request = CreateTestInfo(mobile_connection_key1_, i, request_info::RequestInfo::HMIRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), i); request_info_set_.Add(request); } for (uint32_t i = 1; i < count_of_requests_for_test_; ++i) { request_info::RequestInfoPtr request_info = request_info_set_.Front(); - EXPECT_TRUE(request_info.valid()); + EXPECT_TRUE(request_info.use_count() != 0); request_info = request_info_set_.FrontWithNotNullTimeout(); - EXPECT_TRUE(request_info.valid()); + EXPECT_TRUE(request_info.use_count() != 0); EXPECT_TRUE(request_info_set_.RemoveRequest(request_info)); } EXPECT_EQ(1u, request_info_set_.Size()); @@ -248,27 +246,27 @@ TEST_F(RequestInfoTest, RequestInfoSetFind) { appid_connection_id.end(); for (; req_it != end; ++req_it) { - utils::SharedPtr<TestRequestInfo> request = + std::shared_ptr<TestRequestInfo> request = CreateTestInfo(req_it->first, req_it->second, request_info::RequestInfo::HMIRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), 10); EXPECT_TRUE(request_info_set_.Add(request)); } request_info::RequestInfoPtr request = request_info_set_.Find( count_of_requests_for_test_, count_of_requests_for_test_); - EXPECT_FALSE(request.valid()); + EXPECT_FALSE(request.use_count() != 0); req_it = appid_connection_id.begin(); for (; req_it != end; ++req_it) { request_info::RequestInfoPtr request = request_info_set_.Find(req_it->first, req_it->second); - EXPECT_TRUE(request.valid()); + EXPECT_TRUE(request.use_count() != 0); EXPECT_TRUE(request_info_set_.RemoveRequest(request)); request = request_info_set_.Find(req_it->first, req_it->second); - EXPECT_FALSE(request.valid()); + EXPECT_FALSE(request.use_count() != 0); } EXPECT_EQ(0u, request_info_set_.Size()); } @@ -277,11 +275,11 @@ TEST_F(RequestInfoTest, RequestInfoSetEqualHash) { request_info::RequestInfoSet request_info_set; const uint32_t connection_key = 65483; const uint32_t corr_id = 65483; - utils::SharedPtr<TestRequestInfo> request = + std::shared_ptr<TestRequestInfo> request = CreateTestInfo(connection_key, corr_id, request_info::RequestInfo::HMIRequest, - date_time::DateTime::getCurrentTime(), + date_time::getCurrentTime(), 10); EXPECT_TRUE(request_info_set.Add(request)); EXPECT_FALSE(request_info_set.Add(request)); @@ -289,31 +287,33 @@ TEST_F(RequestInfoTest, RequestInfoSetEqualHash) { EXPECT_EQ(1u, request_info_set.Size()); request_info::RequestInfoPtr found = request_info_set.Find(connection_key, corr_id); - EXPECT_TRUE(found.valid()); + EXPECT_TRUE(found.use_count() != 0); EXPECT_TRUE(request_info_set.RemoveRequest(found)); EXPECT_EQ(0u, request_info_set.Size()); EXPECT_TRUE(request_info_set.Add(request)); EXPECT_FALSE(request_info_set.Add(request)); found = request_info_set.FrontWithNotNullTimeout(); - EXPECT_TRUE(found.valid()); + EXPECT_TRUE(found.use_count() != 0); EXPECT_TRUE(request_info_set.RemoveRequest(found)); found = request_info_set.FrontWithNotNullTimeout(); - EXPECT_FALSE(found.valid()); + EXPECT_FALSE(found.use_count() != 0); found = request_info_set.Front(); - EXPECT_FALSE(found.valid()); + EXPECT_FALSE(found.use_count() != 0); EXPECT_EQ(0u, request_info_set.Size()); } TEST_F(RequestInfoTest, EndTimeisExpired) { - TimevalStruct time = date_time::DateTime::getCurrentTime(); + date_time::TimeDuration time = date_time::getCurrentTime(); + // get just the seconds part of the current time + date_time::TimeDuration not_expired = + date_time::seconds(date_time::getSecs(date_time::getCurrentTime())); + not_expired += date_time::microseconds(std::numeric_limits<time_t>::min()); - TimevalStruct not_expired = date_time::DateTime::getCurrentTime(); - not_expired.tv_usec = std::numeric_limits<time_t>::min(); + date_time::TimeDuration expired = + date_time::seconds(date_time::getSecs(date_time::getCurrentTime())); + expired += date_time::microseconds(std::numeric_limits<time_t>::max()); - TimevalStruct expired = date_time::DateTime::getCurrentTime(); - expired.tv_usec = std::numeric_limits<time_t>::max(); - - utils::SharedPtr<TestRequestInfo> request = + std::shared_ptr<TestRequestInfo> request = CreateTestInfo(mobile_connection_key1_, mobile_correlation_id, request_info::RequestInfo::MobileRequest, @@ -328,8 +328,8 @@ TEST_F(RequestInfoTest, EndTimeisExpired) { } TEST_F(RequestInfoTest, UpdateEndTime) { - TimevalStruct time = date_time::DateTime::getCurrentTime(); - utils::SharedPtr<TestRequestInfo> request = + date_time::TimeDuration time = date_time::getCurrentTime(); + std::shared_ptr<TestRequestInfo> request = CreateTestInfo(mobile_connection_key1_, mobile_correlation_id, request_info::RequestInfo::MobileRequest, @@ -337,13 +337,13 @@ TEST_F(RequestInfoTest, UpdateEndTime) { default_timeout_); request->SetEndTime(time); request->updateEndTime(); - TimevalStruct last_time = request->end_time(); - EXPECT_LE(time.tv_sec, last_time.tv_sec); + date_time::TimeDuration last_time = request->end_time(); + EXPECT_LE(date_time::getSecs(time), date_time::getSecs(last_time)); } TEST_F(RequestInfoTest, UpdateTimeOut) { - TimevalStruct time = date_time::DateTime::getCurrentTime(); - utils::SharedPtr<TestRequestInfo> request = + date_time::TimeDuration time = date_time::getCurrentTime(); + std::shared_ptr<TestRequestInfo> request = CreateTestInfo(mobile_connection_key1_, mobile_correlation_id, request_info::RequestInfo::MobileRequest, @@ -353,9 +353,10 @@ TEST_F(RequestInfoTest, UpdateTimeOut) { request->updateEndTime(); request->updateTimeOut(100); - time = date_time::DateTime::getCurrentTime(); - TimevalStruct last_time = request->end_time(); - EXPECT_NEAR(time.tv_sec + 100, last_time.tv_sec, 500); + time = date_time::getCurrentTime(); + date_time::TimeDuration last_time = request->end_time(); + EXPECT_NEAR( + date_time::getSecs(time) + 100, date_time::getSecs(last_time), 500); } } // namespace application_manager_test |