Changed wifi arcs to mobile bars for Tether network.

chromeos/components/tether/wifi_hotspot_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/wifi_hotspot_connector.h"
 
 #include <memory>
 #include <sstream>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/timer/mock_timer.h"
 #include "base/values.h"
+#include "chromeos/components/tether/fake_active_host.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_state_test.h"
 #include "chromeos/network/shill_property_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
 
 namespace chromeos {
 
 namespace tether {
 
 namespace {
 
 const char kSsid[] = "ssid";
 const char kPassword[] = "password";
 
 const char kOtherWifiServiceGuid[] = "otherWifiServiceGuid";
 
+const char kDeviceId[] = "deviceId";
+
 std::string CreateConfigurationJsonString(const std::string& guid) {
   std::stringstream ss;
   ss << "{"
      << "  \"GUID\": \"" << guid << "\","
      << "  \"Type\": \"" << shill::kTypeWifi << "\","
      << "  \"State\": \"" << shill::kStateIdle << "\""
      << "}";
   return ss.str();
 }
 
@@ skipping 64 matching lines @@
 
   void SetUp() override {
     other_wifi_service_path_.clear();
     connection_callback_responses_.clear();
 
     DBusThreadManager::Initialize();
     NetworkStateTest::SetUp();
     SetUpShillState();
 
     test_network_connect_ = base::WrapUnique(new TestNetworkConnect(this));
+    fake_active_host_ = base::WrapUnique(new FakeActiveHost());

[Kyle Horimoto, 2017/04/17 19:50:04]

nit: Use base::MakeUnique<FakeActiveHost>().

[lesliewatkins, 2017/04/27 00:33:53]

Done.

+
+    network_state_handler()->AddTetherNetworkState(kDeviceId, "");

[Kyle Horimoto, 2017/04/17 19:50:04]

You should be passing a tether network GUID, not a device ID. I realize that
currently, we use the same value, but this will be changing in the future.
Please adjust the variable name accordingly.

[lesliewatkins, 2017/04/27 00:33:54]

Done.

+
+    fake_active_host_->SetActiveHostConnecting(kDeviceId, kDeviceId);

[Kyle Horimoto, 2017/04/17 19:50:04]

Also pass the GUID here as well. Don't use the same variable (and make the
device ID and tether GUID values different).

[lesliewatkins, 2017/04/27 00:33:54]

Done.

 
     wifi_hotspot_connector_ = base::WrapUnique(new WifiHotspotConnector(
-        network_state_handler(), test_network_connect_.get()));
+        network_state_handler(), test_network_connect_.get(),
+        fake_active_host_.get()));
 
     mock_timer_ = new base::MockTimer(true /* retain_user_task */,
                                       false /* is_repeating */);
     wifi_hotspot_connector_->SetTimerForTest(base::WrapUnique(mock_timer_));
   }
 
   void SetUpShillState() {
     // Add a Wi-Fi service unrelated to the one under test. In some tests, a
     // connection from another device is tested.
     other_wifi_service_path_ = ConfigureService(
@@ skipping 59 matching lines @@
           last_configuration->GetString(shill::kPassphraseProperty, &password));
       EXPECT_EQ(expected_password, password);
     }
 
     std::string wifi_guid;
     EXPECT_TRUE(
         last_configuration->GetString(shill::kGuidProperty, &wifi_guid));
     return wifi_guid;
   }
 
