commit b925cc8f481d21fddd9569fc68861f6e5b6e3eae
author Chris Masone <cmasone@chromium.org> Wed Jun 22 15:39:57 2011 -0700
committer Chris Masone <cmasone@chromium.org> Fri Jun 24 11:26:09 2011 -0700
tree 114efb732f5a56011bed40ec316979f45df1bd37
parent c39f1134c8f1ca15324a7eb2ba9ccc243bc82531

[shill] Add properties to Manager, Device and subclasses. Clean up unit tests

1) Pull much of the properties stuff (the maps, Register*(), Contains()) up
   into PropertyStore, and make it a class, not an interface.
2) Add proper property stuff to Manager and Device.  Move Cellular- and Wifi-
   specific properties to Cellular, CellularService, WiFi, WiFiService as
   appropriate.
3) clean up unit tests.

BUG=chromium-os:16343
TEST=unit tests

Change-Id: Iba88f384a5fbe383608cb79fa2134d978f1b81e8
Reviewed-on: http://gerrit.chromium.org/gerrit/3136
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

manager.h

diff --git a/manager.h b/manager.h
index bcfe6b4..bd1c82d 100644
--- a/manager.h
+++ b/manager.h
@@ -13,7 +13,7 @@
 
 #include "shill/device.h"
 #include "shill/device_info.h"
-#include "shill/property_store_interface.h"
+#include "shill/property_store.h"
 #include "shill/service.h"
 #include "shill/shill_event.h"
 
@@ -24,7 +24,7 @@
 class EventDispatcher;
 class ManagerAdaptorInterface;
 
-class Manager : public PropertyStoreInterface {
+class Manager : public PropertyStore {
  public:
   // A constructor for the Manager object
   Manager(ControlInterface *control_interface,
@@ -44,8 +44,7 @@
 
   ServiceRefPtr FindService(const std::string& name);
 
-  // Implementation of PropertyStoreInterface
-  virtual bool Contains(const std::string &property);
+  // Implementation of PropertyStore
   virtual bool SetBoolProperty(const std::string &name,
                                bool value,
                                Error *error);
@@ -53,17 +52,32 @@
                                  const std::string &value,
                                  Error *error);
 
+ protected:
+  void RegisterDerivedString(const std::string &name,
+                             std::string(Manager::*get)(void),
+                             bool(Manager::*set)(const std::string&));
+  void RegisterDerivedStrings(
+      const std::string &name,
+      std::vector<std::string>(Manager::*get)(void),
+      bool(Manager::*set)(const std::vector<std::string>&));
+
  private:
+  std::string CalculateState();
+  std::vector<std::string> AvailableTechnologies();
+  std::vector<std::string> ConnectedTechnologies();
+  std::string DefaultTechnology();
+  std::vector<std::string> EnabledTechnologies();
+
   scoped_ptr<ManagerAdaptorInterface> adaptor_;
   DeviceInfo device_info_;
   bool running_;
-  std::vector<std::string> known_properties_;
   std::vector<DeviceRefPtr> devices_;
   std::vector<ServiceRefPtr> services_;
 
-  // Properties to be get/set via PropertyStoreInterface calls.
+  // Properties to be get/set via PropertyStore calls.
   bool offline_mode_;
   std::string state_;
+  std::string check_portal_list_;
   std::string country_;
   std::string portal_url_;