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

Unified Diff: third_party/WebKit/Source/platform/scheduler/base/queueing_time_estimator_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

« no previous file with comments | « third_party/WebKit/Source/platform/scheduler/base/intrusive_heap_unittest.cc ('k') | third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scheduler/base/queueing_time_estimator_unittest.cc

diff --git a/third_party/WebKit/Source/platform/scheduler/base/queueing_time_estimator_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/queueing_time_estimator_unittest.cc

index 1a5fa904b14926df48e8946128f60f42bac30a98..8bff10a8eb2d0d141b31ef1bf8b749a5fdf07ba2 100644

--- a/third_party/WebKit/Source/platform/scheduler/base/queueing_time_estimator_unittest.cc

+++ b/third_party/WebKit/Source/platform/scheduler/base/queueing_time_estimator_unittest.cc

@@ -11,7 +11,7 @@

namespace blink {

namespace scheduler {

-using QueueingTimeEstimatorTest = testing::Test;

+using QueueingTimeEstimatorTest = ::testing::Test;

class TestQueueingTimeEstimatorClient : public QueueingTimeEstimator::Client {

public:

@@ -58,7 +58,7 @@ TEST_F(QueueingTimeEstimatorTest, AllTasksWithinWindow) {

estimator.OnTopLevelTaskCompleted(time);

EXPECT_THAT(client.expected_queueing_times(),

- testing::ElementsAre(base::TimeDelta::FromMilliseconds(300)));

+ ::testing::ElementsAre(base::TimeDelta::FromMilliseconds(300)));

}

// One 20 second long task, starting 3 seconds into the first window.

@@ -90,11 +90,11 @@ TEST_F(QueueingTimeEstimatorTest, MultiWindowTask) {

estimator.OnTopLevelTaskCompleted(time);

EXPECT_THAT(client.expected_queueing_times(),

- testing::ElementsAre(base::TimeDelta::FromMilliseconds(7600),

- base::TimeDelta::FromMilliseconds(15500),

- base::TimeDelta::FromMilliseconds(10500),

- base::TimeDelta::FromMilliseconds(5500),

- base::TimeDelta::FromMilliseconds(900)));

+ ::testing::ElementsAre(base::TimeDelta::FromMilliseconds(7600),

+ base::TimeDelta::FromMilliseconds(15500),

+ base::TimeDelta::FromMilliseconds(10500),

+ base::TimeDelta::FromMilliseconds(5500),

+ base::TimeDelta::FromMilliseconds(900)));

}

// The main thread is considered unresponsive during a single long task. In this

@@ -253,11 +253,11 @@ TEST_F(QueueingTimeEstimatorTest, IgnoresTasksWithNestedMessageLoops) {

estimator.OnTopLevelTaskCompleted(time);

EXPECT_THAT(client.expected_queueing_times(),

- testing::ElementsAre(base::TimeDelta::FromMilliseconds(0),

- base::TimeDelta::FromMilliseconds(0),

- base::TimeDelta::FromMilliseconds(100)));

+ ::testing::ElementsAre(base::TimeDelta::FromMilliseconds(0),

+ base::TimeDelta::FromMilliseconds(0),

+ base::TimeDelta::FromMilliseconds(100)));

}

// If a task is too long, we assume it's invalid. Perhaps the user's machine

@@ -290,14 +290,14 @@ TEST_F(QueueingTimeEstimatorTest, IgnoreExtremelyLongTasks) {

estimator.OnTopLevelTaskCompleted(time);

EXPECT_THAT(client.expected_queueing_times(),

- testing::ElementsAre(base::TimeDelta::FromMilliseconds(100),

- base::TimeDelta::FromMilliseconds(0),

- base::TimeDelta::FromMilliseconds(100)));

+ ::testing::ElementsAre(base::TimeDelta::FromMilliseconds(100),

+ base::TimeDelta::FromMilliseconds(0),

+ base::TimeDelta::FromMilliseconds(100)));

}

// ^ Instantaneous queuing time

@@ -330,16 +330,16 @@ TEST_F(QueueingTimeEstimatorTest, SlidingWindowOverOneTask) {

estimator.OnTopLevelTaskCompleted(time);

EXPECT_THAT(client.expected_queueing_times(),

- testing::ElementsAre(base::TimeDelta::FromMilliseconds(900),

- base::TimeDelta::FromMilliseconds(1600),

- base::TimeDelta::FromMilliseconds(2100),

- base::TimeDelta::FromMilliseconds(2400),

- base::TimeDelta::FromMilliseconds(2500),

- base::TimeDelta::FromMilliseconds(1600),

- base::TimeDelta::FromMilliseconds(900),

- base::TimeDelta::FromMilliseconds(400),

- base::TimeDelta::FromMilliseconds(100),

- base::TimeDelta::FromMilliseconds(0)));

+ ::testing::ElementsAre(base::TimeDelta::FromMilliseconds(900),

+ base::TimeDelta::FromMilliseconds(1600),

+ base::TimeDelta::FromMilliseconds(2100),

+ base::TimeDelta::FromMilliseconds(2400),

+ base::TimeDelta::FromMilliseconds(2500),

+ base::TimeDelta::FromMilliseconds(1600),

+ base::TimeDelta::FromMilliseconds(900),

+ base::TimeDelta::FromMilliseconds(400),

+ base::TimeDelta::FromMilliseconds(100),

+ base::TimeDelta::FromMilliseconds(0)));

}

// ^ Instantaneous queuing time

@@ -388,7 +388,7 @@ TEST_F(QueueingTimeEstimatorTest, SlidingWindowOverTwoTasksWithinFirstWindow) {

base::TimeDelta::FromMilliseconds(100),

base::TimeDelta::FromMilliseconds(0)};

EXPECT_THAT(client.expected_queueing_times(),

- testing::ElementsAreArray(expected_durations));

+ ::testing::ElementsAreArray(expected_durations));

}

// ^ Instantaneous queuing time

@@ -445,7 +445,7 @@ TEST_F(QueueingTimeEstimatorTest,

base::TimeDelta::FromMilliseconds(0)};

EXPECT_THAT(client.expected_queueing_times(),

- testing::ElementsAreArray(expected_durations));

+ ::testing::ElementsAreArray(expected_durations));

}

} // namespace scheduler