diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 23:54:38 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 23:54:38 +0000 |
| commit | 783aa24d3cb99443f9ecbad61272c5ad23af7b56 (patch) | |
| tree | 38d51af1f3a276ad65863be678e0f6408eccbb8c /chrome/test | |
| parent | aac4f920f0972de986836e60062c56281447d8b8 (diff) | |
| download | chromium_src-783aa24d3cb99443f9ecbad61272c5ad23af7b56.zip chromium_src-783aa24d3cb99443f9ecbad61272c5ad23af7b56.tar.gz chromium_src-783aa24d3cb99443f9ecbad61272c5ad23af7b56.tar.bz2 | |
Sort stub network services correctly
Currently connected networks are moved to the top of the list, but no other sorting is performed. We should do a similar sort to Shill when a Service's State changes:
* Active (connected, connecting, etc) networks followed by Inactive networks
* Sorted by type: Ethernet, Wifi, Cellular, Wimax, VPN
This should make the stub based networking tests less fragile
BUG=256810
TBR=gauravsh@chromium.org, gspencer@chromium.org
Review URL: https://codereview.chromium.org/22315002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/extensions/api_test/networking/test.js | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/chrome/test/data/extensions/api_test/networking/test.js b/chrome/test/data/extensions/api_test/networking/test.js index 2a490ec..ca340f7 100644 --- a/chrome/test/data/extensions/api_test/networking/test.js +++ b/chrome/test/data/extensions/api_test/networking/test.js @@ -46,7 +46,7 @@ var privateHelpers = { chrome.networkingPrivate.onNetworksChanged.addListener( this.onNetworkChange); }, - listListener: function(network, expected, done) { + listListener: function(expected, done) { var self = this; this.listenForChanges = function(list) { assertEq(expected, list); @@ -105,6 +105,15 @@ var availableTests = [ } }, { + "ConnectionState": "Connected", + "GUID": "stub_vpn1", + "Name": "vpn1", + "Type": "VPN", + "VPN": { + "AutoConnect": false + } + }, + { "ConnectionState": "NotConnected", "GUID": "stub_wifi2", "Name": "wifi2_PSK", @@ -126,15 +135,6 @@ var availableTests = [ "GUID": "stub_cellular1", "Name": "cellular1", "Type": "Cellular" - }, - { - "ConnectionState": "Connected", - "GUID": "stub_vpn1", - "Name": "vpn1", - "Type": "VPN", - "VPN": { - "AutoConnect": false - } }], result); })); }, @@ -168,14 +168,14 @@ var availableTests = [ })); }, function requestNetworkScan() { - var network = "stub_wifi2"; + // Connected or Connecting networks should be listed first, sorted by type. var expected = ["stub_ethernet", "stub_wifi1", + "stub_vpn1", "stub_wifi2", - "stub_cellular1", - "stub_vpn1"]; + "stub_cellular1"]; var done = chrome.test.callbackAdded(); - var listener = new privateHelpers.listListener(network, expected, done); + var listener = new privateHelpers.listListener(expected, done); chrome.networkingPrivate.onNetworkListChanged.addListener( listener.listenForChanges); chrome.networkingPrivate.requestNetworkScan(); @@ -311,16 +311,18 @@ var availableTests = [ chrome.networkingPrivate.startDisconnect(network, callbackPass()); }, function onNetworkListChangedEvent() { - var network = "stub_wifi2"; - var expected = ["stub_wifi2", - "stub_ethernet", + // Connecting to wifi2 should set wifi1 to offline. Connected or Connecting + // networks should be listed first, sorted by type. + var expected = ["stub_ethernet", + "stub_wifi2", + "stub_vpn1", "stub_wifi1", - "stub_cellular1", - "stub_vpn1"]; + "stub_cellular1"]; var done = chrome.test.callbackAdded(); - var listener = new privateHelpers.listListener(network, expected, done); + var listener = new privateHelpers.listListener(expected, done); chrome.networkingPrivate.onNetworkListChanged.addListener( listener.listenForChanges); + var network = "stub_wifi2"; chrome.networkingPrivate.startConnect(network, callbackPass()); }, function verifyDestination() { |