De-Element ScriptLoader

third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp

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 36b17fac2f3e53a7bd56a2fdc1146c72bd85e8dd..6677c901361673956ff9fa08fe8c9983fb2ea5f7 100644
--- a/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptRunnerTest.cpp
@@ -5,7 +5,6 @@
 #include "core/dom/ScriptRunner.h"
 
 #include "core/dom/Document.h"
-#include "core/dom/Element.h"
 #include "core/dom/ScriptLoader.h"
 #include "platform/heap/Handle.h"
 #include "platform/testing/TestingPlatformSupport.h"
@@ -24,24 +23,21 @@ namespace blink {
 
 class MockScriptLoader final : public ScriptLoader {
  public:
-  static MockScriptLoader* create(Element* element) {
-    return new MockScriptLoader(element);
-  }
+  static MockScriptLoader* create() { return new MockScriptLoader(); }
   ~MockScriptLoader() override {}
 
   MOCK_METHOD0(execute, void());
   MOCK_CONST_METHOD0(isReady, bool());
 
  private:
-  explicit MockScriptLoader(Element* element)
-      : ScriptLoader(element, false, false, false) {}
+  // ScriptLoader is given a nullptr ScriptLoaderClient here, since
+  // ScriptRunner doesn't appear to depend on it or the associated element.

[hiroshige, 2017/03/01 00:58:14]

Instead of nullptr ScriptLoaderClient, how about supplying a mock
ScriptLoaderClient (StrictMock in gmock, i.e. every unintended calls to
ScriptLoaderClient leads to test failure), in order to keep the invariant that
"ScriptLoader::m_client is always non-null".

The mock ScriptLoaderClient will be useful in the future, e.g. when writing unit
tests of ScriptLoader.

[Nate Chapin, 2017/03/01 21:34:59]

Done.

+  explicit MockScriptLoader() : ScriptLoader(nullptr, false, false, false) {}
 };
 
 class ScriptRunnerTest : public testing::Test {
  public:
-  ScriptRunnerTest()
-      : m_document(Document::create()),
-        m_element(m_document->createElement("foo")) {}
+  ScriptRunnerTest() : m_document(Document::create()) {}
 
   void SetUp() override {
     // We have to create ScriptRunner after initializing platform, because we
@@ -54,7 +50,6 @@ class ScriptRunnerTest : public testing::Test {
 
  protected:
   Persistent<Document> m_document;
-  Persistent<Element> m_element;
   Persistent<ScriptRunner> m_scriptRunner;
   WTF::Vector<int> m_order;
   ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
@@ -62,7 +57,7 @@ class ScriptRunnerTest : public testing::Test {
 };
 
 TEST_F(ScriptRunnerTest, QueueSingleScript_Async) {
-  MockScriptLoader* scriptLoader = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader = MockScriptLoader::create();
   m_scriptRunner->queueScriptForExecution(scriptLoader, ScriptRunner::Async);
   m_scriptRunner->notifyScriptReady(scriptLoader, ScriptRunner::Async);
 
@@ -71,7 +66,7 @@ TEST_F(ScriptRunnerTest, QueueSingleScript_Async) {
 }
 
 TEST_F(ScriptRunnerTest, QueueSingleScript_InOrder) {
-  MockScriptLoader* scriptLoader = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader = MockScriptLoader::create();
   m_scriptRunner->queueScriptForExecution(scriptLoader, ScriptRunner::InOrder);
 
   EXPECT_CALL(*scriptLoader, isReady()).WillOnce(Return(true));
@@ -83,9 +78,9 @@ TEST_F(ScriptRunnerTest, QueueSingleScript_InOrder) {
 }
 
 TEST_F(ScriptRunnerTest, QueueMultipleScripts_InOrder) {
-  MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader1 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader2 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader3 = MockScriptLoader::create();
 
   HeapVector<Member<MockScriptLoader>> scriptLoaders;
   scriptLoaders.push_back(scriptLoader1);
@@ -122,11 +117,11 @@ TEST_F(ScriptRunnerTest, QueueMultipleScripts_InOrder) {
 }
 
 TEST_F(ScriptRunnerTest, QueueMixedScripts) {
-  MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader4 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader5 = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader1 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader2 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader3 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader4 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader5 = MockScriptLoader::create();
 
   m_scriptRunner->queueScriptForExecution(scriptLoader1, ScriptRunner::InOrder);
   m_scriptRunner->queueScriptForExecution(scriptLoader2, ScriptRunner::InOrder);
@@ -171,9 +166,9 @@ TEST_F(ScriptRunnerTest, QueueMixedScripts) {
 }
 
 TEST_F(ScriptRunnerTest, QueueReentrantScript_Async) {
-  MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader1 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader2 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader3 = MockScriptLoader::create();
 
   m_scriptRunner->queueScriptForExecution(scriptLoader1, ScriptRunner::Async);
   m_scriptRunner->queueScriptForExecution(scriptLoader2, ScriptRunner::Async);
@@ -209,9 +204,9 @@ TEST_F(ScriptRunnerTest, QueueReentrantScript_Async) {
 }
 
 TEST_F(ScriptRunnerTest, QueueReentrantScript_InOrder) {
-  MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader1 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader2 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader3 = MockScriptLoader::create();
 
   EXPECT_CALL(*scriptLoader1, isReady()).WillRepeatedly(Return(true));
   EXPECT_CALL(*scriptLoader2, isReady()).WillRepeatedly(Return(true));
@@ -260,7 +255,7 @@ TEST_F(ScriptRunnerTest, QueueReentrantScript_ManyAsyncScripts) {
     scriptLoaders[i] = nullptr;
 
   for (int i = 0; i < 20; i++) {
-    scriptLoaders[i] = MockScriptLoader::create(m_element.get());
+    scriptLoaders[i] = MockScriptLoader::create();
     EXPECT_CALL(*scriptLoaders[i], isReady()).WillRepeatedly(Return(true));
 
     m_scriptRunner->queueScriptForExecution(scriptLoaders[i],
@@ -293,9 +288,9 @@ TEST_F(ScriptRunnerTest, QueueReentrantScript_ManyAsyncScripts) {
 }
 
 TEST_F(ScriptRunnerTest, ResumeAndSuspend_InOrder) {
-  MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader1 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader2 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader3 = MockScriptLoader::create();
 
   m_scriptRunner->queueScriptForExecution(scriptLoader1, ScriptRunner::InOrder);
   m_scriptRunner->queueScriptForExecution(scriptLoader2, ScriptRunner::InOrder);
@@ -335,9 +330,9 @@ TEST_F(ScriptRunnerTest, ResumeAndSuspend_InOrder) {
 }
 
 TEST_F(ScriptRunnerTest, ResumeAndSuspend_Async) {
-  MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader3 = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader1 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader2 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader3 = MockScriptLoader::create();
 
   m_scriptRunner->queueScriptForExecution(scriptLoader1, ScriptRunner::Async);
   m_scriptRunner->queueScriptForExecution(scriptLoader2, ScriptRunner::Async);
@@ -367,8 +362,8 @@ TEST_F(ScriptRunnerTest, ResumeAndSuspend_Async) {
 }
 
 TEST_F(ScriptRunnerTest, LateNotifications) {
-  MockScriptLoader* scriptLoader1 = MockScriptLoader::create(m_element.get());
-  MockScriptLoader* scriptLoader2 = MockScriptLoader::create(m_element.get());
+  MockScriptLoader* scriptLoader1 = MockScriptLoader::create();
+  MockScriptLoader* scriptLoader2 = MockScriptLoader::create();
 
   EXPECT_CALL(*scriptLoader1, isReady()).WillRepeatedly(Return(true));
   EXPECT_CALL(*scriptLoader2, isReady()).WillRepeatedly(Return(true));
@@ -395,10 +390,8 @@ TEST_F(ScriptRunnerTest, LateNotifications) {
 }
 
 TEST_F(ScriptRunnerTest, TasksWithDeadScriptRunner) {
-  Persistent<MockScriptLoader> scriptLoader1 =
-      MockScriptLoader::create(m_element.get());
-  Persistent<MockScriptLoader> scriptLoader2 =
-      MockScriptLoader::create(m_element.get());
+  Persistent<MockScriptLoader> scriptLoader1 = MockScriptLoader::create();
+  Persistent<MockScriptLoader> scriptLoader2 = MockScriptLoader::create();
 
   EXPECT_CALL(*scriptLoader1, isReady()).WillRepeatedly(Return(true));
   EXPECT_CALL(*scriptLoader2, isReady()).WillRepeatedly(Return(true));