Re-land "[shill] Add hardware address to Device objects."
Forgot some headers...
BUG=chromium-os:17744
TEST=unit
This reverts commit 0fda552b0fec3498403336acb9e89dd7799cac74.
Change-Id: I1cd05e47d29bc7ea2a065cabf1d81dd37f74c0f8
Reviewed-on: http://gerrit.chromium.org/gerrit/6270
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/device_unittest.cc b/device_unittest.cc
index 8142277..604607e 100644
--- a/device_unittest.cc
+++ b/device_unittest.cc
@@ -35,25 +35,32 @@
namespace shill {
-namespace {
-const char kDeviceName[] = "testdevice";
-} // namespace {}
-
class DeviceTest : public PropertyStoreTest {
public:
DeviceTest()
- : device_(new Device(&control_interface_, NULL, NULL, kDeviceName, 0)) {
+ : device_(new Device(&control_interface_,
+ NULL,
+ NULL,
+ kDeviceName,
+ kDeviceAddress,
+ 0)) {
DHCPProvider::GetInstance()->glib_ = &glib_;
DHCPProvider::GetInstance()->control_interface_ = &control_interface_;
}
virtual ~DeviceTest() {}
protected:
+ static const char kDeviceName[];
+ static const char kDeviceAddress[];
+
MockGLib glib_;
MockControl control_interface_;
DeviceRefPtr device_;
};
+const char DeviceTest::kDeviceName[] = "testdevice";
+const char DeviceTest::kDeviceAddress[] = "address";
+
TEST_F(DeviceTest, Contains) {
EXPECT_TRUE(device_->store()->Contains(flimflam::kNameProperty));
EXPECT_FALSE(device_->store()->Contains(""));