commit 34af218abe6a99144ffe01332ce36fbad94f2628
author Chris Masone <cmasone@chromium.org> Mon Aug 22 11:59:36 2011 -0700
committer Chris Masone <cmasone@chromium.org> Mon Aug 22 15:06:46 2011 -0700
tree 945f160f913a90aa85501df623d5b95e62d5126b
parent 3335b3773067671301a8a02a1f9eefd17a3ce607

[shill] Use flimflam-esque storage ids

Devices:
  device_<MAC>

IPConfig:
  ipconfig_<MAC of associated device>_0

Services:
  ethernet_<MAC of associated device>
  wifi_<MAC of associated device>_<SSID>_<mode>_<security>
  cellular_<MAC of associated device>_<Network_name>

BUG=chromium-os:17744
TEST=unit

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

device_unittest.cc

diff --git a/device_unittest.cc b/device_unittest.cc
index 604607e..74256a7 100644
--- a/device_unittest.cc
+++ b/device_unittest.cc
@@ -4,14 +4,16 @@
 
 #include "shill/device.h"
 
+#include <ctype.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include <dbus-c++/dbus.h>
 #include <chromeos/dbus/service_constants.h>
-#include <gtest/gtest.h>
+#include <dbus-c++/dbus.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include "shill/dbus_adaptor.h"
 #include "shill/dhcp_provider.h"
@@ -20,6 +22,7 @@
 #include "shill/mock_control.h"
 #include "shill/mock_device.h"
 #include "shill/mock_glib.h"
+#include "shill/mock_ipconfig.h"
 #include "shill/mock_store.h"
 #include "shill/property_store_unittest.h"
 #include "shill/shill_event.h"
@@ -32,6 +35,7 @@
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::Test;
+using ::testing::Values;
 
 namespace shill {
 
@@ -144,14 +148,25 @@
 TEST_F(DeviceTest, Save) {
   NiceMock<MockStore> storage;
   const string id = device_->GetStorageIdentifier();
-  device_->ipconfig_ = new IPConfig(&control_interface_, kDeviceName);
   EXPECT_CALL(storage, SetString(id, _, _))
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
   EXPECT_CALL(storage, SetBool(id, _, _))
       .Times(AtLeast(1))
       .WillRepeatedly(Return(true));
+  scoped_refptr<MockIPConfig> ipconfig = new MockIPConfig(&control_interface_,
+                                                          kDeviceName);
+  EXPECT_CALL(*ipconfig.get(), Save(_, _))
+      .WillOnce(Return(true));
+  device_->ipconfig_ = ipconfig;
   EXPECT_TRUE(device_->Save(&storage));
 }
 
+TEST_F(DeviceTest, StorageIdGeneration) {
+  string to_process("/device/stuff/0");
+  ControlInterface::RpcIdToStorageId(&to_process);
+  EXPECT_TRUE(isalpha(to_process[0]));
+  EXPECT_EQ(string::npos, to_process.find('/'));
+}
+
 }  // namespace shill