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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Issue 267433005: Provide IPConfigs in networkingPrivate.GetProperties (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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 | « no previous file | chrome/test/data/extensions/api_test/networking/test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
index 1fe7bcbfbfbf5fc2fe277d2e15d71649253458df..45eeadfee9b425c1a9510e100975b8af3d02b0a3 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -23,6 +23,7 @@
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_device_client.h"
+#include "chromeos/dbus/shill_ipconfig_client.h"
#include "chromeos/dbus/shill_manager_client.h"
#include "chromeos/dbus/shill_profile_client.h"
#include "chromeos/dbus/shill_service_client.h"
@@ -46,6 +47,8 @@
#include "components/wifi/fake_wifi_service.h"
#endif // defined(OS_CHROMEOS)
+// TODO(stevenjb/mef): Clean these tests up. crbug.com/371442
+
using testing::Return;
using testing::_;
@@ -57,6 +60,7 @@ using chromeos::DBusThreadManager;
using chromeos::NetworkPortalDetector;
using chromeos::NetworkPortalDetectorTestImpl;
using chromeos::ShillDeviceClient;
+using chromeos::ShillIPConfigClient;
using chromeos::ShillManagerClient;
using chromeos::ShillProfileClient;
using chromeos::ShillServiceClient;
@@ -68,6 +72,9 @@ namespace {
#if defined(OS_CHROMEOS)
const char kUser1ProfilePath[] = "/profile/user1/shill";
+const char kWifiDevicePath[] = "/device/stub_wifi_device1";
+const char kCellularDevicePath[] = "/device/stub_cellular_device1";
+const char kIPConfigPath[] = "/ipconfig/ipconfig1";
class TestListener : public content::NotificationObserver {
public:
@@ -112,7 +119,7 @@ class CryptoVerifyStub
virtual void VerifyAndEncryptCredentials(
scoped_ptr<base::ListValue> args,
const extensions::NetworkingPrivateServiceClient::CryptoVerify::
- VerifyAndEncryptCredentialsCallback& callback) OVERRIDE {
+ VerifyAndEncryptCredentialsCallback& callback) OVERRIDE {
callback.Run("encrypted_credentials", "");
}
@@ -130,7 +137,8 @@ class ExtensionNetworkingPrivateApiTest
public:
ExtensionNetworkingPrivateApiTest()
#if defined(OS_CHROMEOS)
- : detector_(NULL)
+ : detector_(NULL),
+ service_test_(NULL)
#endif
{
}
@@ -153,8 +161,8 @@ class ExtensionNetworkingPrivateApiTest
#if defined(OS_CHROMEOS)
static void AssignString(std::string* out,
- DBusMethodCallStatus call_status,
- const std::string& result) {
+ DBusMethodCallStatus call_status,
+ const std::string& result) {
CHECK_EQ(call_status, DBUS_METHOD_CALL_SUCCESS);
*out = result;
}
@@ -199,107 +207,118 @@ class ExtensionNetworkingPrivateApiTest
InitializeSanitizedUsername();
+ DBusThreadManager* dbus_manager = DBusThreadManager::Get();
ShillManagerClient::TestInterface* manager_test =
- DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface();
+ dbus_manager->GetShillManagerClient()->GetTestInterface();
+ ShillIPConfigClient::TestInterface* ip_config_test =
+ dbus_manager->GetShillIPConfigClient()->GetTestInterface();
ShillDeviceClient::TestInterface* device_test =
- DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
+ dbus_manager->GetShillDeviceClient()->GetTestInterface();
ShillProfileClient::TestInterface* profile_test =
- DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface();
- ShillServiceClient::TestInterface* service_test =
- DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
+ dbus_manager->GetShillProfileClient()->GetTestInterface();
+
+ service_test_ = dbus_manager->GetShillServiceClient()->GetTestInterface();
device_test->ClearDevices();
- service_test->ClearServices();
+ service_test_->ClearServices();
// Sends a notification about the added profile.
profile_test->AddProfile(kUser1ProfilePath, userhash_);
- device_test->AddDevice("/device/stub_wifi_device1",
- shill::kTypeWifi, "stub_wifi_device1");
- device_test->AddDevice("/device/stub_cellular_device1",
- shill::kTypeCellular, "stub_cellular_device1");
-
+ // Add IPConfigs
+ base::DictionaryValue ipconfig;
+ ipconfig.SetStringWithoutPathExpansion(shill::kAddressProperty, "0.0.0.0");
+ ipconfig.SetStringWithoutPathExpansion(shill::kGatewayProperty, "0.0.0.1");
+ ipconfig.SetIntegerWithoutPathExpansion(shill::kPrefixlenProperty, 0);
+ ipconfig.SetStringWithoutPathExpansion(
+ shill::kMethodProperty, shill::kTypeIPv4);
+ ip_config_test->AddIPConfig(kIPConfigPath, ipconfig);
+
+ // Add Devices
+ device_test->AddDevice(
+ kWifiDevicePath, shill::kTypeWifi, "stub_wifi_device1");
+ base::ListValue wifi_ip_configs;
+ wifi_ip_configs.AppendString(kIPConfigPath);
+ device_test->SetDeviceProperty(
+ kWifiDevicePath, shill::kIPConfigsProperty, wifi_ip_configs);
+ device_test->AddDevice(
+ kCellularDevicePath, shill::kTypeCellular, "stub_cellular_device1");
+
+ // Add Services
const bool add_to_watchlist = true;
const bool add_to_visible = true;
- service_test->AddService("stub_ethernet", "eth0",
- shill::kTypeEthernet, shill::kStateOnline,
- add_to_visible, add_to_watchlist);
- service_test->SetServiceProperty(
+ service_test_->AddService("stub_ethernet", "eth0",
+ shill::kTypeEthernet, shill::kStateOnline,
+ add_to_visible, add_to_watchlist);
+ service_test_->SetServiceProperty(
"stub_ethernet",
shill::kProfileProperty,
base::StringValue(ShillProfileClient::GetSharedProfilePath()));
profile_test->AddService(ShillProfileClient::GetSharedProfilePath(),
"stub_ethernet");
- service_test->AddService("stub_wifi1", "wifi1",
- shill::kTypeWifi, shill::kStateOnline,
- add_to_visible, add_to_watchlist);
- service_test->SetServiceProperty("stub_wifi1",
- shill::kSecurityProperty,
- base::StringValue(shill::kSecurityWep));
- service_test->SetServiceProperty("stub_wifi1",
- shill::kProfileProperty,
- base::StringValue(kUser1ProfilePath));
+ service_test_->AddService("stub_wifi1", "wifi1",
+ shill::kTypeWifi, shill::kStateOnline,
+ add_to_visible, add_to_watchlist);
+ service_test_->SetServiceProperty("stub_wifi1",
+ shill::kSecurityProperty,
+ base::StringValue(shill::kSecurityWep));
+ service_test_->SetServiceProperty("stub_wifi1",
+ shill::kSignalStrengthProperty,
+ base::FundamentalValue(40));
+ service_test_->SetServiceProperty("stub_wifi1",
+ shill::kProfileProperty,
+ base::StringValue(kUser1ProfilePath));
+ service_test_->SetServiceProperty("stub_wifi1",
+ shill::kConnectableProperty,
+ base::FundamentalValue(true));
+ service_test_->SetServiceProperty("stub_wifi1",
+ shill::kDeviceProperty,
+ base::StringValue(kWifiDevicePath));
profile_test->AddService(kUser1ProfilePath, "stub_wifi1");
base::ListValue frequencies1;
frequencies1.AppendInteger(2400);
- service_test->SetServiceProperty("stub_wifi1",
- shill::kWifiFrequencyListProperty,
- frequencies1);
- service_test->SetServiceProperty("stub_wifi1",
- shill::kWifiFrequency,
- base::FundamentalValue(2400));
-
- service_test->AddService("stub_wifi2", "wifi2_PSK",
- shill::kTypeWifi, shill::kStateIdle,
- add_to_visible, add_to_watchlist);
- service_test->SetServiceProperty("stub_wifi2",
- shill::kGuidProperty,
- base::StringValue("stub_wifi2"));
- service_test->SetServiceProperty("stub_wifi2",
- shill::kSecurityProperty,
- base::StringValue(shill::kSecurityPsk));
- service_test->SetServiceProperty("stub_wifi2",
- shill::kSignalStrengthProperty,
- base::FundamentalValue(80));
- service_test->SetServiceProperty("stub_wifi2",
- shill::kConnectableProperty,
- base::FundamentalValue(true));
+ service_test_->SetServiceProperty("stub_wifi1",
+ shill::kWifiFrequencyListProperty,
+ frequencies1);
+ service_test_->SetServiceProperty("stub_wifi1",
+ shill::kWifiFrequency,
+ base::FundamentalValue(2400));
+
+ service_test_->AddService("stub_wifi2", "wifi2_PSK",
+ shill::kTypeWifi, shill::kStateIdle,
+ add_to_visible, add_to_watchlist);
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kGuidProperty,
+ base::StringValue("stub_wifi2"));
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kSecurityProperty,
+ base::StringValue(shill::kSecurityPsk));
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kSignalStrengthProperty,
+ base::FundamentalValue(80));
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kConnectableProperty,
+ base::FundamentalValue(true));
base::ListValue frequencies2;
frequencies2.AppendInteger(2400);
frequencies2.AppendInteger(5000);
- service_test->SetServiceProperty("stub_wifi2",
- shill::kWifiFrequencyListProperty,
- frequencies2);
- service_test->SetServiceProperty("stub_wifi2",
- shill::kWifiFrequency,
- base::FundamentalValue(5000));
- service_test->SetServiceProperty("stub_wifi2",
- shill::kProfileProperty,
- base::StringValue(kUser1ProfilePath));
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kWifiFrequencyListProperty,
+ frequencies2);
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kWifiFrequency,
+ base::FundamentalValue(5000));
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kProfileProperty,
+ base::StringValue(kUser1ProfilePath));
profile_test->AddService(kUser1ProfilePath, "stub_wifi2");
- service_test->AddService("stub_cellular1", "cellular1",
- shill::kTypeCellular, shill::kStateIdle,
- add_to_visible, add_to_watchlist);
- service_test->SetServiceProperty(
- "stub_cellular1",
- shill::kNetworkTechnologyProperty,
- base::StringValue(shill::kNetworkTechnologyGsm));
- service_test->SetServiceProperty(
- "stub_cellular1",
- shill::kActivationStateProperty,
- base::StringValue(shill::kActivationStateNotActivated));
- service_test->SetServiceProperty(
- "stub_cellular1",
- shill::kRoamingStateProperty,
- base::StringValue(shill::kRoamingStateHome));
-
- service_test->AddService("stub_vpn1", "vpn1",
- shill::kTypeVPN,
- shill::kStateOnline,
- add_to_visible, add_to_watchlist);
+ service_test_->AddService("stub_vpn1", "vpn1",
+ shill::kTypeVPN,
+ shill::kStateOnline,
+ add_to_visible, add_to_watchlist);
manager_test->SortManagerServices();
@@ -335,6 +354,7 @@ class ExtensionNetworkingPrivateApiTest
NetworkPortalDetectorTestImpl* detector() { return detector_; }
NetworkPortalDetectorTestImpl* detector_;
+ ShillServiceClient::TestInterface* service_test_;
policy::MockConfigurationPolicyProvider provider_;
std::string userhash_;
#endif
@@ -368,18 +388,24 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
<< message_;
}
+#if defined(OS_CHROMEOS)
+// Non-Chrome OS only supports wifi currently.
IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) {
EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_;
}
+#endif
IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
GetVisibleNetworksWifi) {
EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_;
}
+#if defined(OS_CHROMEOS)
+// TODO(stevenjb/mef): Fix this on non-Chrome OS, crbug.com/371442.
IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, RequestNetworkScan) {
EXPECT_TRUE(RunNetworkingSubtest("requestNetworkScan")) << message_;
}
+#endif
// Properties are filtered and translated through
// ShillToONCTranslator::TranslateWiFiWithState
@@ -403,24 +429,23 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, CreateNetwork) {
EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_;
}
+#if defined(OS_CHROMEOS)
+// TODO(stevenjb/mef): Find a maintainable way to support this on win/mac and
+// a better way to set this up on Chrome OS.
IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
GetManagedProperties) {
-#if defined(OS_CHROMEOS)
- // TODO(mef): Move this to ChromeOS-specific helper or SetUpOnMainThread.
- ShillServiceClient::TestInterface* service_test =
- DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
const std::string uidata_blob =
"{ \"user_settings\": {"
" \"WiFi\": {"
" \"Passphrase\": \"FAKE_CREDENTIAL_VPaJDV9x\" }"
" }"
"}";
- service_test->SetServiceProperty("stub_wifi2",
- shill::kUIDataProperty,
- base::StringValue(uidata_blob));
- service_test->SetServiceProperty("stub_wifi2",
- shill::kAutoConnectProperty,
- base::FundamentalValue(false));
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kUIDataProperty,
+ base::StringValue(uidata_blob));
+ service_test_->SetServiceProperty("stub_wifi2",
+ shill::kAutoConnectProperty,
+ base::FundamentalValue(false));
ShillProfileClient::TestInterface* profile_test =
DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface();
@@ -454,10 +479,10 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
provider_.UpdateChromePolicy(policy);
content::RunAllPendingInMessageLoop();
-#endif // OS_CHROMEOS
EXPECT_TRUE(RunNetworkingSubtest("getManagedProperties")) << message_;
}
+#endif // OS_CHROMEOS
IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
OnNetworksChangedEventConnect) {
@@ -471,10 +496,13 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
<< message_;
}
+#if defined(OS_CHROMEOS)
+// TODO(stevenjb/mef): Fix this on non-Chrome OS, crbug.com/371442.
IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
OnNetworkListChangedEvent) {
EXPECT_TRUE(RunNetworkingSubtest("onNetworkListChangedEvent")) << message_;
}
+#endif // OS_CHROMEOS
IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
VerifyDestination) {
@@ -508,6 +536,26 @@ IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
#if defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
GetCaptivePortalStatus) {
+ service_test_->AddService("stub_cellular1", "cellular1",
+ shill::kTypeCellular, shill::kStateIdle,
+ true /* add_to_visible */,
+ true /* add_to_watchlist */);
+ service_test_->SetServiceProperty(
+ "stub_cellular1",
+ shill::kNetworkTechnologyProperty,
+ base::StringValue(shill::kNetworkTechnologyGsm));
+ service_test_->SetServiceProperty(
+ "stub_cellular1",
+ shill::kActivationStateProperty,
+ base::StringValue(shill::kActivationStateNotActivated));
+ service_test_->SetServiceProperty(
+ "stub_cellular1",
+ shill::kRoamingStateProperty,
+ base::StringValue(shill::kRoamingStateHome));
+ DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
+ SortManagerServices();
+ content::RunAllPendingInMessageLoop();
+
NetworkPortalDetector::CaptivePortalState state;
state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
detector()->SetDetectionResultsForTesting("stub_ethernet", state);
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/networking/test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698