Add native-side unit test for Android NetworkChangeNotifier

net/android/network_change_notifier_android_unittest.cc

Index: net/android/network_change_notifier_android_unittest.cc
diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..42ee03ac02d752e1eeeba7067f1033ec833f3d36
--- /dev/null
+++ b/net/android/network_change_notifier_android_unittest.cc
@@ -0,0 +1,87 @@
+// Copyright (c) 2012 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 "net/android/network_change_notifier_android.h"
+
+#include "base/message_loop.h"
+#include "net/android/network_change_notifier_factory.h"
+#include "net/base/network_change_notifier.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace net {
+namespace android {
+
+namespace {
+
+class TestConnectionTypeObserver :
+    public net::NetworkChangeNotifier::ConnectionTypeObserver {
+ public:
+  TestConnectionTypeObserver() :
+      connection_type_has_been_changed_(false),
+      current_connection_(net::NetworkChangeNotifier::CONNECTION_UNKNOWN) {
+  }
+
+  void OnConnectionTypeChanged(
+      net::NetworkChangeNotifier::ConnectionType type) {
+    connection_type_has_been_changed_ = true;
+    current_connection_ = type;
+  }
+
+  bool connection_type_has_been_changed() const {
+    return connection_type_has_been_changed_;
+  }
+
+  net::NetworkChangeNotifier::ConnectionType current_connection() const {
+    return current_connection_;
+  }
+
+ private:
+  bool connection_type_has_been_changed_;
+  net::NetworkChangeNotifier::ConnectionType current_connection_;

[szym, 2012/09/14 19:07:29]

nit: DISALLOW_COPY_AND_ASSIGN(TestConnectionTypeObserver)

[gone, 2012/09/15 01:01:55]

Done.

+};
+
+}  // namespace
+
+class NetworkChangeNotifierAndroidTest : public testing::Test {
+ public:
+  NetworkChangeNotifierAndroidTest() : connection_type_observer_(NULL) {
+  }
+
+  virtual void SetUp() {

[szym, 2012/09/14 19:07:29]

Everything from here down can be protected:

[gone, 2012/09/15 01:01:55]

Done.

+    notifier_.reset(new net::android::NetworkChangeNotifier());

[szym, 2012/09/14 19:07:29]

You don't really need "net::android::" here. I understand if you want to avoid
confusion with net::NetworkChangeNotifier and I strongly suggest renaming it to
NetworkChangeNotifierAndroid.

[gone, 2012/09/15 01:01:55]

Renamed.

+    connection_type_observer_.reset(new TestConnectionTypeObserver());
+    net::NetworkChangeNotifier::AddConnectionTypeObserver(
+        connection_type_observer_.get());
+  }
+
+  net::android::NetworkChangeNotifier* notifier() {

[szym, 2012/09/14 19:07:29]

Rather than the getter I suggest a forwarding ForceConnectivityState method.
This would allow you to make the NCN method private and just friend
NetworkChangeNotifierAndroidTest.

[gone, 2012/09/15 01:01:55]

Done.

+    return notifier_.get();
+  }
+
+  TestConnectionTypeObserver* observer() {

[szym, 2012/09/14 19:07:29]

nit: const ... const?

[gone, 2012/09/15 01:01:55]

Done.

+    return connection_type_observer_.get();
+  }
+
+ private:
+  NetworkChangeNotifier::DisableForTest disable_for_test_;
+  scoped_ptr<net::android::NetworkChangeNotifier> notifier_;
+  scoped_ptr<TestConnectionTypeObserver> connection_type_observer_;
+};
+
+
+TEST_F(NetworkChangeNotifierAndroidTest, ObserverNotified) {
+  EXPECT_FALSE(observer()->connection_type_has_been_changed());
+  EXPECT_EQ(net::NetworkChangeNotifier::CONNECTION_UNKNOWN,
+      observer()->current_connection());
+
+  notifier()->ForceConnectivityState(false);
+  MessageLoop::current()->RunAllPending();
+
+  EXPECT_TRUE(observer()->connection_type_has_been_changed());
+  EXPECT_EQ(net::NetworkChangeNotifier::CONNECTION_NONE,
+      observer()->current_connection());
+}
+
+}  // namespace anrdoid
+}  // namespace net