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

Unified Diff: chrome/browser/chromeos/tether/tether_service_unittest.cc

Issue 2883283004: Merged Tether and cellular network types in System Tray. (Closed)
Patch Set: khorimoto@ comments Created 3 years, 6 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: chrome/browser/chromeos/tether/tether_service_unittest.cc
diff --git a/chrome/browser/chromeos/tether/tether_service_unittest.cc b/chrome/browser/chromeos/tether/tether_service_unittest.cc
index 8fc262b36be030e2e78e1c494b5b67f460ac4d17..197e0af53eeb2ec1d2153109444aa54519a8021b 100644
--- a/chrome/browser/chromeos/tether/tether_service_unittest.cc
+++ b/chrome/browser/chromeos/tether/tether_service_unittest.cc
@@ -171,6 +171,13 @@ class TetherServiceTest : public chromeos::NetworkStateTest {
TECHNOLOGY_AVAILABLE);
}
+ void SetCellularTechnologyStateEnabled(bool enabled) {
+ network_state_handler()->SetTechnologyEnabled(
+ chromeos::NetworkTypePattern::Cellular(), enabled,
+ chromeos::network_handler::ErrorCallback());
+ base::RunLoop().RunUntilIdle();
+ }
+
content::TestBrowserThreadBundle thread_bundle_;
std::unique_ptr<TestingProfile> profile_;
@@ -281,6 +288,72 @@ TEST_F(TetherServiceTest, TestBluetoothIsNotPowered) {
chromeos::NetworkTypePattern::Tether()));
}
+TEST_F(TetherServiceTest, TestCellularIsUnavailable) {
+ test_manager_client()->RemoveTechnology(shill::kTypeCellular);
+ ASSERT_EQ(
+ chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_UNAVAILABLE,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Cellular()));
+
+ CreateTetherService();
+
+ SetTetherTechnologyStateEnabled(false);
+ EXPECT_EQ(
+ chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_AVAILABLE,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Tether()));
+
+ SetTetherTechnologyStateEnabled(true);
+ EXPECT_EQ(chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_ENABLED,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Tether()));
+}
+
+TEST_F(TetherServiceTest, TestCellularIsAvailable) {
+ // TODO (lesliewatkins): Investigate why cellular needs to be removed and
+ // re-added for NetworkStateHandler to return the correct TechnologyState.
+ test_manager_client()->RemoveTechnology(shill::kTypeCellular);
+ test_manager_client()->AddTechnology(shill::kTypeCellular, false);
+
+ CreateTetherService();
+
+ // Cellular disabled
+ SetCellularTechnologyStateEnabled(false);
+ ASSERT_EQ(
+ chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_AVAILABLE,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Cellular()));
+
+ SetTetherTechnologyStateEnabled(false);
+ EXPECT_EQ(
+ chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_UNINITIALIZED,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Tether()));
+
+ SetTetherTechnologyStateEnabled(true);
+ EXPECT_EQ(
+ chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_UNINITIALIZED,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Tether()));
+
+ // Cellular enabled
+ SetCellularTechnologyStateEnabled(true);
+ ASSERT_EQ(chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_ENABLED,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Cellular()));
+
+ SetTetherTechnologyStateEnabled(false);
+ EXPECT_EQ(
+ chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_AVAILABLE,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Tether()));
+
+ SetTetherTechnologyStateEnabled(true);
+ EXPECT_EQ(chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_ENABLED,
+ network_state_handler()->GetTechnologyState(
+ chromeos::NetworkTypePattern::Tether()));
+}
+
TEST_F(TetherServiceTest, TestEnabled) {
CreateTetherService();

Powered by Google App Engine
This is Rietveld 408576698