diff options
author | conlain-k <conlain.k@gmail.com> | 2018-07-24 15:31:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-24 15:31:47 -0400 |
commit | 90db9ca480eabeaf85ec77626b1bf10fa491270d (patch) | |
tree | 1061840e02be20e216cca72685113ceffd592981 /src/components/application_manager/test/usage_statistics_test.cc | |
parent | e1d597dafe130e73d68d7ccbd84a6b63db2a329f (diff) | |
parent | a773acc84a6836129f1d9bc4b8b723b9e7301e0c (diff) | |
download | sdl_core-90db9ca480eabeaf85ec77626b1bf10fa491270d.tar.gz |
Merge branch 'develop' into feature/boost_filesystem_implementation
Diffstat (limited to 'src/components/application_manager/test/usage_statistics_test.cc')
-rw-r--r-- | src/components/application_manager/test/usage_statistics_test.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc index 6efef83052..8d2ed690b6 100644 --- a/src/components/application_manager/test/usage_statistics_test.cc +++ b/src/components/application_manager/test/usage_statistics_test.cc @@ -36,8 +36,6 @@ #include "smart_objects/enum_schema_item.h" #include "policy/usage_statistics/mock_statistics_manager.h" #include "policy/usage_statistics/mock_app_stopwatch.h" -#include "utils/make_shared.h" -#include "utils/shared_ptr.h" namespace test { namespace components { @@ -69,23 +67,22 @@ const std::string kAppId = "SPT"; class UsageStatisticsTest : public testing::Test { public: UsageStatisticsTest() - : mock_statistics_manager_sptr_( - utils::MakeShared<MockStatisticsManager>()) + : mock_statistics_manager_sptr_(std::make_shared<MockStatisticsManager>()) , usage_statistics_test_object1_sptr_( new application_manager::UsageStatistics( kAppId, mock_statistics_manager_sptr_)) , language_(LanguageIdToString(kTestLanguageId)) {} protected: - utils::SharedPtr<MockStatisticsManager> mock_statistics_manager_sptr_; - std::auto_ptr<application_manager::UsageStatistics> + std::shared_ptr<MockStatisticsManager> mock_statistics_manager_sptr_; + std::unique_ptr<application_manager::UsageStatistics> usage_statistics_test_object1_sptr_; const std::string language_; }; TEST_F(UsageStatisticsTest, RecordHmiStateChanged_CallMethod_ExpectMethodCall) { // Arrange - std::auto_ptr<MockAppStopwatch> mock_app_stopwatch_object( + std::unique_ptr<MockAppStopwatch> mock_app_stopwatch_object( new MockAppStopwatch); // Checks @@ -93,7 +90,7 @@ TEST_F(UsageStatisticsTest, RecordHmiStateChanged_CallMethod_ExpectMethodCall) { EXPECT_CALL(*mock_app_stopwatch_object, Switch(kTestAppStopwatchId)); // Act - std::auto_ptr<application_manager::UsageStatistics> + std::unique_ptr<application_manager::UsageStatistics> usage_statistics_test_object2_sptr_( new application_manager::UsageStatistics( kAppId, |