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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp

Issue 2588403002: TestingPlatformSupport: register Platform instance correctly (Closed)
Patch Set: new plan Created 3 years, 11 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/core/dom/IdleDeadlineTest.cpp ('k') | third_party/WebKit/Source/core/fetch/ResourceTest.cpp » ('j') | third_party/WebKit/Source/platform/TimerTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
diff --git a/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp b/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
index fe174e6cfb452b117281c0f51a396748e1cb7f34..69bf0036322d33aa890de3ad45bc4769cb7bf3b3 100644
--- a/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
@@ -43,33 +43,35 @@ class ScriptRunnerTest : public testing::Test {
: m_document(Document::create()),
m_element(m_document->createElement("foo")) {}
- void SetUp() override {
Takashi Toyoshima 2017/01/12 08:56:13 This change is unfortunate, but I have no better i
- // We have to create ScriptRunner after initializing platform, because we
- // need Platform::current()->currentThread()->scheduler()->
- // loadingTaskRunner() to be initialized before creating ScriptRunner to
- // save it in constructor.
- m_scriptRunner = ScriptRunner::create(m_document.get());
- }
-
void TearDown() override { m_scriptRunner.release(); }
Persistent<Document> m_document;
Persistent<Element> m_element;
- TestingPlatformSupportWithMockScheduler m_platform;
Persistent<ScriptRunner> m_scriptRunner;
WTF::Vector<int> m_order;
};
TEST_F(ScriptRunnerTest, QueueSingleScript_Async) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ // We have to create ScriptRunner after initializing platform, because we need
+ // Platform::current()->currentThread()->scheduler()->loadingTaskRunner() to
+ // be initialized before creating ScriptRunner to save it in constructor.
+ m_scriptRunner = ScriptRunner::create(m_document.get());
haraken 2017/01/12 11:21:00 It might be slightly cleaner to move this logic in
Takashi Toyoshima 2017/01/12 12:13:01 Done.
+
MockScriptLoader* scriptLoader = MockScriptLoader::create(m_element.get());
m_scriptRunner->queueScriptForExecution(scriptLoader, ScriptRunner::Async);
m_scriptRunner->notifyScriptReady(scriptLoader, ScriptRunner::Async);
EXPECT_CALL(*scriptLoader, execute());
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
}
TEST_F(ScriptRunnerTest, QueueSingleScript_InOrder) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoader = MockScriptLoader::create(m_element.get());
m_scriptRunner->queueScriptForExecution(scriptLoader, ScriptRunner::InOrder);
@@ -78,10 +80,14 @@ TEST_F(ScriptRunnerTest, QueueSingleScript_InOrder) {
m_scriptRunner->notifyScriptReady(scriptLoader, ScriptRunner::InOrder);
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
}
TEST_F(ScriptRunnerTest, QueueMultipleScripts_InOrder) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
@@ -113,7 +119,7 @@ TEST_F(ScriptRunnerTest, QueueMultipleScripts_InOrder) {
for (int i = 2; i >= 0; i--) {
isReady[i] = true;
m_scriptRunner->notifyScriptReady(scriptLoaders[i], ScriptRunner::InOrder);
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
}
// But ensure the scripts were run in the expected order.
@@ -121,6 +127,10 @@ TEST_F(ScriptRunnerTest, QueueMultipleScripts_InOrder) {
}
TEST_F(ScriptRunnerTest, QueueMixedScripts) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
@@ -163,13 +173,17 @@ TEST_F(ScriptRunnerTest, QueueMixedScripts) {
m_order.push_back(5);
}));
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
// Async tasks are expected to run first.
EXPECT_THAT(m_order, ElementsAre(4, 5, 1, 2, 3));
}
TEST_F(ScriptRunnerTest, QueueReentrantScript_Async) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
@@ -197,17 +211,21 @@ TEST_F(ScriptRunnerTest, QueueReentrantScript_Async) {
// Make sure that re-entrant calls to notifyScriptReady don't cause
// ScriptRunner::execute to do more work than expected.
- m_platform.runSingleTask();
+ platform->runSingleTask();
EXPECT_THAT(m_order, ElementsAre(1));
- m_platform.runSingleTask();
+ platform->runSingleTask();
EXPECT_THAT(m_order, ElementsAre(1, 2));
- m_platform.runSingleTask();
+ platform->runSingleTask();
EXPECT_THAT(m_order, ElementsAre(1, 2, 3));
}
TEST_F(ScriptRunnerTest, QueueReentrantScript_InOrder) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
@@ -243,17 +261,21 @@ TEST_F(ScriptRunnerTest, QueueReentrantScript_InOrder) {
// Make sure that re-entrant calls to queueScriptForExecution don't cause
// ScriptRunner::execute to do more work than expected.
- m_platform.runSingleTask();
+ platform->runSingleTask();
EXPECT_THAT(m_order, ElementsAre(1));
- m_platform.runSingleTask();
+ platform->runSingleTask();
EXPECT_THAT(m_order, ElementsAre(1, 2));
- m_platform.runSingleTask();
+ platform->runSingleTask();
EXPECT_THAT(m_order, ElementsAre(1, 2, 3));
}
TEST_F(ScriptRunnerTest, QueueReentrantScript_ManyAsyncScripts) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoaders[20];
for (int i = 0; i < 20; i++)
scriptLoaders[i] = nullptr;
@@ -283,7 +305,7 @@ TEST_F(ScriptRunnerTest, QueueReentrantScript_ManyAsyncScripts) {
m_order.push_back(0);
}));
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
int expected[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
@@ -292,6 +314,10 @@ TEST_F(ScriptRunnerTest, QueueReentrantScript_ManyAsyncScripts) {
}
TEST_F(ScriptRunnerTest, ResumeAndSuspend_InOrder) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
@@ -324,16 +350,20 @@ TEST_F(ScriptRunnerTest, ResumeAndSuspend_InOrder) {
EXPECT_CALL(*scriptLoader3, isReady()).WillRepeatedly(Return(true));
m_scriptRunner->notifyScriptReady(scriptLoader3, ScriptRunner::InOrder);
- m_platform.runSingleTask();
+ platform->runSingleTask();
m_scriptRunner->suspend();
m_scriptRunner->resume();
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
// Make sure elements are correct and in right order.
EXPECT_THAT(m_order, ElementsAre(1, 2, 3));
}
TEST_F(ScriptRunnerTest, ResumeAndSuspend_Async) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
@@ -356,16 +386,20 @@ TEST_F(ScriptRunnerTest, ResumeAndSuspend_Async) {
m_order.push_back(3);
}));
- m_platform.runSingleTask();
+ platform->runSingleTask();
m_scriptRunner->suspend();
m_scriptRunner->resume();
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
// Make sure elements are correct.
EXPECT_THAT(m_order, WhenSorted(ElementsAre(1, 2, 3)));
}
TEST_F(ScriptRunnerTest, LateNotifications) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
@@ -383,17 +417,21 @@ TEST_F(ScriptRunnerTest, LateNotifications) {
}));
m_scriptRunner->notifyScriptReady(scriptLoader1, ScriptRunner::InOrder);
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
// At this moment all tasks can be already executed. Make sure that we do not
// crash here.
m_scriptRunner->notifyScriptReady(scriptLoader2, ScriptRunner::InOrder);
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
EXPECT_THAT(m_order, ElementsAre(1, 2));
}
TEST_F(ScriptRunnerTest, TasksWithDeadScriptRunner) {
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ platform;
+ m_scriptRunner = ScriptRunner::create(m_document.get());
+
Persistent<MockScriptLoader> scriptLoader1 =
MockScriptLoader::create(m_element.get());
Persistent<MockScriptLoader> scriptLoader2 =
@@ -417,7 +455,7 @@ TEST_F(ScriptRunnerTest, TasksWithDeadScriptRunner) {
EXPECT_CALL(*scriptLoader1, execute()).Times(0);
EXPECT_CALL(*scriptLoader2, execute()).Times(0);
- m_platform.runUntilIdle();
+ platform->runUntilIdle();
}
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/dom/IdleDeadlineTest.cpp ('k') | third_party/WebKit/Source/core/fetch/ResourceTest.cpp » ('j') | third_party/WebKit/Source/platform/TimerTest.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698