+  void VerifyTetherAndWifiNetworkAssociation(const std::string& wifi_guid) {
+    const NetworkState* wifi_network_state =
+        network_state_handler()->GetNetworkStateFromGuid(wifi_guid);
+    EXPECT_TRUE(wifi_network_state);
+    EXPECT_EQ(fake_active_host_->GetTetherNetworkGuid(),
+              wifi_network_state->tether_guid());
+
+    const NetworkState* tether_network_state =
+        network_state_handler()->GetNetworkStateFromGuid(
+            fake_active_host_->GetTetherNetworkGuid());
+    EXPECT_TRUE(tether_network_state);
+    EXPECT_EQ(wifi_guid, tether_network_state->tether_guid());
+  }
+
+  void VerifyTetherAndWifiNetworkDisassociation(const std::string& wifi_guid) {

[Kyle Horimoto, 2017/04/17 19:50:04]

nit: Rename this to VerifyTetherAndWifiNetworkNotAssociated().

[lesliewatkins, 2017/04/27 00:33:53]

Done.

+    const NetworkState* wifi_network_state =
+        network_state_handler()->GetNetworkStateFromGuid(wifi_guid);
+    EXPECT_TRUE(wifi_network_state);
+    EXPECT_NE(fake_active_host_->GetTetherNetworkGuid(),

[Kyle Horimoto, 2017/04/17 19:50:04]

Here, the tether GUID should be "". Assert that the GUID is empty(), not just
that it isn't equal to another value.

[lesliewatkins, 2017/04/27 00:33:53]

Done.

[lesliewatkins, 2017/04/27 00:33:53]

Done.

+              wifi_network_state->tether_guid());
+
+    const NetworkState* tether_network_state =
+        network_state_handler()->GetNetworkStateFromGuid(
+            fake_active_host_->GetTetherNetworkGuid());
+    EXPECT_TRUE(tether_network_state);
+    EXPECT_NE(wifi_guid, tether_network_state->tether_guid());
+  }
+
   void WifiConnectionCallback(const std::string& wifi_guid) {
     connection_callback_responses_.push_back(wifi_guid);
   }
 
   base::test::ScopedTaskEnvironment scoped_task_environment_;
 
   std::string other_wifi_service_path_;
   std::vector<std::string> connection_callback_responses_;
 
   base::MockTimer* mock_timer_;
   std::unique_ptr<TestNetworkConnect> test_network_connect_;
 
   std::unique_ptr<WifiHotspotConnector> wifi_hotspot_connector_;
 
  private:
+  std::unique_ptr<FakeActiveHost> fake_active_host_;

[Kyle Horimoto, 2017/04/17 19:50:04]

Move this up to the protected section underneath the other test doubles.
(beneath test_network_connect_).

[lesliewatkins, 2017/04/27 00:33:53]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(WifiHotspotConnectorTest);
 };
 
 TEST_F(WifiHotspotConnectorTest, TestConnect_NetworkDoesNotBecomeConnectable) {
   wifi_hotspot_connector_->ConnectToWifiHotspot(
       std::string(kSsid), std::string(kPassword),
       base::Bind(&WifiHotspotConnectorTest::WifiConnectionCallback,
                  base::Unretained(this)));
 
   std::string wifi_guid =
@@ skipping 16 matching lines @@
       base::Bind(&WifiHotspotConnectorTest::WifiConnectionCallback,
                  base::Unretained(this)));
 
   std::string wifi_guid =
       VerifyLastConfiguration(std::string(kSsid), std::string(kPassword));
   EXPECT_FALSE(wifi_guid.empty());
 
   // Another network becomes connectable. This should not cause the connection
   // to start.
   NotifyConnectable(other_wifi_service_path_);
