Chrome OS: Use Manager.DefaultService for Default Network

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 76ccc49680eae51ece01a5368e41cc7e42034d14..cb6288e1fe1c68ea702992fbdca39dfc7e7933b6 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -358,20 +358,28 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceChanged) {
       DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
   ASSERT_TRUE(service_test);
 
-  // Change the default network by  changing the state of eth1 to Idle which
-  // should re-sort Manager.Services.
   const std::string eth1 = kShillManagerClientStubDefaultService;
+  // The default service should be eth1. There should have been one initial plus
+  // one additional default network change signal.
+  EXPECT_EQ(eth1, test_observer_->default_network());
+  EXPECT_EQ(2u, test_observer_->default_network_change_count());
+
+  // Change the default network by changing Manager.DefaultService.
   const std::string wifi1 = kShillManagerClientStubDefaultWireless;
-  base::StringValue connection_state_idle_value(shill::kStateIdle);
-  service_test->SetServiceProperty(eth1, shill::kStateProperty,
-                                   connection_state_idle_value);
+  base::StringValue wifi1_value(wifi1);
+  manager_test->SetManagerProperty(shill::kDefaultServiceProperty, wifi1_value);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(wifi1, test_observer_->default_network());
-  EXPECT_EQ(shill::kStateOnline,
+  EXPECT_EQ(3u, test_observer_->default_network_change_count());
+
+  // Change the state of the default network.
+  base::StringValue connection_state_ready_value(shill::kStateReady);
+  service_test->SetServiceProperty(wifi1, shill::kStateProperty,
+                                   connection_state_ready_value);
+  message_loop_.RunUntilIdle();
+  EXPECT_EQ(shill::kStateReady,
             test_observer_->default_network_connection_state());
-  // We should have seen 2 default network updates - for the default
-  // service change, and for the state change.
-  EXPECT_EQ(2u, test_observer_->default_network_change_count());
+  EXPECT_EQ(4u, test_observer_->default_network_change_count());

[pneubeck (no reviews), 2014/02/24 09:22:58]

nit: instead of counting indefinitely upwards, could you reset the count in
"default_network_change_count()" ?

[stevenjb, 2014/02/24 23:59:42]

Done.

 
   // Updating a property on the default network should trigger
   // a default network change.
@@ -380,7 +388,7 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceChanged) {
       shill::kSecurityProperty, base::StringValue("TestSecurity"),
       base::Bind(&base::DoNothing), base::Bind(&ErrorCallbackFunction));
   message_loop_.RunUntilIdle();
-  EXPECT_EQ(3u, test_observer_->default_network_change_count());
+  EXPECT_EQ(5u, test_observer_->default_network_change_count());
 
   // No default network updates for signal strength changes.
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
@@ -388,7 +396,7 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceChanged) {
       shill::kSignalStrengthProperty, base::FundamentalValue(32),
       base::Bind(&base::DoNothing), base::Bind(&ErrorCallbackFunction));
   message_loop_.RunUntilIdle();
-  EXPECT_EQ(3u, test_observer_->default_network_change_count());
+  EXPECT_EQ(5u, test_observer_->default_network_change_count());
 }
 
 TEST_F(NetworkStateHandlerTest, RequestUpdate) {