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

Unified Diff: chromeos/network/network_state_handler_unittest.cc

Issue 2819303002: Changed wifi arcs to mobile bars for Tether network. (Closed)
Patch Set: Fixed small typo preventing unit tests from building. 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 side-by-side diff with in-line comments
Download patch
Index: chromeos/network/network_state_handler_unittest.cc
diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc
index 56180b775640be2f8f0de0359caf5aab53245d68..fb50ba4171b209a2a47d26f388151b3790cbbdb7 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -818,6 +818,49 @@ TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociation) {
ASSERT_TRUE(wifi_network->tether_guid().empty());
}
+TEST_F(NetworkStateHandlerTest, TetherNetworkStateDisassociation) {
+ network_state_handler_->SetTetherTechnologyState(
+ NetworkStateHandler::TECHNOLOGY_ENABLED);
+
+ const std::string profile = "/profile/profile1";
+ const std::string wifi_path = "/service/wifi_with_guid";
+ AddService(wifi_path, kWifiGuid1, kWifiName1, shill::kTypeWifi,
+ shill::kStateOnline);
+ profile_test_->AddProfile(profile, "" /* userhash */);
+ EXPECT_TRUE(profile_test_->AddService(profile, wifi_path));
+ UpdateManagerProperties();
+
+ EXPECT_EQ(1u, test_observer_->network_list_changed_count());
+
+ network_state_handler_->AddTetherNetworkState(
+ kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
+ kTetherSignalStrength1, kTetherHasConnectedToHost1);
+
+ EXPECT_EQ(2u, test_observer_->network_list_changed_count());
+
+ EXPECT_TRUE(
+ network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
+ kTetherGuid1, kWifiGuid1));
+
+ EXPECT_EQ(3u, test_observer_->network_list_changed_count());
+
+ const NetworkState* wifi_network =
+ network_state_handler_->GetNetworkStateFromGuid(kWifiGuid1);
+ EXPECT_EQ(kTetherGuid1, wifi_network->tether_guid());
+
+ const NetworkState* tether_network =
+ network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
+ EXPECT_EQ(kWifiGuid1, tether_network->tether_guid());
+
+ network_state_handler_->DisassociateTetherNetworkStateFromWifiNetwork(
+ kTetherGuid1);
+
+ ASSERT_TRUE(wifi_network->tether_guid().empty());
+ ASSERT_TRUE(tether_network->tether_guid().empty());
+
+ EXPECT_EQ(4u, test_observer_->network_list_changed_count());
+}
+
TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociationWifiRemoved) {
network_state_handler_->SetTetherTechnologyState(
NetworkStateHandler::TECHNOLOGY_ENABLED);
« ash/system/network/network_icon.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