De-Element ScriptLoader

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "public/platform/Platform.h"
 #include "public/platform/WebViewScheduler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Invoke;
 using ::testing::ElementsAre;
 using ::testing::Return;
 using ::testing::WhenSorted;
 using ::testing::ElementsAreArray;
 
 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
     // 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(); }
 
  protected:
   Persistent<Document> m_document;
-  Persistent<Element> m_element;
   Persistent<ScriptRunner> m_scriptRunner;
   WTF::Vector<int> m_order;
   ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
       m_platform;
 };
 
 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);
 
   EXPECT_CALL(*scriptLoader, execute());
   m_platform->runUntilIdle();
 }
 
 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));
   EXPECT_CALL(*scriptLoader, execute());
 
   m_scriptRunner->notifyScriptReady(scriptLoader, ScriptRunner::InOrder);
 
   m_platform->runUntilIdle();
 }
 
 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);
   scriptLoaders.push_back(scriptLoader2);
   scriptLoaders.push_back(scriptLoader3);
 
   for (ScriptLoader* scriptLoader : scriptLoaders) {
     m_scriptRunner->queueScriptForExecution(scriptLoader,
                                             ScriptRunner::InOrder);
   }
@@ skipping 16 matching lines @@
     isReady[i] = true;
     m_scriptRunner->notifyScriptReady(scriptLoaders[i], ScriptRunner::InOrder);
     m_platform->runUntilIdle();
   }
 
   // But ensure the scripts were run in the expected order.
   EXPECT_THAT(m_order, ElementsAre(1, 2, 3));
 }
 
 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);
   m_scriptRunner->queueScriptForExecution(scriptLoader3, ScriptRunner::InOrder);
   m_scriptRunner->queueScriptForExecution(scriptLoader4, ScriptRunner::Async);
   m_scriptRunner->queueScriptForExecution(scriptLoader5, ScriptRunner::Async);
 
   EXPECT_CALL(*scriptLoader1, isReady()).WillRepeatedly(Return(true));
   EXPECT_CALL(*scriptLoader2, isReady()).WillRepeatedly(Return(false));
   m_scriptRunner->notifyScriptReady(scriptLoader1, ScriptRunner::InOrder);
@@ skipping 24 matching lines @@
     m_order.push_back(5);
   }));
 
   m_platform->runUntilIdle();
 
   // Async tasks are expected to run first.
   EXPECT_THAT(m_order, ElementsAre(4, 5, 1, 2, 3));
 }
 
 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);
   m_scriptRunner->queueScriptForExecution(scriptLoader3, ScriptRunner::Async);
   m_scriptRunner->notifyScriptReady(scriptLoader1, ScriptRunner::Async);
 
   MockScriptLoader* scriptLoader = scriptLoader2;
   EXPECT_CALL(*scriptLoader1, execute()).WillOnce(Invoke([scriptLoader, this] {
     m_order.push_back(1);
     m_scriptRunner->notifyScriptReady(scriptLoader, ScriptRunner::Async);
@@ skipping 15 matching lines @@
   EXPECT_THAT(m_order, ElementsAre(1));
 
   m_platform->runSingleTask();
   EXPECT_THAT(m_order, ElementsAre(1, 2));
 
   m_platform->runSingleTask();
   EXPECT_THAT(m_order, ElementsAre(1, 2, 3));
 }
 
 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));
   EXPECT_CALL(*scriptLoader3, isReady()).WillRepeatedly(Return(true));
 
   m_scriptRunner->queueScriptForExecution(scriptLoader1, ScriptRunner::InOrder);
   m_scriptRunner->notifyScriptReady(scriptLoader1, ScriptRunner::InOrder);
 
   MockScriptLoader* scriptLoader = scriptLoader2;
   EXPECT_CALL(*scriptLoader1, execute())
@@ skipping 28 matching lines @@
   m_platform->runSingleTask();
   EXPECT_THAT(m_order, ElementsAre(1, 2, 3));
 }
 
 TEST_F(ScriptRunnerTest, QueueReentrantScript_ManyAsyncScripts) {
   MockScriptLoader* scriptLoaders[20];
   for (int i = 0; i < 20; i++)
     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],
                                             ScriptRunner::Async);
 
     if (i > 0) {
       EXPECT_CALL(*scriptLoaders[i], execute()).WillOnce(Invoke([this, i] {
         m_order.push_back(i);
       }));
     }
@@ skipping 12 matching lines @@
 
   m_platform->runUntilIdle();
 
   int expected[] = {0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
                     10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
 
   EXPECT_THAT(m_order, testing::ElementsAreArray(expected));
 }
 
 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);
   m_scriptRunner->queueScriptForExecution(scriptLoader3, ScriptRunner::InOrder);
 
   EXPECT_CALL(*scriptLoader1, execute()).WillOnce(Invoke([this] {
     m_order.push_back(1);
   }));
   EXPECT_CALL(*scriptLoader2, execute()).WillOnce(Invoke([this] {
     m_order.push_back(2);
@@ skipping 19 matching lines @@
   m_platform->runSingleTask();
   m_scriptRunner->suspend();
   m_scriptRunner->resume();
   m_platform->runUntilIdle();
 
   // Make sure elements are correct and in right order.
   EXPECT_THAT(m_order, ElementsAre(1, 2, 3));
 }
 
 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);
   m_scriptRunner->queueScriptForExecution(scriptLoader3, ScriptRunner::Async);
 
   m_scriptRunner->notifyScriptReady(scriptLoader1, ScriptRunner::Async);
   m_scriptRunner->notifyScriptReady(scriptLoader2, ScriptRunner::Async);
   m_scriptRunner->notifyScriptReady(scriptLoader3, ScriptRunner::Async);
 
   EXPECT_CALL(*scriptLoader1, execute()).WillOnce(Invoke([this] {
     m_order.push_back(1);
   }));
   EXPECT_CALL(*scriptLoader2, execute()).WillOnce(Invoke([this] {
     m_order.push_back(2);
   }));
   EXPECT_CALL(*scriptLoader3, execute()).WillOnce(Invoke([this] {
     m_order.push_back(3);
   }));
 
   m_platform->runSingleTask();
   m_scriptRunner->suspend();
   m_scriptRunner->resume();
   m_platform->runUntilIdle();
 
   // Make sure elements are correct.
   EXPECT_THAT(m_order, WhenSorted(ElementsAre(1, 2, 3)));
 }
 
 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));
 
   m_scriptRunner->queueScriptForExecution(scriptLoader1, ScriptRunner::InOrder);
   m_scriptRunner->queueScriptForExecution(scriptLoader2, ScriptRunner::InOrder);
 
   EXPECT_CALL(*scriptLoader1, execute()).WillOnce(Invoke([this] {
     m_order.push_back(1);
   }));
   EXPECT_CALL(*scriptLoader2, execute()).WillOnce(Invoke([this] {
     m_order.push_back(2);
   }));
 
   m_scriptRunner->notifyScriptReady(scriptLoader1, ScriptRunner::InOrder);
   m_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();
 
   EXPECT_THAT(m_order, ElementsAre(1, 2));
 }
 
 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));
 
   m_scriptRunner->queueScriptForExecution(scriptLoader1, ScriptRunner::Async);
   m_scriptRunner->queueScriptForExecution(scriptLoader2, ScriptRunner::Async);
 
   m_scriptRunner->notifyScriptReady(scriptLoader1, ScriptRunner::Async);
   m_scriptRunner->notifyScriptReady(scriptLoader2, ScriptRunner::Async);
 
   m_scriptRunner.release();
 
   ThreadState::current()->collectAllGarbage();
 
   // m_scriptRunner is gone. We need to make sure that ScriptRunner::Task do not
   // access dead object.
   EXPECT_CALL(*scriptLoader1, execute()).Times(0);
   EXPECT_CALL(*scriptLoader2, execute()).Times(0);
 
   m_platform->runUntilIdle();
 }
 
 }  // namespace blink