Changed wifi arcs to mobile bars for Tether network.

chromeos/components/tether/tether_connector_unittest.cc

 // Copyright 2017 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/components/tether/tether_connector.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/components/tether/connect_tethering_operation.h"
 #include "chromeos/components/tether/device_id_tether_network_guid_map.h"
@@ skipping 179 matching lines @@
         "TetherNetworkName2", "TetherNetworkCarrier2",
         90 /* battery_percentage */, 50 /* signal_strength */,
         true /* has_connected_to_host */);
   }
 
   void SuccessfullyJoinWifiNetwork() {
     ConfigureService(CreateWifiConfigurationJsonString());
     fake_wifi_hotspot_connector_->CallMostRecentCallback(kWifiNetworkGuid);
   }
 
-  void VerifyTetherAndWifiNetworkAssociation(
-      const std::string& tether_network_guid) {
-    const NetworkState* tether_network_state =
-        network_state_handler()->GetNetworkStateFromGuid(tether_network_guid);
-    EXPECT_TRUE(tether_network_state);
-    EXPECT_EQ(kWifiNetworkGuid, tether_network_state->tether_guid());
-
-    const NetworkState* wifi_network_state =
-        network_state_handler()->GetNetworkStateFromGuid(kWifiNetworkGuid);
-    EXPECT_TRUE(wifi_network_state);
-    EXPECT_EQ(tether_network_guid, wifi_network_state->tether_guid());
-  }
-
   void SuccessCallback() { result_ = kSuccessResult; }
 
   void ErrorCallback(const std::string& error_name,
                      std::unique_ptr<base::DictionaryValue> error_data) {
     result_ = error_name;
   }
 
   void CallTetherDelegate(const std::string& tether_network_guid) {
     test_network_connection_handler_->CallTetherDelegate(
         tether_network_guid,
@@ skipping 96 matching lines @@
   fake_operation_factory_->created_operations()[0]->SendSuccessfulResponse(
       kSsid, kPassword);
   EXPECT_EQ(ActiveHost::ActiveHostStatus::CONNECTING,
             fake_active_host_->GetActiveHostStatus());
 
   // |fake_wifi_hotspot_connector_| should have received the SSID and password
   // above. Verify this, then return an empty string, signaling a failure to
   // connect.
   EXPECT_EQ(kSsid, fake_wifi_hotspot_connector_->most_recent_ssid());
   EXPECT_EQ(kPassword, fake_wifi_hotspot_connector_->most_recent_password());
+  EXPECT_EQ(fake_active_host_->GetTetherNetworkGuid(),
+            fake_wifi_hotspot_connector_->most_recent_tether_network_guid());
   fake_wifi_hotspot_connector_->CallMostRecentCallback("");
 
   // The failure should have resulted in the host being disconnected.
   EXPECT_EQ(ActiveHost::ActiveHostStatus::DISCONNECTED,
             fake_active_host_->GetActiveHostStatus());
   EXPECT_EQ(NetworkConnectionHandler::kErrorConnectFailed, GetResultAndReset());
 }
 
 TEST_F(TetherConnectorTest, TestSuccessfulConnection) {
   CallTetherDelegate(GetTetherNetworkGuid(test_devices_[0].GetDeviceId()));
@@ skipping 12 matching lines @@
   fake_operation_factory_->created_operations()[0]->SendSuccessfulResponse(
       kSsid, kPassword);
   EXPECT_EQ(ActiveHost::ActiveHostStatus::CONNECTING,
             fake_active_host_->GetActiveHostStatus());
 
   // |fake_wifi_hotspot_connector_| should have received the SSID and password
   // above. Verify this, then return the GUID corresponding to the connected
   // Wi-Fi network.
   EXPECT_EQ(kSsid, fake_wifi_hotspot_connector_->most_recent_ssid());
   EXPECT_EQ(kPassword, fake_wifi_hotspot_connector_->most_recent_password());
+  EXPECT_EQ(fake_active_host_->GetTetherNetworkGuid(),
+            fake_wifi_hotspot_connector_->most_recent_tether_network_guid());
   SuccessfullyJoinWifiNetwork();
 
-  // The active host should now be connected, and the tether and Wi-Fi networks
-  // should be associated.
+  // The active host should now be connected.
   EXPECT_EQ(ActiveHost::ActiveHostStatus::CONNECTED,
             fake_active_host_->GetActiveHostStatus());
   EXPECT_EQ(test_devices_[0].GetDeviceId(),
             fake_active_host_->GetActiveHostDeviceId());
   EXPECT_EQ(GetTetherNetworkGuid(test_devices_[0].GetDeviceId()),
             fake_active_host_->GetTetherNetworkGuid());
   EXPECT_EQ(kWifiNetworkGuid, fake_active_host_->GetWifiNetworkGuid());
-  VerifyTetherAndWifiNetworkAssociation(
-      GetTetherNetworkGuid(test_devices_[0].GetDeviceId()));
+
   EXPECT_EQ(kSuccessResult, GetResultAndReset());
 }
 
 TEST_F(TetherConnectorTest,
        TestNewConnectionAttemptDuringFetch_DifferentDevice) {
   CallTetherDelegate(GetTetherNetworkGuid(test_devices_[0].GetDeviceId()));
 
   // Instead of invoking the pending callbacks on |fake_tether_host_fetcher_|,
   // attempt another connection attempt, this time to another device.
   CallTetherDelegate(GetTetherNetworkGuid(test_devices_[1].GetDeviceId()));
@@ skipping 42 matching lines @@
             fake_active_host_->GetActiveHostDeviceId());
   EXPECT_EQ(GetTetherNetworkGuid(test_devices_[1].GetDeviceId()),
             fake_active_host_->GetTetherNetworkGuid());
   EXPECT_TRUE(fake_active_host_->GetWifiNetworkGuid().empty());
 
   // A second operation should have been created.
   EXPECT_EQ(2u, fake_operation_factory_->created_operations().size());
 
   // No connection should have been started.
   EXPECT_TRUE(fake_wifi_hotspot_connector_->most_recent_ssid().empty());
   EXPECT_TRUE(fake_wifi_hotspot_connector_->most_recent_password().empty());

[Kyle Horimoto, 2017/05/03 22:47:28]

Also check that tether GUID is empty.

[lesliewatkins, 2017/05/04 01:40:16]

Done.

 
   // The second operation replies successfully, and this response should
   // result in a Wi-Fi connection attempt.
   fake_operation_factory_->created_operations()[1]->SendSuccessfulResponse(
       kSsid, kPassword);
   EXPECT_EQ(kSsid, fake_wifi_hotspot_connector_->most_recent_ssid());
   EXPECT_EQ(kPassword, fake_wifi_hotspot_connector_->most_recent_password());
+  EXPECT_EQ(fake_active_host_->GetTetherNetworkGuid(),
+            fake_wifi_hotspot_connector_->most_recent_tether_network_guid());
 }
 
 TEST_F(TetherConnectorTest,
        TestNewConnectionAttemptDuringWifiConnection_DifferentDevice) {
   CallTetherDelegate(GetTetherNetworkGuid(test_devices_[0].GetDeviceId()));
   EXPECT_EQ(ActiveHost::ActiveHostStatus::CONNECTING,
             fake_active_host_->GetActiveHostStatus());
   EXPECT_EQ(test_devices_[0].GetDeviceId(),
             fake_active_host_->GetActiveHostDeviceId());
 
   fake_tether_host_fetcher_->InvokePendingCallbacks();
 
   EXPECT_EQ(1u, fake_operation_factory_->created_operations().size());
   fake_operation_factory_->created_operations()[0]->SendSuccessfulResponse(
       kSsid, kPassword);
   EXPECT_EQ(ActiveHost::ActiveHostStatus::CONNECTING,
             fake_active_host_->GetActiveHostStatus());
   EXPECT_EQ(kSsid, fake_wifi_hotspot_connector_->most_recent_ssid());
   EXPECT_EQ(kPassword, fake_wifi_hotspot_connector_->most_recent_password());
+  EXPECT_EQ(fake_active_host_->GetTetherNetworkGuid(),
+            fake_wifi_hotspot_connector_->most_recent_tether_network_guid());
 
   // While the connection to the Wi-Fi network is in progress, start a new
   // connection attempt.
   CallTetherDelegate(GetTetherNetworkGuid(test_devices_[1].GetDeviceId()));
   // The first connection attempt should have resulted in a connect canceled
   // error.
   EXPECT_EQ(NetworkConnectionHandler::kErrorConnectCanceled,
             GetResultAndReset());
   fake_tether_host_fetcher_->InvokePendingCallbacks();
 
   // Connect successfully to the first Wi-Fi network. Even though a temporary
   // connection has succeeded, the active host should be CONNECTING to device 1.
   SuccessfullyJoinWifiNetwork();
   EXPECT_EQ(ActiveHost::ActiveHostStatus::CONNECTING,
             fake_active_host_->GetActiveHostStatus());
   EXPECT_EQ(test_devices_[1].GetDeviceId(),
             fake_active_host_->GetActiveHostDeviceId());
   EXPECT_EQ(GetTetherNetworkGuid(test_devices_[1].GetDeviceId()),
             fake_active_host_->GetTetherNetworkGuid());
   EXPECT_TRUE(fake_active_host_->GetWifiNetworkGuid().empty());
 }
 
 }  // namespace tether
 
 }  // namespace chromeos