[shill] Add code for persisting profiles and services to disk.
BUG=chromium-os:17253
TEST=unit
Change-Id: Ic6dbbcb10543da3f4615cb305a77f6b9b301e8bc
Reviewed-on: http://gerrit.chromium.org/gerrit/7633
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/service_unittest.cc b/service_unittest.cc
index 7d7d4fb..302f504 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -53,7 +53,7 @@
virtual string CalculateState() { return ""; }
virtual string GetRpcIdentifier() const { return ServiceMockAdaptor::kRpcId; }
virtual string GetDeviceRpcId() { return kRpcId; }
- virtual string GetStorageIdentifier(const string &mac) { return kStorageId; }
+ virtual string GetStorageIdentifier() { return kStorageId; }
private:
DISALLOW_COPY_AND_ASSIGN(ServiceUnderTest);
@@ -69,7 +69,8 @@
service_(new ServiceUnderTest(&control_interface_,
&dispatcher_,
&mock_manager_)),
- storage_id_(ServiceUnderTest::kStorageId) {}
+ storage_id_(ServiceUnderTest::kStorageId) {
+ }
virtual ~ServiceTest() {}
@@ -164,7 +165,7 @@
flimflam::kFavoriteProperty,
PropertyStoreTest::kBoolV,
&error));
- EXPECT_EQ(invalid_args_, error.name());
+ EXPECT_EQ(invalid_args(), error.name());
}
}
@@ -174,13 +175,13 @@
EXPECT_CALL(storage, GetString(storage_id_, _, _))
.Times(AtLeast(1))
.WillRepeatedly(Return(true));
- EXPECT_TRUE(service_->Load(&storage, ""));
+ EXPECT_TRUE(service_->Load(&storage));
}
TEST_F(ServiceTest, LoadFail) {
StrictMock<MockStore> storage;
EXPECT_CALL(storage, ContainsGroup(storage_id_)).WillOnce(Return(false));
- EXPECT_FALSE(service_->Load(&storage, ""));
+ EXPECT_FALSE(service_->Load(&storage));
}
TEST_F(ServiceTest, SaveString) {
@@ -225,7 +226,7 @@
EXPECT_CALL(storage, DeleteKey(storage_id_, _))
.Times(AtLeast(1))
.WillRepeatedly(Return(true));
- EXPECT_TRUE(service_->Save(&storage, ""));
+ EXPECT_TRUE(service_->Save(&storage));
}
TEST_F(ServiceTest, State) {