Commit 1223c51e authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Renaming unit_test classes Mock* to not collide

IdleDeadlineTest and ScriptedIdleTaskControllerTest both use similarly
names mock classes, MockScheduler, MockThread and MockPlatform which
collide in jumbo builds where they are merged into the
same translation unit.

This patch gives the classes unique names.

R=fs@opera.com

Change-Id: I305cb3fbdfbd3b3b6fc7c18e8c3ceccf89da863e
Reviewed-on: https://chromium-review.googlesource.com/574487Reviewed-by: default avatarFredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#487066}
parent 69f2da3c
......@@ -12,10 +12,10 @@
namespace blink {
namespace {
class MockScheduler final : public WebScheduler {
class MockIdleDeadlineScheduler final : public WebScheduler {
public:
MockScheduler() {}
~MockScheduler() override {}
MockIdleDeadlineScheduler() {}
~MockIdleDeadlineScheduler() override {}
// WebScheduler implementation:
WebTaskRunner* LoadingTaskRunner() override { return nullptr; }
......@@ -40,30 +40,30 @@ class MockScheduler final : public WebScheduler {
scheduler::RendererScheduler::NavigatingFrameType) override {}
private:
DISALLOW_COPY_AND_ASSIGN(MockScheduler);
DISALLOW_COPY_AND_ASSIGN(MockIdleDeadlineScheduler);
};
class MockThread final : public WebThread {
class MockIdleDeadlineThread final : public WebThread {
public:
MockThread() {}
~MockThread() override {}
MockIdleDeadlineThread() {}
~MockIdleDeadlineThread() override {}
bool IsCurrentThread() const override { return true; }
WebScheduler* Scheduler() const override { return &scheduler_; }
private:
mutable MockScheduler scheduler_;
DISALLOW_COPY_AND_ASSIGN(MockThread);
mutable MockIdleDeadlineScheduler scheduler_;
DISALLOW_COPY_AND_ASSIGN(MockIdleDeadlineThread);
};
class MockPlatform : public TestingPlatformSupport {
class MockIdleDeadlinePlatform : public TestingPlatformSupport {
public:
MockPlatform() {}
~MockPlatform() override {}
MockIdleDeadlinePlatform() {}
~MockIdleDeadlinePlatform() override {}
WebThread* CurrentThread() override { return &thread_; }
private:
MockThread thread_;
DISALLOW_COPY_AND_ASSIGN(MockPlatform);
MockIdleDeadlineThread thread_;
DISALLOW_COPY_AND_ASSIGN(MockIdleDeadlinePlatform);
};
} // namespace
......@@ -96,7 +96,7 @@ TEST_F(IdleDeadlineTest, deadlineInPast) {
}
TEST_F(IdleDeadlineTest, yieldForHighPriorityWork) {
ScopedTestingPlatformSupport<MockPlatform> platform;
ScopedTestingPlatformSupport<MockIdleDeadlinePlatform> platform;
IdleDeadline* deadline =
IdleDeadline::Create(1.25, IdleDeadline::CallbackType::kCalledWhenIdle);
......
......@@ -16,10 +16,11 @@
namespace blink {
namespace {
class MockScheduler final : public WebScheduler {
class MockScriptedIdleTaskControllerScheduler final : public WebScheduler {
public:
MockScheduler(bool should_yield) : should_yield_(should_yield) {}
~MockScheduler() override {}
MockScriptedIdleTaskControllerScheduler(bool should_yield)
: should_yield_(should_yield) {}
~MockScriptedIdleTaskControllerScheduler() override {}
// WebScheduler implementation:
WebTaskRunner* LoadingTaskRunner() override { return nullptr; }
......@@ -56,13 +57,14 @@ class MockScheduler final : public WebScheduler {
bool should_yield_;
std::unique_ptr<WebThread::IdleTask> idle_task_;
DISALLOW_COPY_AND_ASSIGN(MockScheduler);
DISALLOW_COPY_AND_ASSIGN(MockScriptedIdleTaskControllerScheduler);
};
class MockThread final : public WebThread {
class MockScriptedIdleTaskControllerThread final : public WebThread {
public:
MockThread(bool should_yield) : scheduler_(should_yield) {}
~MockThread() override {}
MockScriptedIdleTaskControllerThread(bool should_yield)
: scheduler_(should_yield) {}
~MockScriptedIdleTaskControllerThread() override {}
bool IsCurrentThread() const override { return true; }
WebScheduler* Scheduler() const override { return &scheduler_; }
......@@ -70,22 +72,23 @@ class MockThread final : public WebThread {
bool HasIdleTask() const { return scheduler_.HasIdleTask(); }
private:
mutable MockScheduler scheduler_;
DISALLOW_COPY_AND_ASSIGN(MockThread);
mutable MockScriptedIdleTaskControllerScheduler scheduler_;
DISALLOW_COPY_AND_ASSIGN(MockScriptedIdleTaskControllerThread);
};
class MockPlatform : public TestingPlatformSupport {
class MockScriptedIdleTaskControllerPlatform : public TestingPlatformSupport {
public:
MockPlatform(bool should_yield) : thread_(should_yield) {}
~MockPlatform() override {}
MockScriptedIdleTaskControllerPlatform(bool should_yield)
: thread_(should_yield) {}
~MockScriptedIdleTaskControllerPlatform() override {}
WebThread* CurrentThread() override { return &thread_; }
void RunIdleTask() { thread_.RunIdleTask(); }
bool HasIdleTask() const { return thread_.HasIdleTask(); }
private:
MockThread thread_;
DISALLOW_COPY_AND_ASSIGN(MockPlatform);
MockScriptedIdleTaskControllerThread thread_;
DISALLOW_COPY_AND_ASSIGN(MockScriptedIdleTaskControllerPlatform);
};
class MockIdleRequestCallback : public IdleRequestCallback {
......@@ -104,7 +107,8 @@ class ScriptedIdleTaskControllerTest : public ::testing::Test {
};
TEST_F(ScriptedIdleTaskControllerTest, RunCallback) {
ScopedTestingPlatformSupport<MockPlatform, bool> platform(false);
ScopedTestingPlatformSupport<MockScriptedIdleTaskControllerPlatform, bool>
platform(false);
NullExecutionContext execution_context;
ScriptedIdleTaskController* controller =
ScriptedIdleTaskController::Create(execution_context_);
......@@ -123,7 +127,8 @@ TEST_F(ScriptedIdleTaskControllerTest, RunCallback) {
}
TEST_F(ScriptedIdleTaskControllerTest, DontRunCallbackWhenAskedToYield) {
ScopedTestingPlatformSupport<MockPlatform, bool> platform(true);
ScopedTestingPlatformSupport<MockScriptedIdleTaskControllerPlatform, bool>
platform(true);
NullExecutionContext execution_context;
ScriptedIdleTaskController* controller =
ScriptedIdleTaskController::Create(execution_context_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment