Chrome OS: Use Manager.DefaultService for Default Network

chromeos/network/network_state_handler_unittest.cc

 // 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 "chromeos/network/network_state_handler.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 340 matching lines @@
 }
 
 TEST_F(NetworkStateHandlerTest, DefaultServiceChanged) {
   ShillManagerClient::TestInterface* manager_test =
       DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface();
   ASSERT_TRUE(manager_test);
   ShillServiceClient::TestInterface* service_test =
       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.
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
       dbus::ObjectPath(wifi1),
       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(
       dbus::ObjectPath(wifi1),
       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) {
   // Request an update for kShillManagerClientStubDefaultWireless.
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(
       kShillManagerClientStubDefaultWireless));
   network_state_handler_->RequestUpdateForNetwork(
       kShillManagerClientStubDefaultWireless);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(2, test_observer_->PropertyUpdatesForService(
       kShillManagerClientStubDefaultWireless));
 
   // Request an update for all networks.
   network_state_handler_->RequestUpdateForAllNetworks();
   message_loop_.RunUntilIdle();
   // kShillManagerClientStubDefaultWireless should now have 3 updates
   EXPECT_EQ(3, test_observer_->PropertyUpdatesForService(
       kShillManagerClientStubDefaultWireless));
   // Other networks should have 2 updates (inital + request).
   EXPECT_EQ(2, test_observer_->PropertyUpdatesForService(
       kShillManagerClientStubDefaultService));
   EXPECT_EQ(2, test_observer_->PropertyUpdatesForService(
       kShillManagerClientStubWireless2));
   EXPECT_EQ(2, test_observer_->PropertyUpdatesForService(
       kShillManagerClientStubCellular));
 }
 
 }  // namespace chromeos