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

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

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/json/json_writer.h" 6 #include "base/json/json_writer.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chromeos/dbus/dbus_thread_manager.h" 10 #include "chromeos/dbus/dbus_thread_manager.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 class NetworkConfigurationHandlerTest : public testing::Test { 91 class NetworkConfigurationHandlerTest : public testing::Test {
92 public: 92 public:
93 NetworkConfigurationHandlerTest() 93 NetworkConfigurationHandlerTest()
94 : mock_manager_client_(NULL), 94 : mock_manager_client_(NULL),
95 mock_profile_client_(NULL), 95 mock_profile_client_(NULL),
96 mock_service_client_(NULL), 96 mock_service_client_(NULL),
97 dictionary_value_result_(NULL) {} 97 dictionary_value_result_(NULL) {}
98 virtual ~NetworkConfigurationHandlerTest() {} 98 virtual ~NetworkConfigurationHandlerTest() {}
99 99
100 virtual void SetUp() OVERRIDE { 100 virtual void SetUp() override {
101 scoped_ptr<DBusThreadManagerSetter> dbus_setter = 101 scoped_ptr<DBusThreadManagerSetter> dbus_setter =
102 DBusThreadManager::GetSetterForTesting(); 102 DBusThreadManager::GetSetterForTesting();
103 mock_manager_client_ = new MockShillManagerClient(); 103 mock_manager_client_ = new MockShillManagerClient();
104 mock_profile_client_ = new MockShillProfileClient(); 104 mock_profile_client_ = new MockShillProfileClient();
105 mock_service_client_ = new MockShillServiceClient(); 105 mock_service_client_ = new MockShillServiceClient();
106 dbus_setter->SetShillManagerClient( 106 dbus_setter->SetShillManagerClient(
107 scoped_ptr<ShillManagerClient>(mock_manager_client_).Pass()); 107 scoped_ptr<ShillManagerClient>(mock_manager_client_).Pass());
108 dbus_setter->SetShillProfileClient( 108 dbus_setter->SetShillProfileClient(
109 scoped_ptr<ShillProfileClient>(mock_profile_client_).Pass()); 109 scoped_ptr<ShillProfileClient>(mock_profile_client_).Pass());
110 dbus_setter->SetShillServiceClient( 110 dbus_setter->SetShillServiceClient(
111 scoped_ptr<ShillServiceClient>(mock_service_client_).Pass()); 111 scoped_ptr<ShillServiceClient>(mock_service_client_).Pass());
112 112
113 EXPECT_CALL(*mock_service_client_, GetProperties(_, _)) 113 EXPECT_CALL(*mock_service_client_, GetProperties(_, _))
114 .Times(AnyNumber()); 114 .Times(AnyNumber());
115 EXPECT_CALL(*mock_manager_client_, GetProperties(_)) 115 EXPECT_CALL(*mock_manager_client_, GetProperties(_))
116 .Times(AnyNumber()); 116 .Times(AnyNumber());
117 EXPECT_CALL(*mock_manager_client_, AddPropertyChangedObserver(_)) 117 EXPECT_CALL(*mock_manager_client_, AddPropertyChangedObserver(_))
118 .Times(AnyNumber()); 118 .Times(AnyNumber());
119 EXPECT_CALL(*mock_manager_client_, RemovePropertyChangedObserver(_)) 119 EXPECT_CALL(*mock_manager_client_, RemovePropertyChangedObserver(_))
120 .Times(AnyNumber()); 120 .Times(AnyNumber());
121 121
122 network_state_handler_.reset(NetworkStateHandler::InitializeForTest()); 122 network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
123 network_configuration_handler_.reset(new NetworkConfigurationHandler()); 123 network_configuration_handler_.reset(new NetworkConfigurationHandler());
124 network_configuration_handler_->Init(network_state_handler_.get()); 124 network_configuration_handler_->Init(network_state_handler_.get());
125 message_loop_.RunUntilIdle(); 125 message_loop_.RunUntilIdle();
126 } 126 }
127 127
128 virtual void TearDown() OVERRIDE { 128 virtual void TearDown() override {
129 network_configuration_handler_.reset(); 129 network_configuration_handler_.reset();
130 network_state_handler_.reset(); 130 network_state_handler_.reset();
131 DBusThreadManager::Shutdown(); 131 DBusThreadManager::Shutdown();
132 } 132 }
133 133
134 // Handles responses for GetProperties method calls. 134 // Handles responses for GetProperties method calls.
135 void OnGetProperties( 135 void OnGetProperties(
136 const dbus::ObjectPath& path, 136 const dbus::ObjectPath& path,
137 const ShillClientHelper::DictionaryValueCallback& callback) { 137 const ShillClientHelper::DictionaryValueCallback& callback) {
138 callback.Run(DBUS_METHOD_CALL_SUCCESS, *dictionary_value_result_); 138 callback.Run(DBUS_METHOD_CALL_SUCCESS, *dictionary_value_result_);
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 //////////////////////////////////////////////////////////////////////////////// 391 ////////////////////////////////////////////////////////////////////////////////
392 // Stub based tests 392 // Stub based tests
393 393
394 namespace { 394 namespace {
395 395
396 class TestObserver : public chromeos::NetworkStateHandlerObserver { 396 class TestObserver : public chromeos::NetworkStateHandlerObserver {
397 public: 397 public:
398 TestObserver() : network_list_changed_count_(0) {} 398 TestObserver() : network_list_changed_count_(0) {}
399 virtual ~TestObserver() {} 399 virtual ~TestObserver() {}
400 400
401 virtual void NetworkListChanged() OVERRIDE { 401 virtual void NetworkListChanged() override {
402 ++network_list_changed_count_; 402 ++network_list_changed_count_;
403 } 403 }
404 404
405 virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE { 405 virtual void NetworkPropertiesUpdated(const NetworkState* network) override {
406 property_updates_[network->path()]++; 406 property_updates_[network->path()]++;
407 } 407 }
408 408
409 size_t network_list_changed_count() { return network_list_changed_count_; } 409 size_t network_list_changed_count() { return network_list_changed_count_; }
410 410
411 int PropertyUpdatesForService(const std::string& service_path) { 411 int PropertyUpdatesForService(const std::string& service_path) {
412 return property_updates_[service_path]; 412 return property_updates_[service_path];
413 } 413 }
414 414
415 void ClearPropertyUpdates() { 415 void ClearPropertyUpdates() {
(...skipping 10 matching lines...) Expand all
426 } // namespace 426 } // namespace
427 427
428 class NetworkConfigurationHandlerStubTest : public testing::Test { 428 class NetworkConfigurationHandlerStubTest : public testing::Test {
429 public: 429 public:
430 NetworkConfigurationHandlerStubTest() { 430 NetworkConfigurationHandlerStubTest() {
431 } 431 }
432 432
433 virtual ~NetworkConfigurationHandlerStubTest() { 433 virtual ~NetworkConfigurationHandlerStubTest() {
434 } 434 }
435 435
436 virtual void SetUp() OVERRIDE { 436 virtual void SetUp() override {
437 DBusThreadManager::Initialize(); 437 DBusThreadManager::Initialize();
438 438
439 network_state_handler_.reset(NetworkStateHandler::InitializeForTest()); 439 network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
440 test_observer_.reset(new TestObserver()); 440 test_observer_.reset(new TestObserver());
441 network_state_handler_->AddObserver(test_observer_.get(), FROM_HERE); 441 network_state_handler_->AddObserver(test_observer_.get(), FROM_HERE);
442 442
443 network_configuration_handler_.reset(new NetworkConfigurationHandler()); 443 network_configuration_handler_.reset(new NetworkConfigurationHandler());
444 network_configuration_handler_->Init(network_state_handler_.get()); 444 network_configuration_handler_->Init(network_state_handler_.get());
445 445
446 message_loop_.RunUntilIdle(); 446 message_loop_.RunUntilIdle();
447 test_observer_->ClearPropertyUpdates(); 447 test_observer_->ClearPropertyUpdates();
448 } 448 }
449 449
450 virtual void TearDown() OVERRIDE { 450 virtual void TearDown() override {
451 network_configuration_handler_.reset(); 451 network_configuration_handler_.reset();
452 network_state_handler_->RemoveObserver(test_observer_.get(), FROM_HERE); 452 network_state_handler_->RemoveObserver(test_observer_.get(), FROM_HERE);
453 network_state_handler_.reset(); 453 network_state_handler_.reset();
454 DBusThreadManager::Shutdown(); 454 DBusThreadManager::Shutdown();
455 } 455 }
456 456
457 void SuccessCallback(const std::string& callback_name) { 457 void SuccessCallback(const std::string& callback_name) {
458 success_callback_name_ = callback_name; 458 success_callback_name_ = callback_name;
459 } 459 }
460 460
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 create_service_path_, shill::kGuidProperty, &guid)); 618 create_service_path_, shill::kGuidProperty, &guid));
619 EXPECT_EQ(service_path, guid); 619 EXPECT_EQ(service_path, guid);
620 620
621 std::string actual_profile; 621 std::string actual_profile;
622 EXPECT_TRUE(GetServiceStringProperty( 622 EXPECT_TRUE(GetServiceStringProperty(
623 create_service_path_, shill::kProfileProperty, &actual_profile)); 623 create_service_path_, shill::kProfileProperty, &actual_profile));
624 EXPECT_EQ(NetworkProfileHandler::GetSharedProfilePath(), actual_profile); 624 EXPECT_EQ(NetworkProfileHandler::GetSharedProfilePath(), actual_profile);
625 } 625 }
626 626
627 } // namespace chromeos 627 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/network_change_notifier_factory_chromeos.h ('k') | chromeos/network/network_connection_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698