Provide IPConfigs in networkingPrivate.GetProperties

chromeos/network/shill_property_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/shill_property_handler.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 51 matching lines @@
     AddPropertyUpdate(shill::kServicesProperty, service_path);
   }
 
   virtual void UpdateDeviceProperty(
       const std::string& device_path,
       const std::string& key,
       const base::Value& value) OVERRIDE {
     AddPropertyUpdate(shill::kDevicesProperty, device_path);
   }
 
+  virtual void UpdateIPConfigProperties(
+      ManagedState::ManagedType type,
+      const std::string& path,
+      const std::string& ip_config_path,
+      const base::DictionaryValue& properties) OVERRIDE {
+    AddPropertyUpdate(shill::kIPConfigsProperty, ip_config_path);
+  }
+
   virtual void TechnologyListChanged() OVERRIDE {
     ++technology_list_updates_;
   }
 
   virtual void CheckPortalListChanged(
       const std::string& check_portal_list) OVERRIDE {
   }
 
   virtual void ManagedStateListChanged(
       ManagedState::ManagedType type) OVERRIDE {
@@ skipping 374 matching lines @@
   message_loop_.RunUntilIdle();
   // This is the initial property update.
   EXPECT_EQ(1, listener_->initial_property_updates(
       shill::kServicesProperty)[kTestServicePath1]);
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
       dbus::ObjectPath(kTestServicePath1),
       shill::kIPConfigProperty,
       base::StringValue(kTestIPConfigPath),
       base::Bind(&base::DoNothing), base::Bind(&ErrorCallbackFunction));
   message_loop_.RunUntilIdle();
-  // IPConfig property change on the service should trigger property updates for
-  // IP Address, DNS, prefixlen, and gateway.
-  EXPECT_EQ(4, listener_->property_updates(
-      shill::kServicesProperty)[kTestServicePath1]);
+  // IPConfig property change on the service should trigger an IPConfigs update.
+  EXPECT_EQ(1, listener_->property_updates(
+      shill::kIPConfigsProperty)[kTestIPConfigPath]);
 
   // Now, Add a new watched service with the IPConfig already set.
   const std::string kTestServicePath2("test_wifi_service2");
   AddServiceWithIPConfig(shill::kTypeWifi, kTestServicePath2,
                          shill::kStateIdle, kTestIPConfigPath, true);
   message_loop_.RunUntilIdle();
-  // A watched service with the IPConfig property already set must trigger
-  // property updates for IP Address, DNS, prefixlen, and gateway when added.
-  EXPECT_EQ(4, listener_->property_updates(
-      shill::kServicesProperty)[kTestServicePath2]);
+  // A watched service with the IPConfig property already set should trigger an
+  // additional IPConfigs update.
+  EXPECT_EQ(2, listener_->property_updates(
+      shill::kIPConfigsProperty)[kTestIPConfigPath]);
 }
 
 TEST_F(ShillPropertyHandlerTest, ShillPropertyHandlerServiceCompleteList) {
   // Add a new entry to the profile only (triggers a Services update).
   const std::string kTestServicePath1("stub_wifi_profile_only1");
   AddServiceToProfile(shill::kTypeWifi, kTestServicePath1, false);
   message_loop_.RunUntilIdle();
 
   // Update the Manager properties. This should trigger a single list update
   // for both Services and ServiceCompleteList, and a single property update
@@ skipping 44 matching lines @@
   message_loop_.RunUntilIdle();
   // Property change should trigger an update for the Network only; no
   // property updates pushed by Shill affect Favorites.
   EXPECT_EQ(2, listener_->property_updates(
       shill::kServicesProperty)[kTestServicePath2]);
   EXPECT_EQ(0, listener_->property_updates(
       shill::kServiceCompleteListProperty)[kTestServicePath2]);
 }
 
 }  // namespace chromeos