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

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

Issue 2932373002: Add a battery icon to the right of Tether networks in system tray. (Closed)
Patch Set: Created 3 years, 6 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 "chromeos/network/network_state_handler.h" 5 #include "chromeos/network/network_state_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 test_observer_->default_network()); 330 test_observer_->default_network());
331 ASSERT_TRUE(network_state_handler_->DefaultNetwork()); 331 ASSERT_TRUE(network_state_handler_->DefaultNetwork());
332 EXPECT_EQ(kShillManagerClientStubDefaultService, 332 EXPECT_EQ(kShillManagerClientStubDefaultService,
333 network_state_handler_->DefaultNetwork()->path()); 333 network_state_handler_->DefaultNetwork()->path());
334 EXPECT_EQ(kShillManagerClientStubDefaultService, 334 EXPECT_EQ(kShillManagerClientStubDefaultService,
335 network_state_handler_->ConnectedNetworkByType( 335 network_state_handler_->ConnectedNetworkByType(
336 NetworkTypePattern::Ethernet())->path()); 336 NetworkTypePattern::Ethernet())->path());
337 EXPECT_EQ(kShillManagerClientStubDefaultWifi, 337 EXPECT_EQ(kShillManagerClientStubDefaultWifi,
338 network_state_handler_->ConnectedNetworkByType( 338 network_state_handler_->ConnectedNetworkByType(
339 NetworkTypePattern::WiFi())->path()); 339 NetworkTypePattern::WiFi())->path());
340 EXPECT_EQ(kShillManagerClientStubCellular, 340 EXPECT_EQ(
341 network_state_handler_->FirstNetworkByType( 341 kShillManagerClientStubCellular,
342 NetworkTypePattern::Mobile())->path()); 342 network_state_handler_->FirstNetworkByType(NetworkTypePattern::Mobile())
343 ->path());
stevenjb 2017/06/12 16:20:52 This file must have been touched somehow in the CL
343 EXPECT_EQ( 344 EXPECT_EQ(
344 kShillManagerClientStubCellular, 345 kShillManagerClientStubCellular,
345 network_state_handler_->FirstNetworkByType(NetworkTypePattern::Cellular()) 346 network_state_handler_->FirstNetworkByType(NetworkTypePattern::Cellular())
346 ->path()); 347 ->path());
347 EXPECT_EQ(shill::kStateOnline, 348 EXPECT_EQ(shill::kStateOnline,
348 test_observer_->default_network_connection_state()); 349 test_observer_->default_network_connection_state());
349 } 350 }
350 351
351 TEST_F(NetworkStateHandlerTest, GetNetworkList) { 352 TEST_F(NetworkStateHandlerTest, GetNetworkList) {
352 network_state_handler_->SetTetherTechnologyState( 353 network_state_handler_->SetTetherTechnologyState(
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 shill::kIPConfigProperty, 1282 shill::kIPConfigProperty,
1282 base::Value(kIPConfigPath)); 1283 base::Value(kIPConfigPath));
1283 UpdateManagerProperties(); 1284 UpdateManagerProperties();
1284 EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice( 1285 EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice(
1285 kShillManagerClientStubWifiDevice)); 1286 kShillManagerClientStubWifiDevice));
1286 EXPECT_EQ(1, test_observer_->PropertyUpdatesForService( 1287 EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(
1287 kShillManagerClientStubDefaultWifi)); 1288 kShillManagerClientStubDefaultWifi));
1288 } 1289 }
1289 1290
1290 } // namespace chromeos 1291 } // namespace chromeos
OLDNEW
« ash/system/network/network_list.cc ('K') | « ash/system/network/network_list.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698