commit 6515aabcd1fbbb9ff2090c9675c17eeef64e7474
author Chris Masone <cmasone@chromium.org> Wed Oct 12 16:19:09 2011 -0700
committer Gerrit <chrome-bot@google.com> Fri Oct 21 19:57:20 2011 -0700
tree 4654871364cc5c2aec8de64a64506cbe57788e49
parent f0aae10f69aa3b6083f0fcfb1b501f79a8b6b15e

[shill] Make profiles backed with StoreInterfaces

Rely on persistence of data in StoreInterface to maintain
Service/Device/IPConfig info for entities that are not
currently active, instead of maintaining lists in Profile
objects themselves.

BUG=chromium-os:17253
TEST=unit, run on device

Change-Id: I206f44ddf16c584354f8fcadb57032f047f33d0a
Reviewed-on: http://gerrit.chromium.org/gerrit/10024
Commit-Ready: Chris Masone <cmasone@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

default_profile_unittest.cc

diff --git a/default_profile_unittest.cc b/default_profile_unittest.cc
index 4e4fdca..0fcebb5 100644
--- a/default_profile_unittest.cc
+++ b/default_profile_unittest.cc
@@ -8,10 +8,13 @@
 #include <string>
 #include <vector>
 
+#include <base/file_path.h>
 #include <chromeos/dbus/service_constants.h>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include "shill/key_file_store.h"
+#include "shill/glib.h"
 #include "shill/manager.h"
 #include "shill/mock_control.h"
 #include "shill/mock_device.h"
@@ -31,7 +34,7 @@
   DefaultProfileTest()
       : profile_(new DefaultProfile(control_interface(),
                                     manager(),
-                                    FilePath(kTestStoragePath),
+                                    FilePath(storage_path()),
                                     properties_)),
         device_(new MockDevice(control_interface(),
                                dispatcher(),
@@ -43,9 +46,20 @@
 
   virtual ~DefaultProfileTest() {}
 
+  virtual void SetUp() {
+    PropertyStoreTest::SetUp();
+    FilePath final_path;
+    ASSERT_TRUE(profile_->GetStoragePath(&final_path));
+    scoped_ptr<KeyFileStore> storage(new KeyFileStore(&real_glib_));
+    storage->set_path(final_path);
+    ASSERT_TRUE(storage->Open());
+    profile_->set_storage(storage.release());  // Passes ownership.
+  }
+
  protected:
   static const char kTestStoragePath[];
 
+  GLib real_glib_;
   ProfileRefPtr profile_;
   scoped_refptr<MockDevice> device_;
   Manager::Properties properties_;
@@ -107,7 +121,7 @@
 TEST_F(DefaultProfileTest, GetStoragePath) {
   FilePath path;
   EXPECT_TRUE(profile_->GetStoragePath(&path));
-  EXPECT_EQ(string(kTestStoragePath) + "/default.profile", path.value());
+  EXPECT_EQ(storage_path() + "/default.profile", path.value());
 }
 
 }  // namespace shill