Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3163)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/scheduler/begin_frame_source_unittest.cc

Issue 1132753008: Replaced TestNowSource with SimpleTestTickClock. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporated review comments: scoped leaking clocks, refactored num_now_calls_ functionality Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/scheduler/scheduler_unittest.cc » ('j') | cc/scheduler/scheduler_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/begin_frame_source_unittest.cc
diff --git a/cc/scheduler/begin_frame_source_unittest.cc b/cc/scheduler/begin_frame_source_unittest.cc
index 22126bead4504af443d585740c491a68710833a9..d3558bc4bd547c19939160e558ee7ca3c307d04c 100644
--- a/cc/scheduler/begin_frame_source_unittest.cc
+++ b/cc/scheduler/begin_frame_source_unittest.cc
@@ -314,20 +314,20 @@ TEST(BeginFrameSourceMixInTest, DetectAsValueIntoLoop) {
class TestBackToBackBeginFrameSource : public BackToBackBeginFrameSource {
public:
static scoped_ptr<TestBackToBackBeginFrameSource> Create(
- scoped_refptr<TestNowSource> now_src,
+ base::SimpleTestTickClock* now_src,
base::SingleThreadTaskRunner* task_runner) {
return make_scoped_ptr(
new TestBackToBackBeginFrameSource(now_src, task_runner));
}
protected:
- TestBackToBackBeginFrameSource(scoped_refptr<TestNowSource> now_src,
+ TestBackToBackBeginFrameSource(base::SimpleTestTickClock* now_src,
base::SingleThreadTaskRunner* task_runner)
: BackToBackBeginFrameSource(task_runner), now_src_(now_src) {}
- base::TimeTicks Now() override { return now_src_->Now(); }
+ base::TimeTicks Now() override { return now_src_->NowTicks(); }
- scoped_refptr<TestNowSource> now_src_;
+ base::SimpleTestTickClock* now_src_;
};
class BackToBackBeginFrameSourceTest : public ::testing::Test {
@@ -335,18 +335,19 @@ class BackToBackBeginFrameSourceTest : public ::testing::Test {
static const int64_t kDeadline;
static const int64_t kInterval;
- scoped_refptr<TestNowSource> now_src_;
+ scoped_ptr<base::SimpleTestTickClock> now_src_;
scoped_refptr<OrderedSimpleTaskRunner> task_runner_;
scoped_ptr<TestBackToBackBeginFrameSource> source_;
scoped_ptr<MockBeginFrameObserver> obs_;
void SetUp() override {
- now_src_ = TestNowSource::Create(1000);
+ now_src_ = make_scoped_ptr(new base::SimpleTestTickClock());
+ now_src_->Advance(base::TimeDelta::FromInternalValue(1000));
task_runner_ =
- make_scoped_refptr(new OrderedSimpleTaskRunner(now_src_, false));
+ make_scoped_refptr(new OrderedSimpleTaskRunner(now_src_.get(), false));
task_runner_->SetRunTaskLimit(1);
- source_ =
- TestBackToBackBeginFrameSource::Create(now_src_, task_runner_.get());
+ source_ = TestBackToBackBeginFrameSource::Create(now_src_.get(),
+ task_runner_.get());
obs_ = make_scoped_ptr(new ::testing::StrictMock<MockBeginFrameObserver>());
source_->AddObserver(obs_.get());
}
@@ -367,7 +368,7 @@ TEST_F(BackToBackBeginFrameSourceTest, SetNeedsBeginFramesSendsBeginFrame) {
task_runner_->RunUntilIdle();
EXPECT_BEGIN_FRAME_USED(*obs_, 1100, 1100 + kDeadline, kInterval);
- now_src_->AdvanceNowMicroseconds(100);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
source_->DidFinishFrame(0);
task_runner_->RunUntilIdle();
}
@@ -390,7 +391,7 @@ TEST_F(BackToBackBeginFrameSourceTest,
source_->SetNeedsBeginFrames(true);
task_runner_->RunUntilIdle();
- now_src_->AdvanceNowMicroseconds(100);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
source_->DidFinishFrame(0);
source_->SetNeedsBeginFrames(false);
@@ -404,14 +405,14 @@ TEST_F(BackToBackBeginFrameSourceTest,
source_->SetNeedsBeginFrames(true);
task_runner_->RunUntilIdle();
- now_src_->AdvanceNowMicroseconds(100);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
source_->SetNeedsBeginFrames(false);
- now_src_->AdvanceNowMicroseconds(10);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
source_->DidFinishFrame(0);
- now_src_->AdvanceNowMicroseconds(10);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
source_->SetNeedsBeginFrames(false);
- now_src_->AdvanceNowMicroseconds(10);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
source_->SetNeedsBeginFrames(true);
EXPECT_BEGIN_FRAME_USED(*obs_, 1130, 1130 + kDeadline, kInterval);
@@ -425,13 +426,13 @@ TEST_F(BackToBackBeginFrameSourceTest,
source_->SetNeedsBeginFrames(true);
task_runner_->RunUntilIdle();
- now_src_->AdvanceNowMicroseconds(100);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
source_->DidFinishFrame(0);
- now_src_->AdvanceNowMicroseconds(10);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
source_->SetNeedsBeginFrames(false);
- now_src_->AdvanceNowMicroseconds(10);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
source_->SetNeedsBeginFrames(true);
- now_src_->AdvanceNowMicroseconds(10);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
EXPECT_BEGIN_FRAME_USED(*obs_, 1130, 1130 + kDeadline, kInterval);
EXPECT_TRUE(task_runner_->HasPendingTasks());
@@ -449,7 +450,7 @@ TEST_F(BackToBackBeginFrameSourceTest, DidFinishFrameRemainingFrames) {
source_->SetNeedsBeginFrames(true);
task_runner_->RunUntilIdle();
- now_src_->AdvanceNowMicroseconds(100);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
source_->DidFinishFrame(3);
EXPECT_FALSE(task_runner_->HasPendingTasks());
@@ -469,14 +470,14 @@ TEST_F(BackToBackBeginFrameSourceTest, DidFinishFrameMultipleCallsIdempotent) {
EXPECT_BEGIN_FRAME_USED(*obs_, 1000, 1000 + kDeadline, kInterval);
task_runner_->RunUntilIdle();
- now_src_->AdvanceNowMicroseconds(100);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
source_->DidFinishFrame(0);
source_->DidFinishFrame(0);
source_->DidFinishFrame(0);
EXPECT_BEGIN_FRAME_USED(*obs_, 1100, 1100 + kDeadline, kInterval);
task_runner_->RunUntilIdle();
- now_src_->AdvanceNowMicroseconds(100);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
source_->DidFinishFrame(0);
source_->DidFinishFrame(0);
source_->DidFinishFrame(0);
@@ -489,9 +490,9 @@ TEST_F(BackToBackBeginFrameSourceTest, DelayInPostedTaskProducesCorrectFrame) {
source_->SetNeedsBeginFrames(true);
task_runner_->RunUntilIdle();
- now_src_->AdvanceNowMicroseconds(100);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
source_->DidFinishFrame(0);
- now_src_->AdvanceNowMicroseconds(50);
+ now_src_->Advance(base::TimeDelta::FromMicroseconds(50));
EXPECT_BEGIN_FRAME_USED(*obs_, 1150, 1150 + kDeadline, kInterval);
EXPECT_TRUE(task_runner_->HasPendingTasks());
@@ -501,17 +502,19 @@ TEST_F(BackToBackBeginFrameSourceTest, DelayInPostedTaskProducesCorrectFrame) {
// SyntheticBeginFrameSource testing ------------------------------------------
class SyntheticBeginFrameSourceTest : public ::testing::Test {
public:
- scoped_refptr<TestNowSource> now_src_;
+ scoped_ptr<base::SimpleTestTickClock> now_src_;
scoped_refptr<OrderedSimpleTaskRunner> task_runner_;
scoped_ptr<TestSyntheticBeginFrameSource> source_;
scoped_ptr<MockBeginFrameObserver> obs_;
void SetUp() override {
- now_src_ = TestNowSource::Create(1000);
+ now_src_ = make_scoped_ptr(new base::SimpleTestTickClock());
mithro-old 2015/06/04 07:41:10 I think this should be? now_src_.reset(new base:
Ankur Verma 2015/06/05 14:39:16 Done.
+ now_src_->Advance(base::TimeDelta::FromInternalValue(1000));
task_runner_ =
- make_scoped_refptr(new OrderedSimpleTaskRunner(now_src_, false));
+ make_scoped_refptr(new OrderedSimpleTaskRunner(now_src_.get(), false));
source_ = TestSyntheticBeginFrameSource::Create(
- now_src_, task_runner_.get(), base::TimeDelta::FromMicroseconds(10000));
+ now_src_.get(), task_runner_.get(),
+ base::TimeDelta::FromMicroseconds(10000));
obs_ = make_scoped_ptr(new MockBeginFrameObserver());
source_->AddObserver(obs_.get());
}
@@ -521,7 +524,7 @@ class SyntheticBeginFrameSourceTest : public ::testing::Test {
TEST_F(SyntheticBeginFrameSourceTest,
SetNeedsBeginFramesCallsOnBeginFrameWithMissedTick) {
- now_src_->SetNowMicroseconds(10010);
+ now_src_->Advance(base::TimeDelta::FromInternalValue(9010));
EXPECT_CALL((*obs_), OnBeginFrame(CreateBeginFrameArgsForTesting(
BEGINFRAME_FROM_HERE, 10000, 20000, 10000,
BeginFrameArgs::MISSED)));
@@ -535,7 +538,7 @@ TEST_F(SyntheticBeginFrameSourceTest,
EXPECT_EQ(10000, task_runner_->NextTaskTime().ToInternalValue());
EXPECT_BEGIN_FRAME_USED(*obs_, 10000, 20000, 10000);
- now_src_->SetNowMicroseconds(10010);
+ now_src_->Advance(base::TimeDelta::FromInternalValue(9010));
task_runner_->RunPendingTasks();
}
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/scheduler/scheduler_unittest.cc » ('j') | cc/scheduler/scheduler_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698