[CrOS Tether] Add the HasConnectedToHost network field to NetworkStateHandler.

chromeos/network/network_state_handler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/network_state_handler.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 43 matching lines @@
 const char kTetherGuid1[] = "tether1";
 const char kTetherGuid2[] = "tether2";
 const char kTetherName1[] = "Device1";
 const char kTetherName2[] = "Device2";
 const char kTetherCarrier1[] = "Carrier1";
 const char kTetherCarrier2[] = "Carrier2";
 const int kTetherBatteryPercentage1 = 85;
 const int kTetherBatteryPercentage2 = 90;
 const int kTetherSignalStrength1 = 75;
 const int kTetherSignalStrength2 = 80;
+const bool kTetherHasConnectedToHost1 = true;
+const bool kTetherHasConnectedToHost2 = false;
 
 using chromeos::DeviceState;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 
 class TestObserver : public chromeos::NetworkStateHandlerObserver {
  public:
   explicit TestObserver(NetworkStateHandler* handler)
       : handler_(handler),
         device_list_changed_count_(0),
@@ skipping 287 matching lines @@
   EXPECT_TRUE(profile_test_->AddService(profile, wifi_favorite_path));
   UpdateManagerProperties();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(kNumShillManagerClientStubImplServices + 1,
             test_observer_->network_count());
 
   // Add two Tether networks.
   const size_t kNumTetherNetworks = 2;
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
-      kTetherSignalStrength1);
+      kTetherSignalStrength1, kTetherHasConnectedToHost1);
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid2, kTetherName2, kTetherCarrier2, kTetherBatteryPercentage2,
-      kTetherSignalStrength2);
+      kTetherSignalStrength2, kTetherHasConnectedToHost2);
   EXPECT_EQ(kNumShillManagerClientStubImplServices + 3,
             test_observer_->network_count());
 
   // Get all networks.
   NetworkStateHandler::NetworkStateList networks;
   network_state_handler_->GetNetworkListByType(NetworkTypePattern::Default(),
                                                false /* configured_only */,
                                                false /* visible_only */,
                                                0 /* no limit */,
                                                &networks);
@@ skipping 47 matching lines @@
   network_state_handler_->SetTetherTechnologyState(
       NetworkStateHandler::TECHNOLOGY_ENABLED);
 
   NetworkStateHandler::NetworkStateList tether_networks;
 
   GetTetherNetworkList(0 /* no limit */, &tether_networks);
   EXPECT_EQ(0u, tether_networks.size());
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
-      kTetherSignalStrength1);
+      kTetherSignalStrength1, kTetherHasConnectedToHost1);
 
   GetTetherNetworkList(0 /* no limit */, &tether_networks);
   EXPECT_EQ(1u, tether_networks.size());
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid2, kTetherName2, kTetherCarrier2, kTetherBatteryPercentage2,
-      kTetherSignalStrength2);
+      kTetherSignalStrength2, kTetherHasConnectedToHost2);
 
   GetTetherNetworkList(0 /* no limit */, &tether_networks);
   EXPECT_EQ(2u, tether_networks.size());
 
   GetTetherNetworkList(1 /* no limit */, &tether_networks);
   EXPECT_EQ(1u, tether_networks.size());
 }
 
 TEST_F(NetworkStateHandlerTest, NetworkListChanged) {
   size_t stub_network_count = test_observer_->network_count();
@@ skipping 249 matching lines @@
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkState) {
   network_state_handler_->SetTetherTechnologyState(
       NetworkStateHandler::TECHNOLOGY_ENABLED);
 
   EXPECT_EQ(0u, test_observer_->network_list_changed_count());
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
-      kTetherSignalStrength1);
+      kTetherSignalStrength1, false /* has_connected_to_network */);
 
   EXPECT_EQ(1u, test_observer_->network_list_changed_count());
 
   const NetworkState* tether_network =
       network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
   ASSERT_TRUE(tether_network);
   EXPECT_EQ(kTetherName1, tether_network->name());
   EXPECT_EQ(kTetherGuid1, tether_network->path());
   EXPECT_EQ(kTetherCarrier1, tether_network->carrier());
   EXPECT_EQ(kTetherBatteryPercentage1, tether_network->battery_percentage());
   EXPECT_EQ(kTetherSignalStrength1, tether_network->signal_strength());
