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

Unified Diff: chrome/test/data/extensions/api_test/networking/test.js

Issue 708563005: Use setProperties for IP Config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430113_internet_options_1
Patch Set: Fix win/mac test expectations Created 5 years, 11 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/test/data/extensions/api_test/networking/test.js
diff --git a/chrome/test/data/extensions/api_test/networking/test.js b/chrome/test/data/extensions/api_test/networking/test.js
index efa8dc588204de440ba0f0e58c235ba89e5d5578..eb08d1b03166c5e0e2aa42ddfe271ec1bcf6bb47 100644
--- a/chrome/test/data/extensions/api_test/networking/test.js
+++ b/chrome/test/data/extensions/api_test/networking/test.js
@@ -285,14 +285,19 @@ var availableTests = [
assertEq({ "Connectable": true,
"ConnectionState": "Connected",
"GUID": "stub_wifi1_guid",
- "MacAddress": "00:11:22:AA:BB:CC",
+ "IPAddressConfigType": "Static",
"IPConfigs": [{
"Gateway": "0.0.0.1",
"IPAddress": "0.0.0.0",
"RoutingPrefix": 0,
"Type": "IPv4"
}],
+ "MacAddress": "00:11:22:AA:BB:CC",
"Name": "wifi1",
+ "StaticIPConfig": {
+ "IPAddress": "1.2.3.4",
+ "Type": "IPv4"
+ },
"Type": "WiFi",
"WiFi": {
"Frequency": 2400,
@@ -384,6 +389,10 @@ var availableTests = [
Priority: 1,
WiFi: {
AutoConnect: true
+ },
+ IPAddressConfigType: 'Static',
+ StaticIPConfig: {
+ IPAddress: '1.2.3.4'
}
};
chrome.networkingPrivate.setProperties(
@@ -393,13 +402,16 @@ var availableTests = [
chrome.networkingPrivate.getProperties(
network_guid,
callbackPass(function(result) {
+ // Ensure that the GUID doesn't change.
+ assertEq(network_guid, result.GUID);
// Ensure that the properties were set.
assertEq(1, result['Priority']);
assertTrue('WiFi' in result);
assertTrue('AutoConnect' in result['WiFi']);
assertEq(true, result['WiFi']['AutoConnect']);
- // Ensure that the GUID doesn't change.
- assertEq(network_guid, result.GUID);
+ assertTrue('StaticIPConfig' in result);
+ assertEq('1.2.3.4',
+ result['StaticIPConfig']['IPAddress']);
done();
}));
}));
@@ -425,7 +437,6 @@ var availableTests = [
chrome.networkingPrivate.getProperties(
network_guid,
callbackPass(function(result) {
- console.log('Result: ' + JSON.stringify(result));
// Ensure that the properties were set.
assertEq(1, result['Priority']);
assertTrue('VPN' in result);
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | chromeos/dbus/fake_shill_manager_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698