diff options
author | Alex Vakulenko <avakulenko@google.com> | 2016-04-08 08:58:08 -0700 |
---|---|---|
committer | Alex Vakulenko <avakulenko@google.com> | 2016-04-08 09:59:05 -0700 |
commit | 099f330f4dd55e50c9db5643314f8c47a423d789 (patch) | |
tree | 096b09d8fb8897da792dbf42e3fdf6ed37ecfb36 | |
parent | 5ed45448b3e64094641bd2287e7638716fd4f9fc (diff) | |
download | metricsd-099f330f4dd55e50c9db5643314f8c47a423d789.tar.gz |
metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr
Now that scoped_ptr is just a type alias to unique_ptr, there is no
longer a need to convert between the two by using .release() and
constructing the other with a raw pointer.
BUG: None
TEST: Built for dragonboard, all unit tests pass (except for update_engine,
but those tests failed before these changes too).
Change-Id: Ibf0a094805d22d00ca10e1c67f68efb08c8677df
-rw-r--r-- | timer_test.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/timer_test.cc b/timer_test.cc index 7a67e11..cfbcd8a 100644 --- a/timer_test.cc +++ b/timer_test.cc @@ -69,7 +69,7 @@ TEST_F(TimerTest, StartStop) { EXPECT_CALL(*clock_wrapper_mock_, GetCurrentTime()) .WillOnce(Return(stime)) .WillOnce(Return(etime)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Start()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -88,7 +88,7 @@ TEST_F(TimerTest, ReStart) { EXPECT_CALL(*clock_wrapper_mock_, GetCurrentTime()) .WillOnce(Return(stime)) .WillOnce(Return(etime)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); timer_.Start(); base::TimeTicks buffer = timer_.start_time_; timer_.Start(); @@ -98,7 +98,7 @@ TEST_F(TimerTest, ReStart) { TEST_F(TimerTest, Reset) { EXPECT_CALL(*clock_wrapper_mock_, GetCurrentTime()) .WillOnce(Return(stime)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); timer_.Start(); ASSERT_TRUE(timer_.Reset()); ASSERT_FALSE(timer_.HasStarted()); @@ -110,7 +110,7 @@ TEST_F(TimerTest, SeparatedTimers) { .WillOnce(Return(etime)) .WillOnce(Return(stime2)) .WillOnce(Return(etime2)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Start()); ASSERT_TRUE(timer_.Stop()); ASSERT_EQ(timer_.elapsed_time_.InMilliseconds(), kDelta1MSec); @@ -130,7 +130,7 @@ TEST_F(TimerTest, InvalidStop) { EXPECT_CALL(*clock_wrapper_mock_, GetCurrentTime()) .WillOnce(Return(stime)) .WillOnce(Return(etime)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_FALSE(timer_.Stop()); // Now we try it again, but after a valid start/stop. timer_.Start(); @@ -152,7 +152,7 @@ TEST_F(TimerTest, PauseStartStopResume) { .WillOnce(Return(etime2)) .WillOnce(Return(stime3)) .WillOnce(Return(etime3)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Pause()); // Starts timer paused. ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -181,7 +181,7 @@ TEST_F(TimerTest, ResumeStartStopPause) { .WillOnce(Return(stime2)) .WillOnce(Return(etime2)) .WillOnce(Return(stime3)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Resume()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -208,7 +208,7 @@ TEST_F(TimerTest, StartResumeStop) { EXPECT_CALL(*clock_wrapper_mock_, GetCurrentTime()) .WillOnce(Return(stime)) .WillOnce(Return(etime)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Start()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -230,7 +230,7 @@ TEST_F(TimerTest, StartPauseStop) { EXPECT_CALL(*clock_wrapper_mock_, GetCurrentTime()) .WillOnce(Return(stime)) .WillOnce(Return(etime)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Start()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -257,7 +257,7 @@ TEST_F(TimerTest, StartPauseResumeStop) { .WillOnce(Return(etime)) .WillOnce(Return(stime2)) .WillOnce(Return(etime2)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Start()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -284,7 +284,7 @@ TEST_F(TimerTest, StartPauseResumeStop) { TEST_F(TimerTest, PauseStop) { EXPECT_CALL(*clock_wrapper_mock_, GetCurrentTime()) .WillOnce(Return(stime)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Pause()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -304,7 +304,7 @@ TEST_F(TimerTest, PauseResumeStop) { .WillOnce(Return(stime)) .WillOnce(Return(stime2)) .WillOnce(Return(etime2)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Pause()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -328,7 +328,7 @@ TEST_F(TimerTest, StartPauseResumePauseStop) { .WillOnce(Return(stime2)) .WillOnce(Return(stime3)) .WillOnce(Return(etime3)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Start()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -373,7 +373,7 @@ TEST_F(TimerTest, StartPauseResumePauseResumeStop) { .WillOnce(Return(etime2)) .WillOnce(Return(stime3)) .WillOnce(Return(etime3)); - timer_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_.clock_wrapper_ = std::move(clock_wrapper_mock_); ASSERT_TRUE(timer_.Start()); ASSERT_TRUE(timer_.start_time_ == stime); ASSERT_TRUE(timer_.HasStarted()); @@ -444,7 +444,7 @@ TEST_F(TimerReporterTest, StartStopReport) { EXPECT_CALL(*clock_wrapper_mock_, GetCurrentTime()) .WillOnce(Return(stime)) .WillOnce(Return(etime)); - timer_reporter_.clock_wrapper_.reset(clock_wrapper_mock_.release()); + timer_reporter_.clock_wrapper_ = std::move(clock_wrapper_mock_); EXPECT_CALL(lib_, SendToUMA(kMetricName, kDelta1MSec, kMinSample, kMaxSample, kNumBuckets)).WillOnce(Return(true)); ASSERT_TRUE(timer_reporter_.Start()); |