+  VerifyTetherAndWifiNetworkDisassociation(wifi_guid);
   EXPECT_EQ("", test_network_connect_->network_id_to_connect());
 
   // Timeout timer fires.
   EXPECT_EQ(0u, connection_callback_responses_.size());
   InvokeTimerTask();
   EXPECT_EQ(1u, connection_callback_responses_.size());
   EXPECT_EQ("", connection_callback_responses_[0]);
 }
 
 TEST_F(WifiHotspotConnectorTest, TestConnect_CannotConnectToNetwork) {
   wifi_hotspot_connector_->ConnectToWifiHotspot(
       std::string(kSsid), std::string(kPassword),
       base::Bind(&WifiHotspotConnectorTest::WifiConnectionCallback,
                  base::Unretained(this)));
 
   std::string wifi_guid =
       VerifyLastConfiguration(std::string(kSsid), std::string(kPassword));
   EXPECT_FALSE(wifi_guid.empty());
 
   // Network becomes connectable.
   NotifyConnectable(test_network_connect_->last_service_path_created());
+  VerifyTetherAndWifiNetworkAssociation(wifi_guid);
   EXPECT_EQ(wifi_guid, test_network_connect_->network_id_to_connect());
 
   // Network connection does not occur.
   EXPECT_EQ(0u, connection_callback_responses_.size());
 
   // Timeout timer fires.
   InvokeTimerTask();
   EXPECT_EQ(1u, connection_callback_responses_.size());
   EXPECT_EQ("", connection_callback_responses_[0]);
 }
 
 TEST_F(WifiHotspotConnectorTest, TestConnect_Success) {
   wifi_hotspot_connector_->ConnectToWifiHotspot(
       std::string(kSsid), std::string(kPassword),
       base::Bind(&WifiHotspotConnectorTest::WifiConnectionCallback,
                  base::Unretained(this)));
 
   std::string wifi_guid =
       VerifyLastConfiguration(std::string(kSsid), std::string(kPassword));
   EXPECT_FALSE(wifi_guid.empty());
 
   // Network becomes connectable.
   NotifyConnectable(test_network_connect_->last_service_path_created());
+  VerifyTetherAndWifiNetworkAssociation(wifi_guid);
   EXPECT_EQ(wifi_guid, test_network_connect_->network_id_to_connect());
   EXPECT_EQ(0u, connection_callback_responses_.size());
 
   // Connection to network successful.
   NotifyConnected(test_network_connect_->last_service_path_created());
   EXPECT_EQ(1u, connection_callback_responses_.size());
   EXPECT_EQ(wifi_guid, connection_callback_responses_[0]);
   VerifyTimerStopped();
 }
 
 TEST_F(WifiHotspotConnectorTest, TestConnect_Success_EmptyPassword) {
   wifi_hotspot_connector_->ConnectToWifiHotspot(
       std::string(kSsid), "",
       base::Bind(&WifiHotspotConnectorTest::WifiConnectionCallback,
                  base::Unretained(this)));
 
   std::string wifi_guid = VerifyLastConfiguration(std::string(kSsid), "");
   EXPECT_FALSE(wifi_guid.empty());
 
   // Network becomes connectable.
   NotifyConnectable(test_network_connect_->last_service_path_created());
+  VerifyTetherAndWifiNetworkAssociation(wifi_guid);
   EXPECT_EQ(wifi_guid, test_network_connect_->network_id_to_connect());
   EXPECT_EQ(0u, connection_callback_responses_.size());
 
   // Connection to network successful.
   NotifyConnected(test_network_connect_->last_service_path_created());
   EXPECT_EQ(1u, connection_callback_responses_.size());
   EXPECT_EQ(wifi_guid, connection_callback_responses_[0]);
   VerifyTimerStopped();
 }
 
@@ skipping 24 matching lines @@
   EXPECT_FALSE(service_path2.empty());
 
   EXPECT_NE(service_path1, service_path2);
 
   // The original connection attempt should have gotten a "" response.
   EXPECT_EQ(1u, connection_callback_responses_.size());
   EXPECT_EQ("", connection_callback_responses_[0]);
 
   // First network becomes connectable.
   NotifyConnectable(service_path1);
+  VerifyTetherAndWifiNetworkDisassociation(wifi_guid1);
 
   // A connection should not have started to that GUID.
   EXPECT_EQ("", test_network_connect_->network_id_to_connect());
   EXPECT_EQ(1u, connection_callback_responses_.size());
 
   // Second network becomes connectable.
   NotifyConnectable(service_path2);
+  VerifyTetherAndWifiNetworkAssociation(wifi_guid2);
   EXPECT_EQ(wifi_guid2, test_network_connect_->network_id_to_connect());
   EXPECT_EQ(1u, connection_callback_responses_.size());
 
   // Connection to network successful.
   NotifyConnected(service_path2);
   EXPECT_EQ(2u, connection_callback_responses_.size());
   EXPECT_EQ(wifi_guid2, connection_callback_responses_[1]);
   VerifyTimerStopped();
 }
 
 }  // namespace tether
 
 }  // namespace cryptauth