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

Unified Diff: chromeos/network/network_state_handler_unittest.cc

Issue 2701463003: Create a Tether section in the system tray network list. (Closed)
Patch Set: Comments. Created 3 years, 10 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
« no previous file with comments | « chromeos/network/network_state_handler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8f48ef2e9006288e7b0ef8478a0afaf6c67371e3..056f58e8ff9a3e1681cb5420839acf08fe1a0df9 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -12,10 +12,12 @@
#include <string>
#include "base/bind.h"
+#include "base/command_line.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/values.h"
+#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_device_client.h"
#include "chromeos/dbus/shill_ipconfig_client.h"
@@ -45,7 +47,10 @@ const char kShillManagerClientStubDefaultWifi[] = "/service/wifi1";
const char kShillManagerClientStubWifi2[] = "/service/wifi2";
const char kShillManagerClientStubCellular[] = "/service/cellular1";
-const char kTetherName[] = "Device";
+const char kTetherGuid1[] = "tether1";
+const char kTetherGuid2[] = "tether2";
+const char kTetherName1[] = "Device1";
+const char kTetherName2[] = "Device2";
using chromeos::DeviceState;
using chromeos::NetworkState;
@@ -371,6 +376,30 @@ TEST_F(NetworkStateHandlerTest, GetNetworkList) {
EXPECT_EQ(1u, networks.size());
}
+TEST_F(NetworkStateHandlerTest, GetTetherNetworkList) {
+ NetworkStateHandler::NetworkStateList tether_networks;
+
+ network_state_handler_->GetTetherNetworkList(0 /* no limit */,
+ &tether_networks);
+ EXPECT_EQ(0u, tether_networks.size());
+
+ network_state_handler_->AddTetherNetworkState(kTetherGuid1, kTetherName1);
+
+ network_state_handler_->GetTetherNetworkList(0 /* no limit */,
+ &tether_networks);
+ EXPECT_EQ(1u, tether_networks.size());
+
+ network_state_handler_->AddTetherNetworkState(kTetherGuid2, kTetherName2);
+
+ network_state_handler_->GetTetherNetworkList(0 /* no limit */,
+ &tether_networks);
+ EXPECT_EQ(2u, tether_networks.size());
+
+ network_state_handler_->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();
// Set up two additional visible networks.
@@ -497,6 +526,19 @@ TEST_F(NetworkStateHandlerTest, TechnologyState) {
network_state_handler_->GetTechnologyState(NetworkTypePattern::Wimax()));
}
+TEST_F(NetworkStateHandlerTest, TetherTechnologyState) {
+ EXPECT_EQ(
+ NetworkStateHandler::TECHNOLOGY_UNAVAILABLE,
+ network_state_handler_->GetTechnologyState(NetworkTypePattern::Tether()));
+
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ chromeos::switches::kEnableTether);
+
+ EXPECT_EQ(
+ NetworkStateHandler::TECHNOLOGY_ENABLED,
+ network_state_handler_->GetTechnologyState(NetworkTypePattern::Tether()));
+}
+
TEST_F(NetworkStateHandlerTest, ServicePropertyChanged) {
// Set a service property.
const std::string eth1 = kShillManagerClientStubDefaultService;
@@ -547,21 +589,20 @@ TEST_F(NetworkStateHandlerTest, GetState) {
TEST_F(NetworkStateHandlerTest, TetherNetworkState) {
EXPECT_EQ(0u, test_observer_->network_list_changed_count());
- const std::string& guid =
- network_state_handler_->CreateTetherNetworkState(kTetherName);
+ network_state_handler_->AddTetherNetworkState(kTetherGuid1, kTetherName1);
EXPECT_EQ(1u, test_observer_->network_list_changed_count());
const NetworkState* tether_network =
- network_state_handler_->GetNetworkStateFromGuid(guid);
+ network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1);
ASSERT_TRUE(tether_network);
- EXPECT_EQ(kTetherName, tether_network->name());
+ EXPECT_EQ(kTetherName1, tether_network->name());
- network_state_handler_->RemoveTetherNetworkState(guid);
+ network_state_handler_->RemoveTetherNetworkState(kTetherGuid1);
EXPECT_EQ(2u, test_observer_->network_list_changed_count());
- ASSERT_FALSE(network_state_handler_->GetNetworkStateFromGuid(guid));
+ ASSERT_FALSE(network_state_handler_->GetNetworkStateFromGuid(kTetherGuid1));
}
TEST_F(NetworkStateHandlerTest, NetworkConnectionStateChanged) {
« no previous file with comments | « chromeos/network/network_state_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698