Move NetworkStateNotifier from core (and web) into platform/network

third_party/WebKit/Source/platform/network/NetworkStateNotifierTest.cpp

 /*
  * Copyright (c) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "core/page/NetworkStateNotifier.h"
+#include "platform/network/NetworkStateNotifier.h"
 
-#include "core/dom/Document.h"
-#include "core/dom/TaskRunnerHelper.h"
+#include "platform/scheduler/test/fake_web_task_runner.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebConnectionType.h"
 #include "public/platform/WebThread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/Functional.h"
 
 namespace blink {
 
+using scheduler::FakeWebTaskRunner;
+
 namespace {
 const double kNoneMaxBandwidthMbps = 0.0;
 const double kBluetoothMaxBandwidthMbps = 1.0;
 const double kEthernetMaxBandwidthMbps = 2.0;
 }
 
 class StateObserver : public NetworkStateNotifier::NetworkStateObserver {
  public:
   StateObserver()
       : m_observedType(WebConnectionTypeNone),
@@ skipping 32 matching lines @@
   std::unique_ptr<WTF::Closure> m_closure;
   WebConnectionType m_observedType;
   double m_observedMaxBandwidthMbps;
   bool m_observedOnLineState;
   int m_callbackCount;
 };
 
 class NetworkStateNotifierTest : public ::testing::Test {
  public:
   NetworkStateNotifierTest()
-      : m_document(Document::create()), m_document2(Document::create()) {
+      : m_taskRunner(adoptRef(new FakeWebTaskRunner())),
+        m_taskRunner2(adoptRef(new FakeWebTaskRunner())) {
     // Initialize connection, so that future calls to setWebConnection issue
     // notifications.
     m_notifier.setWebConnection(WebConnectionTypeUnknown, 0.0);
     m_notifier.setOnLine(false);
   }
 
-  WebTaskRunner* getTaskRunner() {
-    return TaskRunnerHelper::get(TaskType::Networking, m_document.get()).get();
-  }
+  WebTaskRunner* getTaskRunner() { return m_taskRunner.get(); }
+  WebTaskRunner* getTaskRunner2() { return m_taskRunner2.get(); }
 
-  WebTaskRunner* getTaskRunner2() {
-    return TaskRunnerHelper::get(TaskType::Networking, m_document2.get()).get();
+  void TearDown() override {
+    runPendingTasks();
+    m_taskRunner = nullptr;
+    m_taskRunner2 = nullptr;
   }
 
  protected:
+  void runPendingTasks() {
+    m_taskRunner->runUntilIdle();
+    m_taskRunner2->runUntilIdle();
+  }
+
   void setConnection(WebConnectionType type, double maxBandwidthMbps) {
     m_notifier.setWebConnection(type, maxBandwidthMbps);
-    testing::runPendingTasks();
+    runPendingTasks();
   }
   void setOnLine(bool onLine) {
     m_notifier.setOnLine(onLine);
-    testing::runPendingTasks();
+    runPendingTasks();
   }
 
   void addObserverOnNotification(StateObserver* observer,
                                  StateObserver* observerToAdd) {
     observer->setNotificationCallback(
         bind(&NetworkStateNotifier::addConnectionObserver,
              WTF::unretained(&m_notifier), WTF::unretained(observerToAdd),
              WTF::unretained(getTaskRunner())));
   }
 
   void removeObserverOnNotification(StateObserver* observer,
                                     StateObserver* observerToRemove) {
     observer->setNotificationCallback(
         bind(&NetworkStateNotifier::removeConnectionObserver,
              WTF::unretained(&m_notifier), WTF::unretained(observerToRemove),
              WTF::unretained(getTaskRunner())));
   }
 
   bool verifyObservations(const StateObserver& observer,
                           WebConnectionType type,
                           double maxBandwidthMbps) {
     EXPECT_EQ(observer.observedType(), type);
     EXPECT_EQ(observer.observedMaxBandwidth(), maxBandwidthMbps);
     return observer.observedType() == type &&
            observer.observedMaxBandwidth() == maxBandwidthMbps;
   }
 
-  Persistent<Document> m_document;
-  Persistent<Document> m_document2;
+  RefPtr<FakeWebTaskRunner> m_taskRunner;
+  RefPtr<FakeWebTaskRunner> m_taskRunner2;
   NetworkStateNotifier m_notifier;
 };
 
 TEST_F(NetworkStateNotifierTest, AddObserver) {
   StateObserver observer;
   m_notifier.addConnectionObserver(&observer, getTaskRunner());
   EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeNone,
                                  kNoneMaxBandwidthMbps));
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_EQ(observer.callbackCount(), 1);
+  m_notifier.removeConnectionObserver(&observer, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveObserver) {
   StateObserver observer1, observer2;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
   m_notifier.addConnectionObserver(&observer2, getTaskRunner());
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone,
                                  kNoneMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
+  m_notifier.removeConnectionObserver(&observer2, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveSoleObserver) {
   StateObserver observer1;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone,
                                  kNoneMaxBandwidthMbps));
 }
 
 TEST_F(NetworkStateNotifierTest, AddObserverWhileNotifying) {
   StateObserver observer1, observer2;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   addObserverOnNotification(&observer1, &observer2);
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
+  m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
+  m_notifier.removeConnectionObserver(&observer2, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveSoleObserverWhileNotifying) {
   StateObserver observer1;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   removeObserverOnNotification(&observer1, &observer1);
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
@@ skipping 13 matching lines @@
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
 
   setConnection(WebConnectionTypeEthernet, kEthernetMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeEthernet,
                                  kEthernetMaxBandwidthMbps));
+
+  m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
+  m_notifier.removeConnectionObserver(&observer2, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, RemovePastObserverWhileNotifying) {
   StateObserver observer1, observer2;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   m_notifier.addConnectionObserver(&observer2, getTaskRunner());
   removeObserverOnNotification(&observer2, &observer1);
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_EQ(observer1.observedType(), WebConnectionTypeBluetooth);
   EXPECT_EQ(observer2.observedType(), WebConnectionTypeBluetooth);
 
   setConnection(WebConnectionTypeEthernet, kEthernetMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeEthernet,
                                  kEthernetMaxBandwidthMbps));
+
+  m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
+  m_notifier.removeConnectionObserver(&observer2, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveFutureObserverWhileNotifying) {
   StateObserver observer1, observer2, observer3;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   m_notifier.addConnectionObserver(&observer2, getTaskRunner());
   m_notifier.addConnectionObserver(&observer3, getTaskRunner());
   removeObserverOnNotification(&observer1, &observer2);
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeNone,
                                  kNoneMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer3, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
+
+  m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
+  m_notifier.removeConnectionObserver(&observer2, getTaskRunner());
+  m_notifier.removeConnectionObserver(&observer3, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, MultipleContextsAddObserver) {
   StateObserver observer1, observer2;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   m_notifier.addConnectionObserver(&observer2, getTaskRunner2());
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
+
+  m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
+  m_notifier.removeConnectionObserver(&observer2, getTaskRunner());

[sof, 2017/03/06 06:43:03]

getTaskRunner2() 

[sof, 2017/03/06 06:53:21]

..but why are explicit removals now needed?

[kinuko, 2017/03/06 07:39:02]

Done.

 }
 
 TEST_F(NetworkStateNotifierTest, RemoveContext) {
   StateObserver observer1, observer2;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   m_notifier.addConnectionObserver(&observer2, getTaskRunner2());
   m_notifier.removeConnectionObserver(&observer2, getTaskRunner2());
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeNone,
                                  kNoneMaxBandwidthMbps));
+
+  m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveAllContexts) {
   StateObserver observer1, observer2;
   m_notifier.addConnectionObserver(&observer1, getTaskRunner());
   m_notifier.addConnectionObserver(&observer2, getTaskRunner2());
   m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
   m_notifier.removeConnectionObserver(&observer2, getTaskRunner2());
 
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
@@ skipping 10 matching lines @@
   m_notifier.setOnLine(true);
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_TRUE(m_notifier.onLine());
   EXPECT_EQ(WebConnectionTypeBluetooth, m_notifier.connectionType());
   EXPECT_EQ(kBluetoothMaxBandwidthMbps, m_notifier.maxBandwidth());
 
   m_notifier.setOverride(true, WebConnectionTypeEthernet,
                          kEthernetMaxBandwidthMbps);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeEthernet,
                                  kEthernetMaxBandwidthMbps));
   EXPECT_TRUE(m_notifier.onLine());
   EXPECT_EQ(WebConnectionTypeEthernet, m_notifier.connectionType());
   EXPECT_EQ(kEthernetMaxBandwidthMbps, m_notifier.maxBandwidth());
 
   // When override is active, calls to setOnLine and setConnection are temporary
   // ignored.
   m_notifier.setOnLine(false);
   setConnection(WebConnectionTypeNone, kNoneMaxBandwidthMbps);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeEthernet,
                                  kEthernetMaxBandwidthMbps));
   EXPECT_TRUE(m_notifier.onLine());
   EXPECT_EQ(WebConnectionTypeEthernet, m_notifier.connectionType());
   EXPECT_EQ(kEthernetMaxBandwidthMbps, m_notifier.maxBandwidth());
 
   m_notifier.clearOverride();
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeNone,
                                  kNoneMaxBandwidthMbps));
   EXPECT_FALSE(m_notifier.onLine());
   EXPECT_EQ(WebConnectionTypeNone, m_notifier.connectionType());
   EXPECT_EQ(kNoneMaxBandwidthMbps, m_notifier.maxBandwidth());
 
   m_notifier.removeConnectionObserver(&observer, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, NoExtraNotifications) {
@@ skipping 19 matching lines @@
   setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
   EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeBluetooth,
                                  kBluetoothMaxBandwidthMbps));
   EXPECT_EQ(observer.callbackCount(), 3);
 
   m_notifier.removeConnectionObserver(&observer, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, NoNotificationOnInitialization) {
   NetworkStateNotifier notifier;
-  Persistent<Document> document(Document::create());
   StateObserver observer;
 
   notifier.addConnectionObserver(&observer, getTaskRunner());
   notifier.addOnLineObserver(&observer, getTaskRunner());
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_EQ(observer.callbackCount(), 0);
 
   notifier.setWebConnection(WebConnectionTypeBluetooth,
                             kBluetoothMaxBandwidthMbps);
   notifier.setOnLine(true);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_EQ(observer.callbackCount(), 0);
 
   notifier.setOnLine(true);
   notifier.setWebConnection(WebConnectionTypeBluetooth,
                             kBluetoothMaxBandwidthMbps);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_EQ(observer.callbackCount(), 0);
 
   notifier.setWebConnection(WebConnectionTypeEthernet,
                             kEthernetMaxBandwidthMbps);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_EQ(observer.callbackCount(), 1);
   EXPECT_EQ(observer.observedType(), WebConnectionTypeEthernet);
   EXPECT_EQ(observer.observedMaxBandwidth(), kEthernetMaxBandwidthMbps);
 
   notifier.setOnLine(false);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_EQ(observer.callbackCount(), 2);
   EXPECT_FALSE(observer.observedOnLineState());
+
+  m_notifier.removeConnectionObserver(&observer, getTaskRunner());
+  m_notifier.removeOnLineObserver(&observer, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, OnLineNotification) {
   StateObserver observer;
   m_notifier.addOnLineObserver(&observer, getTaskRunner());
 
   setOnLine(true);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_TRUE(observer.observedOnLineState());
   EXPECT_EQ(observer.callbackCount(), 1);
 
   setOnLine(false);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_FALSE(observer.observedOnLineState());
   EXPECT_EQ(observer.callbackCount(), 2);
 
   m_notifier.removeConnectionObserver(&observer, getTaskRunner());
 }
 
 TEST_F(NetworkStateNotifierTest, MultipleObservers) {
   StateObserver observer1;
   StateObserver observer2;
 
   // Observer1 observes online state, Observer2 observes both.
   m_notifier.addOnLineObserver(&observer1, getTaskRunner());
   m_notifier.addConnectionObserver(&observer2, getTaskRunner());
   m_notifier.addOnLineObserver(&observer2, getTaskRunner());
 
   m_notifier.setOnLine(true);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_TRUE(observer1.observedOnLineState());
   EXPECT_TRUE(observer2.observedOnLineState());
   EXPECT_EQ(observer1.callbackCount(), 1);
   EXPECT_EQ(observer2.callbackCount(), 1);
 
   m_notifier.setOnLine(false);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_FALSE(observer1.observedOnLineState());
   EXPECT_FALSE(observer2.observedOnLineState());
   EXPECT_EQ(observer1.callbackCount(), 2);
   EXPECT_EQ(observer2.callbackCount(), 2);
 
   m_notifier.setOnLine(true);
   m_notifier.setWebConnection(WebConnectionTypeEthernet,
                               kEthernetMaxBandwidthMbps);
-  testing::runPendingTasks();
+  runPendingTasks();
   EXPECT_TRUE(observer1.observedOnLineState());
   EXPECT_TRUE(observer2.observedOnLineState());
   EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeEthernet,
                                  kEthernetMaxBandwidthMbps));
   EXPECT_EQ(observer1.callbackCount(), 3);
   EXPECT_EQ(observer2.callbackCount(), 4);
 
   m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
   m_notifier.removeConnectionObserver(&observer2, getTaskRunner());
 }
 
 }  // namespace blink