+  EXPECT_FALSE(tether_network->tether_has_connected_to_host());
 
   // Update the tether properties and verify the changes.
   EXPECT_TRUE(network_state_handler_->UpdateTetherNetworkProperties(
       kTetherGuid1, "NewCarrier", 5 /* battery_percentage */,
       10 /* signal_strength */));
 
   EXPECT_EQ(2u, test_observer_->network_list_changed_count());
 
   tether_network =
       network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
   ASSERT_TRUE(tether_network);
   EXPECT_EQ(kTetherName1, tether_network->name());
   EXPECT_EQ(kTetherGuid1, tether_network->path());
   EXPECT_EQ("NewCarrier", tether_network->carrier());
   EXPECT_EQ(5, tether_network->battery_percentage());
   EXPECT_EQ(10, tether_network->signal_strength());
+  EXPECT_FALSE(tether_network->tether_has_connected_to_host());
+
+  // Now, set the HasConnectedToHost property to true.
+  EXPECT_TRUE(
+      network_state_handler_->SetTetherNetworkHasConnectedToHost(kTetherGuid1));
+
+  EXPECT_EQ(3u, test_observer_->network_list_changed_count());
+
+  // Try calling that function again. It should return false and should not
+  // trigger a NetworkListChanged() callback for observers.
+  EXPECT_FALSE(
+      network_state_handler_->SetTetherNetworkHasConnectedToHost(kTetherGuid1));
+
+  EXPECT_EQ(3u, test_observer_->network_list_changed_count());
 
   network_state_handler_->RemoveTetherNetworkState(kTetherGuid1);
 
-  EXPECT_EQ(3u, test_observer_->network_list_changed_count());
+  EXPECT_EQ(4u, test_observer_->network_list_changed_count());
 
   ASSERT_FALSE(network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1));
 
   // Updating tether properties should fail since the network was removed.
   EXPECT_FALSE(network_state_handler_->UpdateTetherNetworkProperties(
       kTetherGuid1, "NewNewCarrier", 15 /* battery_percentage */,
       20 /* signal_strength */));
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociation) {
   network_state_handler_->SetTetherTechnologyState(
       NetworkStateHandler::TECHNOLOGY_ENABLED);
 
   EXPECT_EQ(0u, test_observer_->network_list_changed_count());
 
   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);
+      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 =
@@ skipping 19 matching lines @@
   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();
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
-      kTetherSignalStrength1);
+      kTetherSignalStrength1, kTetherHasConnectedToHost1);
   EXPECT_TRUE(
       network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
           kTetherGuid1, kWifiGuid1));
 
   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());
 
   service_test_->RemoveService(wifi_path);
   UpdateManagerProperties();
 
   tether_network =
       network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
   ASSERT_TRUE(tether_network->tether_guid().empty());
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociation_NoWifiNetwork) {
   network_state_handler_->SetTetherTechnologyState(
       NetworkStateHandler::TECHNOLOGY_ENABLED);
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
-      kTetherSignalStrength1);
+      kTetherSignalStrength1, kTetherHasConnectedToHost1);
 
   EXPECT_FALSE(
       network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
           kTetherGuid1, kWifiGuid1));
 }
 
 TEST_F(NetworkStateHandlerTest, TetherNetworkStateAssociation_NoTetherNetwork) {
   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();
 
   ASSERT_FALSE(
       network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
           kTetherGuid1, kWifiGuid1));
 }
 
 TEST_F(NetworkStateHandlerTest, SetTetherNetworkStateConnectionState) {
   network_state_handler_->SetTetherTechnologyState(
       NetworkStateHandler::TECHNOLOGY_ENABLED);
 
   network_state_handler_->AddTetherNetworkState(
       kTetherGuid1, kTetherName1, kTetherCarrier1, kTetherBatteryPercentage1,
-      kTetherSignalStrength1);
+      kTetherSignalStrength1, kTetherHasConnectedToHost1);
 
   // Add corresponding Wi-Fi network.
   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();
 
@@ skipping 271 matching lines @@
                                     shill::kIPConfigProperty,
                                     base::Value(kIPConfigPath));
   UpdateManagerProperties();
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice(
       kShillManagerClientStubWifiDevice));
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(
       kShillManagerClientStubDefaultWifi));
 }
 
 }  // namespace chromeos