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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/page/NetworkStateNotifierTest.cpp

Issue 2704083002: Remove Page dependency from NetworkStateNotifier (Closed)
Patch Set: nullcheck for tests Created 3 years, 10 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/page/NetworkStateNotifier.cpp ('k') | third_party/WebKit/Source/core/page/Page.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/page/NetworkStateNotifierTest.cpp
diff --git a/third_party/WebKit/Source/core/page/NetworkStateNotifierTest.cpp b/third_party/WebKit/Source/core/page/NetworkStateNotifierTest.cpp
index 8a6d4949605aa9ef2b4b360e9c7d894c411dcce6..d441622eb3963b1c2b2ac58a4d1d11b2dfdeb41e 100644
--- a/third_party/WebKit/Source/core/page/NetworkStateNotifierTest.cpp
+++ b/third_party/WebKit/Source/core/page/NetworkStateNotifierTest.cpp
@@ -52,6 +52,7 @@ class StateObserver : public NetworkStateNotifier::NetworkStateObserver {
StateObserver()
: m_observedType(WebConnectionTypeNone),
m_observedMaxBandwidthMbps(0.0),
+ m_observedOnLineState(false),
m_callbackCount(0) {}
virtual void connectionChange(WebConnectionType type,
@@ -64,10 +65,17 @@ class StateObserver : public NetworkStateNotifier::NetworkStateObserver {
(*m_closure)();
}
+ virtual void onLineStateChange(bool onLine) {
+ m_observedOnLineState = onLine;
+ m_callbackCount += 1;
+
+ if (m_closure)
+ (*m_closure)();
+ }
+
WebConnectionType observedType() const { return m_observedType; }
-
double observedMaxBandwidth() const { return m_observedMaxBandwidthMbps; }
-
+ bool observedOnLineState() const { return m_observedOnLineState; }
int callbackCount() const { return m_callbackCount; }
void setNotificationCallback(std::unique_ptr<WTF::Closure> closure) {
@@ -78,6 +86,7 @@ class StateObserver : public NetworkStateNotifier::NetworkStateObserver {
std::unique_ptr<WTF::Closure> m_closure;
WebConnectionType m_observedType;
double m_observedMaxBandwidthMbps;
+ bool m_observedOnLineState;
int m_callbackCount;
};
@@ -88,6 +97,7 @@ class NetworkStateNotifierTest : public ::testing::Test {
// Initialize connection, so that future calls to setWebConnection issue
// notifications.
m_notifier.setWebConnection(WebConnectionTypeUnknown, 0.0);
+ m_notifier.setOnLine(false);
}
WebTaskRunner* getTaskRunner() {
@@ -103,19 +113,25 @@ class NetworkStateNotifierTest : public ::testing::Test {
m_notifier.setWebConnection(type, maxBandwidthMbps);
testing::runPendingTasks();
}
+ void setOnLine(bool onLine) {
+ m_notifier.setOnLine(onLine);
+ testing::runPendingTasks();
+ }
void addObserverOnNotification(StateObserver* observer,
StateObserver* observerToAdd) {
observer->setNotificationCallback(
- bind(&NetworkStateNotifier::addObserver, WTF::unretained(&m_notifier),
- WTF::unretained(observerToAdd), WTF::unretained(getTaskRunner())));
+ bind(&NetworkStateNotifier::addConnectionObserver,
+ WTF::unretained(&m_notifier), WTF::unretained(observerToAdd),
+ WTF::unretained(getTaskRunner())));
}
void removeObserverOnNotification(StateObserver* observer,
StateObserver* observerToRemove) {
- observer->setNotificationCallback(bind(
- &NetworkStateNotifier::removeObserver, WTF::unretained(&m_notifier),
- WTF::unretained(observerToRemove), WTF::unretained(getTaskRunner())));
+ observer->setNotificationCallback(
+ bind(&NetworkStateNotifier::removeConnectionObserver,
+ WTF::unretained(&m_notifier), WTF::unretained(observerToRemove),
+ WTF::unretained(getTaskRunner())));
}
bool verifyObservations(const StateObserver& observer,
@@ -134,7 +150,7 @@ class NetworkStateNotifierTest : public ::testing::Test {
TEST_F(NetworkStateNotifierTest, AddObserver) {
StateObserver observer;
- m_notifier.addObserver(&observer, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer, getTaskRunner());
EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeNone,
kNoneMaxBandwidthMbps));
@@ -146,9 +162,9 @@ TEST_F(NetworkStateNotifierTest, AddObserver) {
TEST_F(NetworkStateNotifierTest, RemoveObserver) {
StateObserver observer1, observer2;
- m_notifier.addObserver(&observer1, getTaskRunner());
- m_notifier.removeObserver(&observer1, getTaskRunner());
- m_notifier.addObserver(&observer2, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer2, getTaskRunner());
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone,
@@ -159,8 +175,8 @@ TEST_F(NetworkStateNotifierTest, RemoveObserver) {
TEST_F(NetworkStateNotifierTest, RemoveSoleObserver) {
StateObserver observer1;
- m_notifier.addObserver(&observer1, getTaskRunner());
- m_notifier.removeObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone,
@@ -169,7 +185,7 @@ TEST_F(NetworkStateNotifierTest, RemoveSoleObserver) {
TEST_F(NetworkStateNotifierTest, AddObserverWhileNotifying) {
StateObserver observer1, observer2;
- m_notifier.addObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
addObserverOnNotification(&observer1, &observer2);
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
@@ -181,7 +197,7 @@ TEST_F(NetworkStateNotifierTest, AddObserverWhileNotifying) {
TEST_F(NetworkStateNotifierTest, RemoveSoleObserverWhileNotifying) {
StateObserver observer1;
- m_notifier.addObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
removeObserverOnNotification(&observer1, &observer1);
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
@@ -195,8 +211,8 @@ TEST_F(NetworkStateNotifierTest, RemoveSoleObserverWhileNotifying) {
TEST_F(NetworkStateNotifierTest, RemoveCurrentObserverWhileNotifying) {
StateObserver observer1, observer2;
- m_notifier.addObserver(&observer1, getTaskRunner());
- m_notifier.addObserver(&observer2, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer2, getTaskRunner());
removeObserverOnNotification(&observer1, &observer1);
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
@@ -214,8 +230,8 @@ TEST_F(NetworkStateNotifierTest, RemoveCurrentObserverWhileNotifying) {
TEST_F(NetworkStateNotifierTest, RemovePastObserverWhileNotifying) {
StateObserver observer1, observer2;
- m_notifier.addObserver(&observer1, getTaskRunner());
- m_notifier.addObserver(&observer2, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer2, getTaskRunner());
removeObserverOnNotification(&observer2, &observer1);
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
@@ -231,9 +247,9 @@ TEST_F(NetworkStateNotifierTest, RemovePastObserverWhileNotifying) {
TEST_F(NetworkStateNotifierTest, RemoveFutureObserverWhileNotifying) {
StateObserver observer1, observer2, observer3;
- m_notifier.addObserver(&observer1, getTaskRunner());
- m_notifier.addObserver(&observer2, getTaskRunner());
- m_notifier.addObserver(&observer3, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer2, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer3, getTaskRunner());
removeObserverOnNotification(&observer1, &observer2);
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
@@ -247,8 +263,8 @@ TEST_F(NetworkStateNotifierTest, RemoveFutureObserverWhileNotifying) {
TEST_F(NetworkStateNotifierTest, MultipleContextsAddObserver) {
StateObserver observer1, observer2;
- m_notifier.addObserver(&observer1, getTaskRunner());
- m_notifier.addObserver(&observer2, getTaskRunner2());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer2, getTaskRunner2());
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
@@ -259,9 +275,9 @@ TEST_F(NetworkStateNotifierTest, MultipleContextsAddObserver) {
TEST_F(NetworkStateNotifierTest, RemoveContext) {
StateObserver observer1, observer2;
- m_notifier.addObserver(&observer1, getTaskRunner());
- m_notifier.addObserver(&observer2, getTaskRunner2());
- m_notifier.removeObserver(&observer2, getTaskRunner2());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer2, getTaskRunner2());
+ m_notifier.removeConnectionObserver(&observer2, getTaskRunner2());
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeBluetooth,
@@ -272,10 +288,10 @@ TEST_F(NetworkStateNotifierTest, RemoveContext) {
TEST_F(NetworkStateNotifierTest, RemoveAllContexts) {
StateObserver observer1, observer2;
- m_notifier.addObserver(&observer1, getTaskRunner());
- m_notifier.addObserver(&observer2, getTaskRunner2());
- m_notifier.removeObserver(&observer1, getTaskRunner());
- m_notifier.removeObserver(&observer2, getTaskRunner2());
+ m_notifier.addConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer2, getTaskRunner2());
+ m_notifier.removeConnectionObserver(&observer1, getTaskRunner());
+ m_notifier.removeConnectionObserver(&observer2, getTaskRunner2());
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone,
@@ -286,7 +302,7 @@ TEST_F(NetworkStateNotifierTest, RemoveAllContexts) {
TEST_F(NetworkStateNotifierTest, SetOverride) {
StateObserver observer;
- m_notifier.addObserver(&observer, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer, getTaskRunner());
m_notifier.setOnLine(true);
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
@@ -324,12 +340,12 @@ TEST_F(NetworkStateNotifierTest, SetOverride) {
EXPECT_EQ(WebConnectionTypeNone, m_notifier.connectionType());
EXPECT_EQ(kNoneMaxBandwidthMbps, m_notifier.maxBandwidth());
- m_notifier.removeObserver(&observer, getTaskRunner());
+ m_notifier.removeConnectionObserver(&observer, getTaskRunner());
}
TEST_F(NetworkStateNotifierTest, NoExtraNotifications) {
StateObserver observer;
- m_notifier.addObserver(&observer, getTaskRunner());
+ m_notifier.addConnectionObserver(&observer, getTaskRunner());
setConnection(WebConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeBluetooth,
@@ -352,7 +368,7 @@ TEST_F(NetworkStateNotifierTest, NoExtraNotifications) {
kBluetoothMaxBandwidthMbps));
EXPECT_EQ(observer.callbackCount(), 3);
- m_notifier.removeObserver(&observer, getTaskRunner());
+ m_notifier.removeConnectionObserver(&observer, getTaskRunner());
}
TEST_F(NetworkStateNotifierTest, NoNotificationOnInitialization) {
@@ -360,15 +376,18 @@ TEST_F(NetworkStateNotifierTest, NoNotificationOnInitialization) {
Persistent<Document> document(Document::create());
StateObserver observer;
- notifier.addObserver(&observer, getTaskRunner());
+ notifier.addConnectionObserver(&observer, getTaskRunner());
+ notifier.addOnLineObserver(&observer, getTaskRunner());
testing::runPendingTasks();
EXPECT_EQ(observer.callbackCount(), 0);
notifier.setWebConnection(WebConnectionTypeBluetooth,
kBluetoothMaxBandwidthMbps);
+ notifier.setOnLine(true);
testing::runPendingTasks();
EXPECT_EQ(observer.callbackCount(), 0);
+ notifier.setOnLine(true);
notifier.setWebConnection(WebConnectionTypeBluetooth,
kBluetoothMaxBandwidthMbps);
testing::runPendingTasks();
@@ -380,6 +399,66 @@ TEST_F(NetworkStateNotifierTest, NoNotificationOnInitialization) {
EXPECT_EQ(observer.callbackCount(), 1);
EXPECT_EQ(observer.observedType(), WebConnectionTypeEthernet);
EXPECT_EQ(observer.observedMaxBandwidth(), kEthernetMaxBandwidthMbps);
+
+ notifier.setOnLine(false);
+ testing::runPendingTasks();
+ EXPECT_EQ(observer.callbackCount(), 2);
+ EXPECT_FALSE(observer.observedOnLineState());
+}
+
+TEST_F(NetworkStateNotifierTest, OnLineNotification) {
+ StateObserver observer;
+ m_notifier.addOnLineObserver(&observer, getTaskRunner());
+
+ setOnLine(true);
+ testing::runPendingTasks();
+ EXPECT_TRUE(observer.observedOnLineState());
+ EXPECT_EQ(observer.callbackCount(), 1);
+
+ setOnLine(false);
+ testing::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();
+ EXPECT_TRUE(observer1.observedOnLineState());
+ EXPECT_TRUE(observer2.observedOnLineState());
+ EXPECT_EQ(observer1.callbackCount(), 1);
+ EXPECT_EQ(observer2.callbackCount(), 1);
+
+ m_notifier.setOnLine(false);
+ testing::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();
+ 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
« no previous file with comments | « third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp ('k') | third_party/WebKit/Source/core/page/Page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698