third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner_unittest.cc - Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner_unittest.cc

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)

Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 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 | « third_party/WebKit/Source/platform/scheduler/renderer/budget_pool_unittest.cc ('k') | third_party/WebKit/Source/platform/scheduler/renderer/idle_time_estimator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner_unittest.cc

diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner_unittest.cc

index 635eb195192dbab7d10ebe4be279bfaf17313599..64c47bde63dbc85d47be46fff18bdf13b9c75cab 100644

--- a/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner_unittest.cc

+++ b/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner_unittest.cc

@@ -14,7 +14,7 @@

namespace blink {

namespace scheduler {

-class DeadlineTaskRunnerTest : public testing::Test {

+class DeadlineTaskRunnerTest : public ::testing::Test {

public:

DeadlineTaskRunnerTest() {}

~DeadlineTaskRunnerTest() override {}

@@ -45,7 +45,7 @@ TEST_F(DeadlineTaskRunnerTest, RunOnce) {

deadline_task_runner_->SetDeadline(FROM_HERE, delay, clock_->NowTicks());

RunUntilIdle();

- EXPECT_THAT(run_times_, testing::ElementsAre(start_time + delay));

+ EXPECT_THAT(run_times_, ::testing::ElementsAre(start_time + delay));

};

TEST_F(DeadlineTaskRunnerTest, RunTwice) {

@@ -59,7 +59,7 @@ TEST_F(DeadlineTaskRunnerTest, RunTwice) {

deadline_task_runner_->SetDeadline(FROM_HERE, delay2, clock_->NowTicks());

RunUntilIdle();

- EXPECT_THAT(run_times_, testing::ElementsAre(deadline1, deadline2));

+ EXPECT_THAT(run_times_, ::testing::ElementsAre(deadline1, deadline2));

};

TEST_F(DeadlineTaskRunnerTest, EarlierDeadlinesTakePrecidence) {

@@ -73,7 +73,7 @@ TEST_F(DeadlineTaskRunnerTest, EarlierDeadlinesTakePrecidence) {

RunUntilIdle();

- EXPECT_THAT(run_times_, testing::ElementsAre(start_time + delay1));

+ EXPECT_THAT(run_times_, ::testing::ElementsAre(start_time + delay1));

};

TEST_F(DeadlineTaskRunnerTest, LaterDeadlinesIgnored) {

@@ -85,7 +85,7 @@ TEST_F(DeadlineTaskRunnerTest, LaterDeadlinesIgnored) {

RunUntilIdle();

- EXPECT_THAT(run_times_, testing::ElementsAre(start_time + delay100));

+ EXPECT_THAT(run_times_, ::testing::ElementsAre(start_time + delay100));

};

TEST_F(DeadlineTaskRunnerTest, DeleteDeadlineTaskRunnerAfterPosting) {