Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: chromeos/network/shill_property_handler_unittest.cc

Issue 11887008: Deprecate ShillNetworkClient and add GeolocationHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittest Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/network/shill_property_handler.h" 5 #include "chromeos/network/shill_property_handler.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 164
165 virtual void TearDown() OVERRIDE { 165 virtual void TearDown() OVERRIDE {
166 shill_property_handler_.reset(); 166 shill_property_handler_.reset();
167 listener_.reset(); 167 listener_.reset();
168 DBusThreadManager::Shutdown(); 168 DBusThreadManager::Shutdown();
169 } 169 }
170 170
171 void AddDevice(const std::string& type, const std::string& id) { 171 void AddDevice(const std::string& type, const std::string& id) {
172 ASSERT_TRUE(IsValidType(type)); 172 ASSERT_TRUE(IsValidType(type));
173 manager_test_->AddDevice(id); 173 manager_test_->AddDevice(id);
174 device_test_->AddDevice(id, type, std::string("/device/" + id), "/stub"); 174 device_test_->AddDevice(id, type, std::string("/device/" + id));
175 } 175 }
176 176
177 void RemoveDevice(const std::string& id) { 177 void RemoveDevice(const std::string& id) {
178 manager_test_->RemoveDevice(id); 178 manager_test_->RemoveDevice(id);
179 device_test_->RemoveDevice(id); 179 device_test_->RemoveDevice(id);
180 } 180 }
181 181
182 void AddService(const std::string& type, 182 void AddService(const std::string& type,
183 const std::string& id, 183 const std::string& id,
184 const std::string& state, 184 const std::string& state,
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 EXPECT_EQ(4, listener_->list_updates(flimflam::kServicesProperty)); 363 EXPECT_EQ(4, listener_->list_updates(flimflam::kServicesProperty));
364 EXPECT_EQ(kNumShillManagerClientStubImplServices, 364 EXPECT_EQ(kNumShillManagerClientStubImplServices,
365 listener_->entries(flimflam::kServicesProperty).size()); 365 listener_->entries(flimflam::kServicesProperty).size());
366 366
367 EXPECT_EQ(0, listener_->errors()); 367 EXPECT_EQ(0, listener_->errors());
368 } 368 }
369 369
370 // TODO(stevenjb): Test IP Configs. 370 // TODO(stevenjb): Test IP Configs.
371 371
372 } // namespace chromeos 372 } // namespace chromeos
OLDNEW
« chromeos/network/geolocation_handler.h ('K') | « chromeos/network/shill_property_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698