OLD | NEW |
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 800 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
811 EXPECT_EQ(kWifiGuid1, tether_network->tether_guid()); | 811 EXPECT_EQ(kWifiGuid1, tether_network->tether_guid()); |
812 | 812 |
813 network_state_handler_->RemoveTetherNetworkState(kTetherGuid1); | 813 network_state_handler_->RemoveTetherNetworkState(kTetherGuid1); |
814 | 814 |
815 EXPECT_EQ(4u, test_observer_->network_list_changed_count()); | 815 EXPECT_EQ(4u, test_observer_->network_list_changed_count()); |
816 | 816 |
817 wifi_network = network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1); | 817 wifi_network = network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1); |
818 ASSERT_TRUE(wifi_network->tether_guid().empty()); | 818 ASSERT_TRUE(wifi_network->tether_guid().empty()); |
819 } | 819 } |
820 | 820 |
| 821 TEST_F(NetworkStateHandlerTest, TetherNetworkStateDisassociation) { |
| 822 network_state_handler_->SetTetherTechnologyState( |
| 823 NetworkStateHandler::TECHNOLOGY_ENABLED); |
| 824 |
| 825 const std::string profile = "/profile/profile1"; |
| 826 const std::string wifi_path = "/service/wifi_with_guid"; |
| 827 AddService(wifi_path, kWifiGuid1, kWifiName1, shill::kTypeWifi, |
| 828 shill::kStateOnline); |
| 829 profile_test_->AddProfile(profile, "" /* userhash */); |
| 830 EXPECT_TRUE(profile_test_->AddService(profile, wifi_path)); |
| 831 UpdateManagerProperties(); |
| 832 |
| 833 EXPECT_EQ(1u, test_observer_->network_list_changed_count()); |
| 834 |
| 835 network_state_handler_->AddTetherNetworkState( |
| 836 kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1, |
| 837 kTetherSignalStrength1, kTetherHasConnectedToHost1); |
| 838 |
| 839 EXPECT_EQ(2u, test_observer_->network_list_changed_count()); |
| 840 |
| 841 EXPECT_TRUE( |
| 842 network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork( |
| 843 kTetherGuid1, kWifiGuid1)); |
| 844 |
| 845 EXPECT_EQ(3u, test_observer_->network_list_changed_count()); |
| 846 |
| 847 const NetworkState* wifi_network = |
| 848 network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1); |
| 849 EXPECT_EQ(kTetherGuid1, wifi_network->tether_guid()); |
| 850 |
| 851 const NetworkState* tether_network = |
| 852 network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1); |
| 853 EXPECT_EQ(kWifiGuid1, tether_network->tether_guid()); |
| 854 |
| 855 network_state_handler_->DisassociateTetherNetworkStateFromWifiNetwork( |
| 856 kTetherGuid1); |
| 857 |
| 858 ASSERT_TRUE(wifi_network->tether_guid().empty()); |
| 859 ASSERT_TRUE(tether_network->tether_guid().empty()); |
| 860 |
| 861 EXPECT_EQ(4u, test_observer_->network_list_changed_count()); |
| 862 } |
| 863 |
821 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociationWifiRemoved) { | 864 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociationWifiRemoved) { |
822 network_state_handler_->SetTetherTechnologyState( | 865 network_state_handler_->SetTetherTechnologyState( |
823 NetworkStateHandler::TECHNOLOGY_ENABLED); | 866 NetworkStateHandler::TECHNOLOGY_ENABLED); |
824 | 867 |
825 const std::string profile = "/profile/profile1"; | 868 const std::string profile = "/profile/profile1"; |
826 const std::string wifi_path = "/service/wifi_with_guid"; | 869 const std::string wifi_path = "/service/wifi_with_guid"; |
827 AddService(wifi_path, kWifiGuid1, kWifiName1, shill::kTypeWifi, | 870 AddService(wifi_path, kWifiGuid1, kWifiName1, shill::kTypeWifi, |
828 shill::kStateOnline); | 871 shill::kStateOnline); |
829 profile_test_->AddProfile(profile, "" /* userhash */); | 872 profile_test_->AddProfile(profile, "" /* userhash */); |
830 EXPECT_TRUE(profile_test_->AddService(profile, wifi_path)); | 873 EXPECT_TRUE(profile_test_->AddService(profile, wifi_path)); |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1174 shill::kIPConfigProperty, | 1217 shill::kIPConfigProperty, |
1175 base::Value(kIPConfigPath)); | 1218 base::Value(kIPConfigPath)); |
1176 UpdateManagerProperties(); | 1219 UpdateManagerProperties(); |
1177 EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice( | 1220 EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice( |
1178 kShillManagerClientStubWifiDevice)); | 1221 kShillManagerClientStubWifiDevice)); |
1179 EXPECT_EQ(1, test_observer_->PropertyUpdatesForService( | 1222 EXPECT_EQ(1, test_observer_->PropertyUpdatesForService( |
1180 kShillManagerClientStubDefaultWifi)); | 1223 kShillManagerClientStubDefaultWifi)); |
1181 } | 1224 } |
1182 | 1225 |
1183 } // namespace chromeos | 1226 } // namespace chromeos |
OLD | NEW |