Chromium Code Reviews| 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..fd6020baf27a6d3cff77c92eede80c69e06abdeb 100644 |
| --- a/chrome/test/data/extensions/api_test/networking/test.js |
| +++ b/chrome/test/data/extensions/api_test/networking/test.js |
| @@ -285,14 +285,18 @@ var availableTests = [ |
| assertEq({ "Connectable": true, |
| "ConnectionState": "Connected", |
| "GUID": "stub_wifi1_guid", |
| - "MacAddress": "00:11:22:AA:BB:CC", |
| "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 +388,9 @@ var availableTests = [ |
| Priority: 1, |
| WiFi: { |
| AutoConnect: true |
| + }, |
| + StaticIPConfig: { |
| + IPAddress: '' |
| } |
| }; |
| chrome.networkingPrivate.setProperties( |
| @@ -393,13 +400,17 @@ var availableTests = [ |
| chrome.networkingPrivate.getProperties( |
| network_guid, |
| callbackPass(function(result) { |
| + console.log('Result: ' + JSON.stringify(result)); |
|
pneubeck (no reviews)
2014/11/25 21:13:34
nit: was for debugging? maybe remove
stevenjb
2014/11/25 21:59:47
Done.
|
| + // 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); |
| + // An empty IPAddress should get translated to the |
| + // property becoming unset. |
| + assertEq(false, 'StaticIPConfig' in result); |
| done(); |
| })); |
| })); |
| @@ -425,7 +436,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); |