Chromium Code Reviews Chromium Code Reviews
Issue 2470193002:
Introduce networking.onc as an alias for networkingPrivate (Closed)
| Index: chrome/test/data/extensions/api_test/networking_private/chromeos/test.js |
| diff --git a/chrome/test/data/extensions/api_test/networking_private/chromeos/test.js b/chrome/test/data/extensions/api_test/networking_private/chromeos/test.js |
| index f6470e210a542278e2571eaff87e85e16b569622..32024bbbc111af4cadb2b9ecda1a4067be4505c6 100644 |
| --- a/chrome/test/data/extensions/api_test/networking_private/chromeos/test.js |
| +++ b/chrome/test/data/extensions/api_test/networking_private/chromeos/test.js |
| @@ -11,9 +11,7 @@ var assertTrue = chrome.test.assertTrue; |
| var assertFalse = chrome.test.assertFalse; |
| var assertEq = chrome.test.assertEq; |
| -var ActivationStateType = chrome.networkingPrivate.ActivationStateType; |
| -var ConnectionStateType = chrome.networkingPrivate.ConnectionStateType; |
| -var NetworkType = chrome.networkingPrivate.NetworkType; |
| +var NETWORKING_API = null; |
| var kCellularGuid = 'stub_cellular1_guid'; |
| var kDefaultPin = '1111'; |
| @@ -39,7 +37,7 @@ var privateHelpers = { |
| var self = this; |
| var collectProperties = function(properties) { |
| var finishTest = function() { |
| - chrome.networkingPrivate.onNetworksChanged.removeListener( |
| + NETWORKING_API.onNetworksChanged.removeListener( |
| self.onNetworkChange); |
| done(); |
| }; |
| @@ -52,18 +50,18 @@ var privateHelpers = { |
| }; |
| this.onNetworkChange = function(changes) { |
| assertEq([network], changes); |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| network, |
| callbackPass(collectProperties)); |
| }; |
| - chrome.networkingPrivate.onNetworksChanged.addListener( |
| + NETWORKING_API.onNetworksChanged.addListener( |
| this.onNetworkChange); |
| }, |
| listListener: function(expected, done) { |
| var self = this; |
| this.listenForChanges = function(list) { |
| assertEq(expected, list); |
| - chrome.networkingPrivate.onNetworkListChanged.removeListener( |
| + NETWORKING_API.onNetworkListChanged.removeListener( |
| self.listenForChanges); |
| done(); |
| }; |
| @@ -75,11 +73,11 @@ var privateHelpers = { |
| this.onPortalDetectionCompleted = function(guid, state) { |
| assertEq(expectedGuid, guid); |
| assertEq(expectedState, state); |
| - chrome.networkingPrivate.onPortalDetectionCompleted.removeListener( |
| + NETWORKING_API.onPortalDetectionCompleted.removeListener( |
| self.onPortalDetectionCompleted); |
| done(); |
| }; |
| - chrome.networkingPrivate.onPortalDetectionCompleted.addListener( |
| + NETWORKING_API.onPortalDetectionCompleted.addListener( |
| self.onPortalDetectionCompleted); |
| } |
| }; |
| @@ -98,30 +96,30 @@ function networkCallbackPass() { |
| var availableTests = [ |
| function startConnect() { |
| - chrome.networkingPrivate.startConnect('stub_wifi2_guid', |
| + NETWORKING_API.startConnect('stub_wifi2_guid', |
| networkCallbackPass()); |
| }, |
| function startDisconnect() { |
| // Must connect to a network before we can disconnect from it. |
| - chrome.networkingPrivate.startConnect( |
| + NETWORKING_API.startConnect( |
| 'stub_wifi2_guid', |
| callbackPass(function() { |
| - chrome.networkingPrivate.startDisconnect( |
| + NETWORKING_API.startDisconnect( |
| 'stub_wifi2_guid', networkCallbackPass()); |
| })); |
| }, |
| function startActivate() { |
| // Must connect to a network before we can activate it. |
| - chrome.networkingPrivate.startConnect( |
| + NETWORKING_API.startConnect( |
| kCellularGuid, callbackPass(function() { |
| - chrome.networkingPrivate.startActivate( |
| + NETWORKING_API.startActivate( |
| kCellularGuid, callbackPass(function() { |
| // For non Sprint networks, startActivate will delegate |
| // showing the activation UI to the browser host and not |
| // immediately activate the network. |
| - chrome.networkingPrivate.getState( |
| + NETWORKING_API.getState( |
| kCellularGuid, callbackPass(function(state) { |
| - assertEq(ActivationStateType.NOT_ACTIVATED, |
| + assertEq(NETWORKING_API.ActivationStateType.NOT_ACTIVATED, |
| state.Cellular.ActivationState); |
| })); |
| })); |
| @@ -129,37 +127,37 @@ var availableTests = [ |
| }, |
| function startActivateSprint() { |
| // Must connect to a network before we can activate it. |
| - chrome.networkingPrivate.startConnect( |
| + NETWORKING_API.startConnect( |
| kCellularGuid, callbackPass(function() { |
| - chrome.networkingPrivate.startActivate( |
| + NETWORKING_API.startActivate( |
| kCellularGuid, callbackPass(function() { |
| - chrome.networkingPrivate.getState( |
| + NETWORKING_API.getState( |
| kCellularGuid, callbackPass(function(state) { |
| - assertEq(ActivationStateType.ACTIVATED, |
| + assertEq(NETWORKING_API.ActivationStateType.ACTIVATED, |
| state.Cellular.ActivationState); |
| })); |
| })); |
| })); |
| }, |
| function startConnectNonexistent() { |
| - chrome.networkingPrivate.startConnect( |
| + NETWORKING_API.startConnect( |
| 'nonexistent_path', |
| callbackFail('Error.InvalidNetworkGuid')); |
| }, |
| function startDisconnectNonexistent() { |
| - chrome.networkingPrivate.startDisconnect( |
| + NETWORKING_API.startDisconnect( |
| 'nonexistent_path', |
| callbackFail('Error.InvalidNetworkGuid')); |
| }, |
| function startGetPropertiesNonexistent() { |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| 'nonexistent_path', |
| callbackFail('Error.InvalidNetworkGuid')); |
| }, |
| function createNetwork() { |
| - chrome.networkingPrivate.createNetwork( |
| + NETWORKING_API.createNetwork( |
| false, // shared |
| - { Type: NetworkType.WI_FI, |
| + { Type: NETWORKING_API.NetworkType.WI_FI, |
| GUID: 'ignored_guid', |
| WiFi: { |
| SSID: 'wifi_created', |
| @@ -169,9 +167,9 @@ var availableTests = [ |
| callbackPass(function(guid) { |
| assertFalse(guid == ''); |
| assertFalse(guid == 'ignored_guid'); |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| guid, callbackPass(function(properties) { |
| - assertEq(NetworkType.WI_FI, properties.Type); |
| + assertEq(NETWORKING_API.NetworkType.WI_FI, properties.Type); |
| assertEq(guid, properties.GUID); |
| assertEq('wifi_created', properties.WiFi.SSID); |
| assertEq('WEP-PSK', properties.WiFi.Security); |
| @@ -189,17 +187,17 @@ var availableTests = [ |
| return false; |
| } |
| var filter = { |
| - networkType: NetworkType.WI_FI, |
| + networkType: NETWORKING_API.NetworkType.WI_FI, |
| visible: true, |
| configured: true |
| }; |
| - chrome.networkingPrivate.getNetworks( |
| + NETWORKING_API.getNetworks( |
| filter, callbackPass(function(networks) { |
| assertEq(kNumNetworks, networks.length); |
| assertTrue(guidExists(networks, kTestNetworkGuid)); |
| - chrome.networkingPrivate.forgetNetwork( |
| + NETWORKING_API.forgetNetwork( |
| kTestNetworkGuid, callbackPass(function() { |
| - chrome.networkingPrivate.getNetworks( |
| + NETWORKING_API.getNetworks( |
| filter, callbackPass(function(networks) { |
| assertEq(kNumNetworks - 1, networks.length); |
| assertFalse(guidExists(networks, kTestNetworkGuid)); |
| @@ -210,20 +208,20 @@ var availableTests = [ |
| function getNetworks() { |
| // Test 'type' and 'configured'. |
| var filter = { |
| - networkType: NetworkType.WI_FI, |
| + networkType: NETWORKING_API.NetworkType.WI_FI, |
| configured: true |
| }; |
| - chrome.networkingPrivate.getNetworks( |
| + NETWORKING_API.getNetworks( |
| filter, |
| callbackPass(function(result) { |
| assertEq([{ |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| GUID: 'stub_wifi1_guid', |
| Name: 'wifi1', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '00:01:02:03:04:05', |
| Frequency: 2400, |
| @@ -235,7 +233,7 @@ var availableTests = [ |
| Name: 'wifi2_PSK', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '', |
| Frequency: 5000, |
| @@ -245,17 +243,17 @@ var availableTests = [ |
| // Test 'visible' (and 'configured'). |
| filter.visible = true; |
| - chrome.networkingPrivate.getNetworks( |
| + NETWORKING_API.getNetworks( |
| filter, |
| callbackPass(function(result) { |
| assertEq([{ |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| GUID: 'stub_wifi1_guid', |
| Name: 'wifi1', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '00:01:02:03:04:05', |
| Frequency: 2400, |
| @@ -266,14 +264,14 @@ var availableTests = [ |
| // Test 'limit'. |
| filter = { |
| - networkType: NetworkType.ALL, |
| + networkType: NETWORKING_API.NetworkType.ALL, |
| limit: 1 |
| }; |
| - chrome.networkingPrivate.getNetworks( |
| + NETWORKING_API.getNetworks( |
| filter, |
| callbackPass(function(result) { |
| assertEq([{ |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| Ethernet: { |
| Authentication: 'None' |
| }, |
| @@ -281,18 +279,18 @@ var availableTests = [ |
| Name: 'eth0', |
| Priority: 0, |
| Source: 'Device', |
| - Type: NetworkType.ETHERNET |
| + Type: NETWORKING_API.NetworkType.ETHERNET |
| }], result); |
| })); |
| })); |
| })); |
| }, |
| function getVisibleNetworks() { |
| - chrome.networkingPrivate.getVisibleNetworks( |
| - NetworkType.ALL, |
| + NETWORKING_API.getVisibleNetworks( |
| + NETWORKING_API.NetworkType.ALL, |
| callbackPass(function(result) { |
| assertEq([{ |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| Ethernet: { |
| Authentication: 'None' |
| }, |
| @@ -300,15 +298,15 @@ var availableTests = [ |
| Name: 'eth0', |
| Priority: 0, |
| Source: 'Device', |
| - Type: NetworkType.ETHERNET |
| + Type: NETWORKING_API.NetworkType.ETHERNET |
| }, { |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| GUID: 'stub_wifi1_guid', |
| Name: 'wifi1', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '00:01:02:03:04:05', |
| Frequency: 2400, |
| @@ -317,32 +315,32 @@ var availableTests = [ |
| } |
| }, { |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| GUID: 'stub_wimax_guid', |
| Name: 'wimax', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_MAX, |
| + Type: NETWORKING_API.NetworkType.WI_MAX, |
| WiMAX: { |
| SignalStrength: 40 |
| } |
| }, { |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| GUID: 'stub_vpn1_guid', |
| Name: 'vpn1', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.VPN, |
| + Type: NETWORKING_API.NetworkType.VPN, |
| VPN: { |
| Type: 'OpenVPN' |
| } |
| }, { |
| - ConnectionState: ConnectionStateType.NOT_CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.NOT_CONNECTED, |
| GUID: 'stub_vpn2_guid', |
| Name: 'vpn2', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.VPN, |
| + Type: NETWORKING_API.NetworkType.VPN, |
| VPN: { |
| ThirdPartyVPN: { |
| ExtensionID: 'third_party_provider_extension_id' |
| @@ -351,12 +349,12 @@ var availableTests = [ |
| } |
| }, { |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.NOT_CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.NOT_CONNECTED, |
| GUID: 'stub_wifi2_guid', |
| Name: 'wifi2_PSK', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '', |
| Frequency: 5000, |
| @@ -367,17 +365,17 @@ var availableTests = [ |
| })); |
| }, |
| function getVisibleNetworksWifi() { |
| - chrome.networkingPrivate.getVisibleNetworks( |
| - NetworkType.WI_FI, |
| + NETWORKING_API.getVisibleNetworks( |
| + NETWORKING_API.NetworkType.WI_FI, |
| callbackPass(function(result) { |
| assertEq([{ |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| GUID: 'stub_wifi1_guid', |
| Name: 'wifi1', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '00:01:02:03:04:05', |
| Frequency: 2400, |
| @@ -386,12 +384,12 @@ var availableTests = [ |
| } |
| }, { |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.NOT_CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.NOT_CONNECTED, |
| GUID: 'stub_wifi2_guid', |
| Name: 'wifi2_PSK', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '', |
| Frequency: 5000, |
| @@ -405,19 +403,19 @@ var availableTests = [ |
| // Note: We call getEnabledNetworkTypes twice after each enable/dsiable |
| // to ensure that Chrome has processed the command (since enable/disable |
| // are 'synchronous' even though the action of enabling/disabling is not). |
| - chrome.networkingPrivate.getEnabledNetworkTypes( |
| + NETWORKING_API.getEnabledNetworkTypes( |
| callbackPass(function(types) { |
| assertTrue(types.indexOf('WiFi') >= 0); |
| - chrome.networkingPrivate.disableNetworkType('WiFi'); |
| - chrome.networkingPrivate.getEnabledNetworkTypes( |
| + NETWORKING_API.disableNetworkType('WiFi'); |
| + NETWORKING_API.getEnabledNetworkTypes( |
| callbackPass(function(types) { |
| - chrome.networkingPrivate.getEnabledNetworkTypes( |
| + NETWORKING_API.getEnabledNetworkTypes( |
| callbackPass(function(types) { |
| assertFalse(types.indexOf('WiFi') >= 0); |
| - chrome.networkingPrivate.enableNetworkType('WiFi'); |
| - chrome.networkingPrivate.getEnabledNetworkTypes( |
| + NETWORKING_API.enableNetworkType('WiFi'); |
| + NETWORKING_API.getEnabledNetworkTypes( |
| callbackPass(function(types) { |
| - chrome.networkingPrivate.getEnabledNetworkTypes( |
| + NETWORKING_API.getEnabledNetworkTypes( |
| callbackPass(function(types) { |
| assertTrue(types.indexOf('WiFi') >= 0); |
| })); |
| @@ -427,7 +425,7 @@ var availableTests = [ |
| })); |
| }, |
| function getDeviceStates() { |
| - chrome.networkingPrivate.getDeviceStates(callbackPass(function(result) { |
| + NETWORKING_API.getDeviceStates(callbackPass(function(result) { |
| assertEq([ |
| {Scanning: false, State: 'Enabled', Type: 'Ethernet'}, |
| {Scanning: false, State: 'Enabled', Type: 'WiFi'}, |
| @@ -447,19 +445,19 @@ var availableTests = [ |
| 'stub_wifi2_guid']; |
| var done = chrome.test.callbackAdded(); |
| var listener = new privateHelpers.listListener(expected, done); |
| - chrome.networkingPrivate.onNetworkListChanged.addListener( |
| + NETWORKING_API.onNetworkListChanged.addListener( |
| listener.listenForChanges); |
| - chrome.networkingPrivate.requestNetworkScan(); |
| + NETWORKING_API.requestNetworkScan(); |
| }, |
| function getProperties() { |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| 'stub_wifi1_guid', |
| callbackPass(function(result) { |
| assertEq({ |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.CONNECTED, |
| GUID: 'stub_wifi1_guid', |
| - IPAddressConfigType: chrome.networkingPrivate.IPConfigType.STATIC, |
| + IPAddressConfigType: NETWORKING_API.IPConfigType.STATIC, |
| IPConfigs: [{ |
| Gateway: '0.0.0.1', |
| IPAddress: '0.0.0.0', |
| @@ -473,7 +471,7 @@ var availableTests = [ |
| IPAddress: '1.2.3.4', |
| Type: 'IPv4' |
| }, |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '00:01:02:03:04:05', |
| HexSSID: '7769666931', // 'wifi1' |
| @@ -487,12 +485,12 @@ var availableTests = [ |
| })); |
| }, |
| function getPropertiesCellular() { |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| kCellularGuid, |
| callbackPass(function(result) { |
| assertEq({ |
| Cellular: { |
| - ActivationState: ActivationStateType.NOT_ACTIVATED, |
| + ActivationState: NETWORKING_API.ActivationStateType.NOT_ACTIVATED, |
| AllowRoaming: false, |
| AutoConnect: true, |
| Carrier: 'Cellular1_Carrier', |
| @@ -506,21 +504,21 @@ var availableTests = [ |
| RoamingState: 'Home', |
| SIMLockStatus: {LockEnabled: true, LockType: '', RetriesLeft: 3} |
| }, |
| - ConnectionState: ConnectionStateType.NOT_CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.NOT_CONNECTED, |
| GUID: kCellularGuid, |
| Name: 'cellular1', |
| Source: 'User', |
| - Type: NetworkType.CELLULAR, |
| + Type: NETWORKING_API.NetworkType.CELLULAR, |
| }, result); |
| })); |
| }, |
| function getManagedProperties() { |
| - chrome.networkingPrivate.getManagedProperties( |
| + NETWORKING_API.getManagedProperties( |
| 'stub_wifi2', |
| callbackPass(function(result) { |
| assertEq({ |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.NOT_CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.NOT_CONNECTED, |
| GUID: 'stub_wifi2', |
| Name: { |
| Active: 'wifi2_PSK', |
| @@ -536,7 +534,7 @@ var availableTests = [ |
| } |
| }, |
| Source: 'UserPolicy', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| AutoConnect: { |
| Active: false, |
| @@ -573,7 +571,7 @@ var availableTests = [ |
| // Make sure we test Cellular.Carrier since it requires a special call |
| // to Shill.Device.SetCarrier. |
| var newCarrier = 'new_carrier'; |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| network_guid, |
| callbackPass(function(result) { |
| assertEq(network_guid, result.GUID); |
| @@ -584,11 +582,11 @@ var availableTests = [ |
| Carrier: newCarrier, |
| }, |
| }; |
| - chrome.networkingPrivate.setProperties( |
| + NETWORKING_API.setProperties( |
| network_guid, |
| new_properties, |
| callbackPass(function() { |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| network_guid, |
| callbackPass(function(result) { |
| // Ensure that the GUID doesn't change. |
| @@ -603,7 +601,7 @@ var availableTests = [ |
| }, |
| function setWiFiProperties() { |
| var network_guid = 'stub_wifi1_guid'; |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| network_guid, |
| callbackPass(function(result) { |
| assertEq(network_guid, result.GUID); |
| @@ -617,11 +615,11 @@ var availableTests = [ |
| IPAddress: '1.2.3.4' |
| } |
| }; |
| - chrome.networkingPrivate.setProperties( |
| + NETWORKING_API.setProperties( |
| network_guid, |
| new_properties, |
| callbackPass(function() { |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| network_guid, |
| callbackPass(function(result) { |
| // Ensure that the GUID doesn't change. |
| @@ -640,7 +638,7 @@ var availableTests = [ |
| }, |
| function setVPNProperties() { |
| var network_guid = 'stub_vpn1_guid'; |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| network_guid, |
| callbackPass(function(result) { |
| assertEq(network_guid, result.GUID); |
| @@ -650,11 +648,11 @@ var availableTests = [ |
| Host: 'vpn.host1' |
| } |
| }; |
| - chrome.networkingPrivate.setProperties( |
| + NETWORKING_API.setProperties( |
| network_guid, |
| new_properties, |
| callbackPass(function() { |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| network_guid, |
| callbackPass(function(result) { |
| // Ensure that the properties were set. |
| @@ -669,17 +667,17 @@ var availableTests = [ |
| })); |
| }, |
| function getState() { |
| - chrome.networkingPrivate.getState( |
| + NETWORKING_API.getState( |
| 'stub_wifi2_guid', |
| callbackPass(function(result) { |
| assertEq({ |
| Connectable: true, |
| - ConnectionState: ConnectionStateType.NOT_CONNECTED, |
| + ConnectionState: NETWORKING_API.ConnectionStateType.NOT_CONNECTED, |
| GUID: 'stub_wifi2_guid', |
| Name: 'wifi2_PSK', |
| Priority: 0, |
| Source: 'User', |
| - Type: NetworkType.WI_FI, |
| + Type: NETWORKING_API.NetworkType.WI_FI, |
| WiFi: { |
| BSSID: '', |
| Frequency: 5000, |
| @@ -690,16 +688,16 @@ var availableTests = [ |
| })); |
| }, |
| function getStateNonExistent() { |
| - chrome.networkingPrivate.getState( |
| + NETWORKING_API.getState( |
| 'non_existent', |
| callbackFail('Error.InvalidNetworkGuid')); |
| }, |
| function getErrorState() { |
| // Both getState and getProperties should have ErrorState set. |
| - chrome.networkingPrivate.getState( |
| + NETWORKING_API.getState( |
| 'stub_wifi1_guid', callbackPass(function(result) { |
| assertEq('TestErrorState', result.ErrorState); |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| 'stub_wifi1_guid', callbackPass(function(result2) { |
| assertEq('TestErrorState', result2.ErrorState); |
| })); |
| @@ -708,19 +706,19 @@ var availableTests = [ |
| function onNetworksChangedEventConnect() { |
| var network = 'stub_wifi2_guid'; |
| var done = chrome.test.callbackAdded(); |
| - var expectedStates = [ConnectionStateType.CONNECTED]; |
| + var expectedStates = [NETWORKING_API.ConnectionStateType.CONNECTED]; |
| var listener = |
| new privateHelpers.watchForStateChanges(network, expectedStates, done); |
| - chrome.networkingPrivate.startConnect(network, |
| + NETWORKING_API.startConnect(network, |
| networkCallbackPass()); |
| }, |
| function onNetworksChangedEventDisconnect() { |
| var network = 'stub_wifi1_guid'; |
| var done = chrome.test.callbackAdded(); |
| - var expectedStates = [ConnectionStateType.NOT_CONNECTED]; |
| + var expectedStates = [NETWORKING_API.ConnectionStateType.NOT_CONNECTED]; |
| var listener = |
| new privateHelpers.watchForStateChanges(network, expectedStates, done); |
| - chrome.networkingPrivate.startDisconnect(network, |
| + NETWORKING_API.startDisconnect(network, |
| networkCallbackPass()); |
| }, |
| function onNetworkListChangedEvent() { |
| @@ -734,22 +732,22 @@ var availableTests = [ |
| 'stub_vpn2_guid']; |
| var done = chrome.test.callbackAdded(); |
| var listener = new privateHelpers.listListener(expected, done); |
| - chrome.networkingPrivate.onNetworkListChanged.addListener( |
| + NETWORKING_API.onNetworkListChanged.addListener( |
| listener.listenForChanges); |
| var network = 'stub_wifi2_guid'; |
| - chrome.networkingPrivate.startConnect(network, |
| + NETWORKING_API.startConnect(network, |
| networkCallbackPass()); |
| }, |
| function onDeviceStateListChangedEvent() { |
| var listener = callbackPass(function() { |
| - chrome.networkingPrivate.onDeviceStateListChanged.removeListener( |
| + NETWORKING_API.onDeviceStateListChanged.removeListener( |
| listener); |
| }); |
| - chrome.networkingPrivate.onDeviceStateListChanged.addListener(listener); |
| - chrome.networkingPrivate.disableNetworkType('WiFi'); |
| + NETWORKING_API.onDeviceStateListChanged.addListener(listener); |
| + NETWORKING_API.disableNetworkType('WiFi'); |
| }, |
| function verifyDestination() { |
| - chrome.networkingPrivate.verifyDestination( |
| + NETWORKING_API.verifyDestination( |
| verificationProperties, |
| callbackPass(function(isValid) { |
| assertTrue(isValid); |
| @@ -757,7 +755,7 @@ var availableTests = [ |
| }, |
| function verifyAndEncryptCredentials() { |
| var network_guid = 'stub_wifi2_guid'; |
| - chrome.networkingPrivate.verifyAndEncryptCredentials( |
| + NETWORKING_API.verifyAndEncryptCredentials( |
| verificationProperties, |
| network_guid, |
| callbackPass(function(result) { |
| @@ -765,7 +763,7 @@ var availableTests = [ |
| })); |
| }, |
| function verifyAndEncryptData() { |
| - chrome.networkingPrivate.verifyAndEncryptData( |
| + NETWORKING_API.verifyAndEncryptData( |
| verificationProperties, |
| 'data', |
| callbackPass(function(result) { |
| @@ -773,15 +771,15 @@ var availableTests = [ |
| })); |
| }, |
| function setWifiTDLSEnabledState() { |
| - chrome.networkingPrivate.setWifiTDLSEnabledState( |
| + NETWORKING_API.setWifiTDLSEnabledState( |
| 'aa:bb:cc:dd:ee:ff', true, callbackPass(function(result) { |
| - assertEq(ConnectionStateType.CONNECTED, result); |
| + assertEq(NETWORKING_API.ConnectionStateType.CONNECTED, result); |
| })); |
| }, |
| function getWifiTDLSStatus() { |
| - chrome.networkingPrivate.getWifiTDLSStatus( |
| + NETWORKING_API.getWifiTDLSStatus( |
| 'aa:bb:cc:dd:ee:ff', callbackPass(function(result) { |
| - assertEq(ConnectionStateType.CONNECTED, result); |
| + assertEq(NETWORKING_API.ConnectionStateType.CONNECTED, result); |
| })); |
| }, |
| function getCaptivePortalStatus() { |
| @@ -793,7 +791,7 @@ var availableTests = [ |
| networks.forEach(function(network) { |
| var guid = network[0]; |
| var expectedStatus = network[1]; |
| - chrome.networkingPrivate.getCaptivePortalStatus( |
| + NETWORKING_API.getCaptivePortalStatus( |
| guid, |
| callbackPass(function(status) { |
| assertEq(expectedStatus, status); |
| @@ -810,11 +808,11 @@ var availableTests = [ |
| function unlockCellularSim() { |
| var incorrectPin = '2222'; |
| // Try with incorrect PIN, expect failure. |
| - chrome.networkingPrivate.unlockCellularSim( |
| + NETWORKING_API.unlockCellularSim( |
| kCellularGuid, incorrectPin, '', |
| callbackFail('incorrect-pin', function() { |
| // Try with correct PIN, expect success. |
| - chrome.networkingPrivate.unlockCellularSim( |
| + NETWORKING_API.unlockCellularSim( |
| kCellularGuid, kDefaultPin, '', networkCallbackPass()); |
| })); |
| }, |
| @@ -822,14 +820,14 @@ var availableTests = [ |
| var newPin = '6666'; |
| var simState = {requirePin: true, currentPin: kDefaultPin, newPin: newPin}; |
| // Test setting 'requirePin' and 'newPin'. |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| kCellularGuid, callbackPass(function(result) { |
| // Ensure the SIM is initially unlocked. |
| assertTrue(result.Cellular.SIMLockStatus == undefined || |
| result.Cellular.SIMLockStatus.LockType == ''); |
| - chrome.networkingPrivate.setCellularSimState( |
| + NETWORKING_API.setCellularSimState( |
| kCellularGuid, simState, callbackPass(function() { |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| kCellularGuid, callbackPass(function(result) { |
| // The SIM should still be unlocked. |
| assertEq('', result.Cellular.SIMLockStatus.LockType); |
| @@ -839,7 +837,7 @@ var availableTests = [ |
| // to change the PIN back. |
| simState.currentPin = newPin; |
| simState.newPin = kDefaultPin; |
| - chrome.networkingPrivate.setCellularSimState( |
| + NETWORKING_API.setCellularSimState( |
| kCellularGuid, simState, networkCallbackPass()); |
| })); |
| })); |
| @@ -850,27 +848,27 @@ var availableTests = [ |
| var incorrectPin = '2222'; |
| var incorrectPuk = '22222222'; |
| var unlockFailFunc = function(nextFunc) { |
| - chrome.networkingPrivate.unlockCellularSim( |
| + NETWORKING_API.unlockCellularSim( |
| kCellularGuid, incorrectPin, '', |
| callbackFail('incorrect-pin', nextFunc)); |
| }; |
| // Try with incorrect PIN three times, SIM should become PUK locked. |
| unlockFailFunc(unlockFailFunc(unlockFailFunc(function() { |
| // Ensure the SIM is PUK locked. |
| - chrome.networkingPrivate.getProperties( |
| + NETWORKING_API.getProperties( |
| kCellularGuid, callbackPass(function(result) { |
| assertEq('sim-puk', result.Cellular.SIMLockStatus.LockType); |
| // Try to unlock with an incorrect PUK, expect failure. |
| - chrome.networkingPrivate.unlockCellularSim( |
| + NETWORKING_API.unlockCellularSim( |
| kCellularGuid, newPin, incorrectPuk, |
| callbackFail('incorrect-pin', function() { |
| // Try with the correct PUK, expect success. |
| - chrome.networkingPrivate.unlockCellularSim( |
| + NETWORKING_API.unlockCellularSim( |
| kCellularGuid, newPin, kDefaultPuk, |
| callbackPass(function() { |
| // Set state with the new PIN, expect success. |
| var simState = {requirePin: true, currentPin: newPin}; |
| - chrome.networkingPrivate.setCellularSimState( |
| + NETWORKING_API.setCellularSimState( |
| kCellularGuid, simState, networkCallbackPass()); |
| })); |
| })); |
| @@ -879,7 +877,38 @@ var availableTests = [ |
| } |
| ]; |
| -var testToRun = window.location.search.substring(1); |
| -chrome.test.runTests(availableTests.filter(function(op) { |
| - return op.name == testToRun; |
| -})); |
| +// Finds chrome API object for api named |apiName|. |
| +// If the object is not defined, returns null. |
| +// |checkedComponents| will contain all API path components that have been |
| +// checked - in case of the failure it will contain components of the APi |
|
stevenjb
2016/12/09 23:29:04
s/the failure/failure/
tbarzic
2016/12/10 02:04:49
Done.
|
| +// name up to the one that could not be found. |
| +function getApiObject(apiName, checkedComponents) { |
| + var apiComponents = apiName.split('.'); |
| + |
| + checkedComponents.push('chrome'); |
| + var apiObject = chrome; |
| + for (var i = 0; i < apiComponents.length; i++) { |
| + var component = apiComponents[i]; |
| + checkedComponents.push(component); |
| + if (!apiObject[component]) { |
| + return null; |
| + } |
| + apiObject = apiObject[component]; |
| + } |
| + return apiObject; |
| +} |
| + |
| +chrome.test.getConfig(function(config) { |
| + console.error(config.customArg); |
|
stevenjb
2016/12/09 23:29:04
Debugging?
tbarzic
2016/12/10 02:04:49
Done.
|
| + var args = JSON.parse(config.customArg); |
| + // Used for better error message in case API is not defined. |
| + var checkedComponents = []; |
| + NETWORKING_API = getApiObject(args.api, checkedComponents); |
| + if (!NETWORKING_API) { |
| + chrome.test.notifyFail('API not defined: ' + checkedComponents.join('.')); |
| + return; |
| + } |
| + chrome.test.runTests(availableTests.filter(function(op) { |
| + return args.tests.indexOf(op.name) > -1; |
| + })); |
| +}); |
