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

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

Issue 2819303002: Changed wifi arcs to mobile bars for Tether network. (Closed)
Patch Set: khorimoto@ comments Created 3 years, 7 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 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 EXPECT_EQ(kWifiGuid1, tether_network->tether_guid()); 794 EXPECT_EQ(kWifiGuid1, tether_network->tether_guid());
795 795
796 network_state_handler_->RemoveTetherNetworkState(kTetherGuid1); 796 network_state_handler_->RemoveTetherNetworkState(kTetherGuid1);
797 797
798 EXPECT_EQ(4u, test_observer_->network_list_changed_count()); 798 EXPECT_EQ(4u, test_observer_->network_list_changed_count());
799 799
800 wifi_network = network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1); 800 wifi_network = network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1);
801 ASSERT_TRUE(wifi_network->tether_guid().empty()); 801 ASSERT_TRUE(wifi_network->tether_guid().empty());
802 } 802 }
803 803
804 TEST_F(NetworkStateHandlerTest, TetherNetworkStateDisassociation) {
805 network_state_handler_->SetTetherTechnologyState(
806 NetworkStateHandler::TECHNOLOGY_ENABLED);
807
808 EXPECT_EQ(0u, test_observer_->network_list_changed_count());
809
810 const std::string profile = "/profile/profile1";
811 const std::string wifi_path = "/service/wifi_with_guid";
812 AddService(wifi_path, kWifiGuid1, kWifiName1, shill::kTypeWifi,
813 shill::kStateOnline);
814 profile_test_->AddProfile(profile, "" /* userhash */);
815 EXPECT_TRUE(profile_test_->AddService(profile, wifi_path));
816 UpdateManagerProperties();
817
818 EXPECT_EQ(1u, test_observer_->network_list_changed_count());
819
820 network_state_handler_->AddTetherNetworkState(
821 kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
822 kTetherSignalStrength1);
823
824 EXPECT_EQ(2u, test_observer_->network_list_changed_count());
825
826 EXPECT_TRUE(
827 network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
828 kTetherGuid1, kWifiGuid1));
829
830 EXPECT_EQ(3u, test_observer_->network_list_changed_count());
831
832 const NetworkState* wifi_network =
833 network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1);
834 EXPECT_EQ(kTetherGuid1, wifi_network->tether_guid());
835
836 const NetworkState* tether_network =
837 network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
838 EXPECT_EQ(kWifiGuid1, tether_network->tether_guid());
839
840 network_state_handler_->DisassociateTetherNetworkStateWithWifiNetwork(
841 kTetherGuid1);
842
843 wifi_network = network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1);
Kyle Horimoto 2017/05/01 17:09:27 Also verify the Tether network changed as well.
lesliewatkins 2017/05/03 01:23:23 Done.
844 ASSERT_TRUE(wifi_network->tether_guid().empty());
845 }
846
804 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociationWifiRemoved) { 847 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociationWifiRemoved) {
805 network_state_handler_->SetTetherTechnologyState( 848 network_state_handler_->SetTetherTechnologyState(
806 NetworkStateHandler::TECHNOLOGY_ENABLED); 849 NetworkStateHandler::TECHNOLOGY_ENABLED);
807 850
808 const std::string profile = "/profile/profile1"; 851 const std::string profile = "/profile/profile1";
809 const std::string wifi_path = "/service/wifi_with_guid"; 852 const std::string wifi_path = "/service/wifi_with_guid";
810 AddService(wifi_path, kWifiGuid1, kWifiName1, shill::kTypeWifi, 853 AddService(wifi_path, kWifiGuid1, kWifiName1, shill::kTypeWifi,
811 shill::kStateOnline); 854 shill::kStateOnline);
812 profile_test_->AddProfile(profile, "" /* userhash */); 855 profile_test_->AddProfile(profile, "" /* userhash */);
813 EXPECT_TRUE(profile_test_->AddService(profile, wifi_path)); 856 EXPECT_TRUE(profile_test_->AddService(profile, wifi_path));
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 shill::kIPConfigProperty, 1200 shill::kIPConfigProperty,
1158 base::Value(kIPConfigPath)); 1201 base::Value(kIPConfigPath));
1159 UpdateManagerProperties(); 1202 UpdateManagerProperties();
1160 EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice( 1203 EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice(
1161 kShillManagerClientStubWifiDevice)); 1204 kShillManagerClientStubWifiDevice));
1162 EXPECT_EQ(1, test_observer_->PropertyUpdatesForService( 1205 EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(
1163 kShillManagerClientStubDefaultWifi)); 1206 kShillManagerClientStubDefaultWifi));
1164 } 1207 }
1165 1208
1166 } // namespace chromeos 1209 } // namespace chromeos
OLDNEW
« chromeos/network/network_state_handler.cc ('K') | « chromeos/network/network_state_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698