[CrOS Tether] Add tether network properties (battery percentage, carrier, and signal strength) to t…

chromeos/network/network_state_handler_unittest.cc

Index: chromeos/network/network_state_handler_unittest.cc
diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc
index f0bee4599629bd32136b746fc44770c443eabdaa..0cec4e4b1cf173b532eda12094481cba0ece3dce 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -339,6 +339,12 @@ TEST_F(NetworkStateHandlerTest, GetNetworkList) {
   EXPECT_EQ(kNumShillManagerClientStubImplServices + 1,
             test_observer_->network_count());
 
+  // Add two tether networks.
+  network_state_handler_->AddTetherNetworkState(kTetherGuid1, kTetherName1);
+  network_state_handler_->AddTetherNetworkState(kTetherGuid2, kTetherName2);
+  EXPECT_EQ(kNumShillManagerClientStubImplServices + 3,
+            test_observer_->network_count());
+
   // Get all networks.
   NetworkStateHandler::NetworkStateList networks;
   network_state_handler_->GetNetworkListByType(NetworkTypePattern::Default(),
@@ -346,14 +352,24 @@ TEST_F(NetworkStateHandlerTest, GetNetworkList) {
                                                false /* visible_only */,
                                                0 /* no limit */,
                                                &networks);
-  EXPECT_EQ(kNumShillManagerClientStubImplServices + 1, networks.size());
-  // Limit number of results.
+  EXPECT_EQ(kNumShillManagerClientStubImplServices + 3, networks.size());
+  // Limit number of results, including only tether networks.
   network_state_handler_->GetNetworkListByType(NetworkTypePattern::Default(),
                                                false /* configured_only */,
                                                false /* visible_only */,
                                                2 /* limit */,
                                                &networks);
   EXPECT_EQ(2u, networks.size());
+  // Limit number of results, including more than only tether networks.
+  network_state_handler_->GetNetworkListByType(
+      NetworkTypePattern::Default(), false /* configured_only */,
+      false /* visible_only */, 4 /* limit */, &networks);
+  EXPECT_EQ(4u, networks.size());
+  // Get all tether networks.
+  network_state_handler_->GetNetworkListByType(
+      NetworkTypePattern::Tether(), false /* configured_only */,
+      false /* visible_only */, 0 /* no limit */, &networks);
+  EXPECT_EQ(2u, networks.size());
   // Get all wifi networks.
   network_state_handler_->GetNetworkListByType(NetworkTypePattern::WiFi(),
                                                false /* configured_only */,
@@ -367,16 +383,16 @@ TEST_F(NetworkStateHandlerTest, GetNetworkList) {
                                                true /* visible_only */,
                                                0 /* no limit */,
                                                &networks);
-  EXPECT_EQ(kNumShillManagerClientStubImplServices, networks.size());
+  EXPECT_EQ(kNumShillManagerClientStubImplServices + 2, networks.size());
   network_state_handler_->GetVisibleNetworkList(&networks);
-  EXPECT_EQ(kNumShillManagerClientStubImplServices, networks.size());
+  EXPECT_EQ(kNumShillManagerClientStubImplServices + 2, networks.size());
   // Get configured (profile) networks.
   network_state_handler_->GetNetworkListByType(NetworkTypePattern::Default(),
                                                true /* configured_only */,
                                                false /* visible_only */,
                                                0 /* no limit */,
                                                &networks);
-  EXPECT_EQ(1u, networks.size());
+  EXPECT_EQ(3u, networks.size());
 }
 
 TEST_F(NetworkStateHandlerTest, GetTetherNetworkList) {
@@ -391,12 +407,14 @@ TEST_F(NetworkStateHandlerTest, GetTetherNetworkList) {
   network_state_handler_->GetTetherNetworkList(0 /* no limit */,
                                                &tether_networks);
   EXPECT_EQ(1u, tether_networks.size());
+  EXPECT_TRUE(tether_networks[0]->connectable());
 
   network_state_handler_->AddTetherNetworkState(kTetherGuid2, kTetherName2);
 
   network_state_handler_->GetTetherNetworkList(0 /* no limit */,
                                                &tether_networks);
   EXPECT_EQ(2u, tether_networks.size());
+  EXPECT_TRUE(tether_networks[1]->connectable());
 
   network_state_handler_->GetTetherNetworkList(1 /* no limit */,
                                                &tether_networks);