1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
|
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chromeos/network/shill_property_handler.h"
#include <map>
#include <set>
#include <string>
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/values.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_device_client.h"
#include "chromeos/dbus/shill_manager_client.h"
#include "chromeos/dbus/shill_service_client.h"
#include "dbus/object_path.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
namespace chromeos {
namespace {
void ErrorCallbackFunction(const std::string& error_name,
const std::string& error_message) {
LOG(ERROR) << "Shill Error: " << error_name << " : " << error_message;
}
class TestListener : public internal::ShillPropertyHandler::Listener {
public:
TestListener() : manager_updates_(0), errors_(0) {
}
virtual void UpdateManagedList(ManagedState::ManagedType type,
const base::ListValue& entries) OVERRIDE {
UpdateEntries(GetTypeString(type), entries);
}
virtual void UpdateAvailableTechnologies(
const base::ListValue& technologies) OVERRIDE {
UpdateEntries(flimflam::kAvailableTechnologiesProperty, technologies);
}
virtual void UpdateEnabledTechnologies(
const base::ListValue& technologies) OVERRIDE {
UpdateEntries(flimflam::kEnabledTechnologiesProperty, technologies);
}
virtual void UpdateManagedStateProperties(
ManagedState::ManagedType type,
const std::string& path,
const base::DictionaryValue& properties) OVERRIDE {
AddPropertyUpdate(GetTypeString(type), path);
}
virtual void UpdateNetworkServiceProperty(
const std::string& service_path,
const std::string& key,
const base::Value& value) OVERRIDE {
AddPropertyUpdate(flimflam::kServicesProperty, service_path);
}
virtual void ManagerPropertyChanged() OVERRIDE {
++manager_updates_;
}
virtual void UpdateNetworkServiceIPAddress(
const std::string& service_path,
const std::string& ip_address) OVERRIDE {
AddPropertyUpdate(flimflam::kServicesProperty, service_path);
}
virtual void ManagedStateListChanged(
ManagedState::ManagedType type) OVERRIDE {
AddStateListUpdate(GetTypeString(type));
}
std::vector<std::string>& entries(const std::string& type) {
return entries_[type];
}
std::map<std::string, int>& property_updates(const std::string& type) {
return property_updates_[type];
}
int list_updates(const std::string& type) { return list_updates_[type]; }
int manager_updates() { return manager_updates_; }
int errors() { return errors_; }
private:
std::string GetTypeString(ManagedState::ManagedType type) {
if (type == ManagedState::MANAGED_TYPE_NETWORK) {
return flimflam::kServicesProperty;
} else if (type == ManagedState::MANAGED_TYPE_DEVICE) {
return flimflam::kDevicesProperty;
}
LOG(ERROR) << "UpdateManagedList called with unrecognized type: " << type;
++errors_;
return std::string();
}
void UpdateEntries(const std::string& type, const base::ListValue& entries) {
if (type.empty())
return;
entries_[type].clear();
for (base::ListValue::const_iterator iter = entries.begin();
iter != entries.end(); ++iter) {
std::string path;
if ((*iter)->GetAsString(&path))
entries_[type].push_back(path);
}
}
void AddPropertyUpdate(const std::string& type, const std::string& path) {
if (type.empty())
return;
property_updates(type)[path] += 1;
}
void AddStateListUpdate(const std::string& type) {
if (type.empty())
return;
list_updates_[type] += 1;
}
// Map of list-type -> paths
std::map<std::string, std::vector<std::string> > entries_;
// Map of list-type -> map of paths -> update counts
std::map<std::string, std::map<std::string, int> > property_updates_;
// Map of list-type -> list update counts
std::map<std::string, int > list_updates_;
int manager_updates_;
int errors_;
};
} // namespace
class ShillPropertyHandlerTest : public testing::Test {
public:
ShillPropertyHandlerTest()
: manager_test_(NULL),
device_test_(NULL),
service_test_(NULL) {
}
virtual ~ShillPropertyHandlerTest() {
}
virtual void SetUp() OVERRIDE {
// Initialize DBusThreadManager with a stub implementation.
DBusThreadManager::InitializeWithStub();
// Get the test interface for manager / device / service and clear the
// default stub properties.
manager_test_ =
DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface();
ASSERT_TRUE(manager_test_);
device_test_ =
DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
ASSERT_TRUE(device_test_);
service_test_ =
DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
ASSERT_TRUE(service_test_);
}
virtual void TearDown() OVERRIDE {
shill_property_handler_.reset();
listener_.reset();
DBusThreadManager::Shutdown();
}
void AddDevice(const std::string& type, const std::string& id) {
ASSERT_TRUE(IsValidType(type));
manager_test_->AddDevice(id);
device_test_->AddDevice(id, type, std::string("/device/" + id));
}
void RemoveDevice(const std::string& id) {
manager_test_->RemoveDevice(id);
device_test_->RemoveDevice(id);
}
void AddService(const std::string& type,
const std::string& id,
const std::string& state,
bool add_to_watch_list) {
ASSERT_TRUE(IsValidType(type));
manager_test_->AddService(id, add_to_watch_list);
service_test_->AddService(id, id, type, state);
}
void RemoveService(const std::string& id) {
manager_test_->RemoveService(id);
service_test_->RemoveService(id);
}
// Call this after any initial Shill client setup
void SetupShillPropertyHandler() {
listener_.reset(new TestListener);
shill_property_handler_.reset(
new internal::ShillPropertyHandler(listener_.get()));
shill_property_handler_->Init();
}
bool IsValidType(const std::string& type) {
return (type == flimflam::kTypeEthernet ||
type == flimflam::kTypeWifi ||
type == flimflam::kTypeWimax ||
type == flimflam::kTypeBluetooth ||
type == flimflam::kTypeCellular ||
type == flimflam::kTypeVPN);
}
protected:
MessageLoopForUI message_loop_;
scoped_ptr<TestListener> listener_;
scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;
ShillManagerClient::TestInterface* manager_test_;
ShillDeviceClient::TestInterface* device_test_;
ShillServiceClient::TestInterface* service_test_;
private:
DISALLOW_COPY_AND_ASSIGN(ShillPropertyHandlerTest);
};
TEST_F(ShillPropertyHandlerTest, ShillPropertyHandlerStub) {
SetupShillPropertyHandler();
message_loop_.RunUntilIdle();
EXPECT_EQ(1, listener_->manager_updates());
// ShillManagerClient default stub entries are in shill_manager_client.cc.
// TODO(stevenjb): Eliminate default stub entries and add them explicitly.
const size_t kNumShillManagerClientStubImplTechnologies = 3;
EXPECT_EQ(kNumShillManagerClientStubImplTechnologies,
listener_->entries(
flimflam::kAvailableTechnologiesProperty).size());
EXPECT_EQ(kNumShillManagerClientStubImplTechnologies,
listener_->entries(
flimflam::kEnabledTechnologiesProperty).size());
const size_t kNumShillManagerClientStubImplDevices = 2;
EXPECT_EQ(kNumShillManagerClientStubImplDevices,
listener_->entries(flimflam::kDevicesProperty).size());
const size_t kNumShillManagerClientStubImplServices = 4;
EXPECT_EQ(kNumShillManagerClientStubImplServices,
listener_->entries(flimflam::kServicesProperty).size());
EXPECT_EQ(0, listener_->errors());
}
TEST_F(ShillPropertyHandlerTest, ShillPropertyHandlerTechnologyChanged) {
// This relies on the stub dbus implementations for ShillManagerClient,
SetupShillPropertyHandler();
message_loop_.RunUntilIdle();
EXPECT_EQ(1, listener_->manager_updates());
// Add a disabled technology.
manager_test_->AddTechnology(flimflam::kTypeWimax, false);
message_loop_.RunUntilIdle();
EXPECT_EQ(2, listener_->manager_updates());
const size_t kNumShillManagerClientStubImplTechnologies = 3;
EXPECT_EQ(kNumShillManagerClientStubImplTechnologies + 1,
listener_->entries(
flimflam::kAvailableTechnologiesProperty).size());
EXPECT_EQ(kNumShillManagerClientStubImplTechnologies,
listener_->entries(
flimflam::kEnabledTechnologiesProperty).size());
// Enable the technology.
DBusThreadManager::Get()->GetShillManagerClient()->EnableTechnology(
flimflam::kTypeWimax,
base::Bind(&base::DoNothing), base::Bind(&ErrorCallbackFunction));
message_loop_.RunUntilIdle();
EXPECT_EQ(3, listener_->manager_updates());
EXPECT_EQ(kNumShillManagerClientStubImplTechnologies + 1,
listener_->entries(
flimflam::kEnabledTechnologiesProperty).size());
EXPECT_EQ(0, listener_->errors());
}
TEST_F(ShillPropertyHandlerTest, ShillPropertyHandlerDevicePropertyChanged) {
// This relies on the stub dbus implementations for ShillManagerClient,
SetupShillPropertyHandler();
message_loop_.RunUntilIdle();
EXPECT_EQ(1, listener_->manager_updates());
EXPECT_EQ(1, listener_->list_updates(flimflam::kDevicesProperty));
const size_t kNumShillManagerClientStubImplDevices = 2;
EXPECT_EQ(kNumShillManagerClientStubImplDevices,
listener_->entries(flimflam::kDevicesProperty).size());
// Add a device.
const std::string kTestDevicePath("test_wifi_device1");
AddDevice(flimflam::kTypeWifi, kTestDevicePath);
message_loop_.RunUntilIdle();
EXPECT_EQ(1, listener_->manager_updates()); // No new manager updates.
EXPECT_EQ(2, listener_->list_updates(flimflam::kDevicesProperty));
EXPECT_EQ(kNumShillManagerClientStubImplDevices + 1,
listener_->entries(flimflam::kDevicesProperty).size());
// Device changes are not observed.
// Remove a device
RemoveDevice(kTestDevicePath);
message_loop_.RunUntilIdle();
EXPECT_EQ(3, listener_->list_updates(flimflam::kDevicesProperty));
EXPECT_EQ(kNumShillManagerClientStubImplDevices,
listener_->entries(flimflam::kDevicesProperty).size());
EXPECT_EQ(0, listener_->errors());
}
TEST_F(ShillPropertyHandlerTest, ShillPropertyHandlerServicePropertyChanged) {
// This relies on the stub dbus implementations for ShillManagerClient,
SetupShillPropertyHandler();
message_loop_.RunUntilIdle();
EXPECT_EQ(1, listener_->manager_updates());
EXPECT_EQ(1, listener_->list_updates(flimflam::kServicesProperty));
const size_t kNumShillManagerClientStubImplServices = 4;
EXPECT_EQ(kNumShillManagerClientStubImplServices,
listener_->entries(flimflam::kServicesProperty).size());
// Add an unwatched service.
const std::string kTestServicePath("test_wifi_service1");
AddService(flimflam::kTypeWifi, kTestServicePath,
flimflam::kStateIdle, false);
message_loop_.RunUntilIdle();
EXPECT_EQ(1, listener_->manager_updates()); // No new manager updates.
EXPECT_EQ(2, listener_->list_updates(flimflam::kServicesProperty));
EXPECT_EQ(kNumShillManagerClientStubImplServices + 1,
listener_->entries(flimflam::kServicesProperty).size());
// Change a property.
base::FundamentalValue scan_interval(3);
DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
dbus::ObjectPath(kTestServicePath),
flimflam::kScanIntervalProperty,
scan_interval,
base::Bind(&base::DoNothing), base::Bind(&ErrorCallbackFunction));
message_loop_.RunUntilIdle();
// Property change should NOT trigger an update.
EXPECT_EQ(0, listener_->
property_updates(flimflam::kServicesProperty)[kTestServicePath]);
// Add the existing service to the watch list.
AddService(flimflam::kTypeWifi, kTestServicePath,
flimflam::kStateIdle, true);
message_loop_.RunUntilIdle();
// Service list update should be received when watch list changes.
EXPECT_EQ(3, listener_->list_updates(flimflam::kServicesProperty));
// Number of services shouldn't change.
EXPECT_EQ(kNumShillManagerClientStubImplServices + 1,
listener_->entries(flimflam::kServicesProperty).size());
// Property update should be received when watched service is added.
EXPECT_EQ(1, listener_->
property_updates(flimflam::kServicesProperty)[kTestServicePath]);
// Change a property.
DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
dbus::ObjectPath(kTestServicePath),
flimflam::kScanIntervalProperty,
scan_interval,
base::Bind(&base::DoNothing), base::Bind(&ErrorCallbackFunction));
message_loop_.RunUntilIdle();
// Property change should trigger another update.
EXPECT_EQ(2, listener_->
property_updates(flimflam::kServicesProperty)[kTestServicePath]);
// Remove a service
RemoveService(kTestServicePath);
message_loop_.RunUntilIdle();
EXPECT_EQ(4, listener_->list_updates(flimflam::kServicesProperty));
EXPECT_EQ(kNumShillManagerClientStubImplServices,
listener_->entries(flimflam::kServicesProperty).size());
EXPECT_EQ(0, listener_->errors());
}
// TODO(stevenjb): Test IP Configs.
} // namespace chromeos
|