Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / test / data / extensions / api_test / networking / test.js

diff --git a/src/chrome/test/data/extensions/api_test/networking/test.js b/src/chrome/test/data/extensions/api_test/networking/test.js
index 47dd3b0..746a89a 100644 (file)
--- a/src/chrome/test/data/extensions/api_test/networking/test.js
+++ b/src/chrome/test/data/extensions/api_test/networking/test.js
@@ -55,6 +55,20 @@ var privateHelpers = {
           self.listenForChanges);
       done();
     };
+  },
+  watchForCaptivePortalState: function(expectedNetworkPath,
+                                       expectedState,
+                                       done) {
+    var self = this;
+    this.onPortalDetectionCompleted = function(networkPath, state) {
+      assertEq(expectedNetworkPath, networkPath);
+      assertEq(expectedState, state);
+      chrome.networkingPrivate.onPortalDetectionCompleted.removeListener(
+          self.onPortalDetectionCompleted);
+      done();
+    };
+    chrome.networkingPrivate.onPortalDetectionCompleted.addListener(
+        self.onPortalDetectionCompleted);
   }
 };
 
@@ -113,21 +127,22 @@ var availableTests = [
       callbackPass(function(result) {
         assertEq([{
                     "ConnectionState": "Connected",
-                    "GUID": "stub_ethernet",
-                    "Name": "eth0",
-                    "Type": "Ethernet",
                     "Ethernet": {
                       "Authentication": "None"
-                    }
+                    },
+                    "GUID": "stub_ethernet",
+                    "Name": "eth0",
+                    "Type": "Ethernet"
                   },
                   {
+                    "Connectable": true,
                     "ConnectionState": "Connected",
                     "GUID": "stub_wifi1",
                     "Name": "wifi1",
                     "Type": "WiFi",
                     "WiFi": {
                       "Security": "WEP-PSK",
-                      "SignalStrength": 0
+                      "SignalStrength": 40
                     }
                   },
                   {
@@ -137,6 +152,7 @@ var availableTests = [
                     "Type": "VPN",
                   },
                   {
+                    "Connectable": true,
                     "ConnectionState": "NotConnected",
                     "GUID": "stub_wifi2",
                     "Name": "wifi2_PSK",
@@ -145,18 +161,6 @@ var availableTests = [
                       "Security": "WPA-PSK",
                       "SignalStrength": 80
                     }
-                  },
-                  {
-                    "Cellular": {
-                      "ActivateOverNonCellularNetwork": false,
-                      "ActivationState": "not-activated",
-                      "NetworkTechnology": "GSM",
-                      "RoamingState": "home"
-                    },
-                    "ConnectionState": "NotConnected",
-                    "GUID": "stub_cellular1",
-                    "Name": "cellular1",
-                    "Type": "Cellular"
                   }], result);
       }));
   },
@@ -165,16 +169,18 @@ var availableTests = [
       "WiFi",
       callbackPass(function(result) {
         assertEq([{
+                    "Connectable": true,
                     "ConnectionState": "Connected",
                     "GUID": "stub_wifi1",
                     "Name": "wifi1",
                     "Type": "WiFi",
                     "WiFi": {
                       "Security": "WEP-PSK",
-                      "SignalStrength": 0
+                      "SignalStrength": 40
                     }
                   },
                   {
+                    "Connectable": true,
                     "ConnectionState": "NotConnected",
                     "GUID": "stub_wifi2",
                     "Name": "wifi2_PSK",
@@ -192,8 +198,7 @@ var availableTests = [
     var expected = ["stub_ethernet",
                     "stub_wifi1",
                     "stub_vpn1",
-                    "stub_wifi2",
-                    "stub_cellular1"];
+                    "stub_wifi2"];
     var done = chrome.test.callbackAdded();
     var listener = new privateHelpers.listListener(expected, done);
     chrome.networkingPrivate.onNetworkListChanged.addListener(
@@ -202,19 +207,25 @@ var availableTests = [
   },
   function getProperties() {
     chrome.networkingPrivate.getProperties(
-      "stub_wifi2",
+      "stub_wifi1",
       callbackPass(function(result) {
-        assertEq({
-                   "ConnectionState": "NotConnected",
-                   "GUID": "stub_wifi2",
-                   "Name": "wifi2_PSK",
+        assertEq({ "Connectable": true,
+                   "ConnectionState": "Connected",
+                   "GUID": "stub_wifi1",
+                   "IPConfigs": [{
+                     "Gateway": "0.0.0.1",
+                     "IPAddress": "0.0.0.0",
+                     "RoutingPrefix": 0,
+                     "Type": "IPv4"
+                   }],
+                   "Name": "wifi1",
                    "Type": "WiFi",
                    "WiFi": {
-                     "Frequency": 5000,
-                     "FrequencyList": [2400, 5000],
-                     "SSID": "wifi2_PSK",
-                     "Security": "WPA-PSK",
-                     "SignalStrength": 80
+                     "Frequency": 2400,
+                     "FrequencyList": [2400],
+                     "SSID": "wifi1",
+                     "Security": "WEP-PSK",
+                     "SignalStrength": 40
                    }
                  }, result);
       }));
@@ -224,6 +235,10 @@ var availableTests = [
       "stub_wifi2",
       callbackPass(function(result) {
         assertEq({
+                   "Connectable": {
+                     "Active": true,
+                     "Effective": "Unmanaged"
+                   },
                    "ConnectionState": {
                      "Active": "NotConnected",
                      "Effective": "Unmanaged"
@@ -297,6 +312,7 @@ var availableTests = [
       "stub_wifi2",
       callbackPass(function(result) {
         assertEq({
+          "Connectable": true,
           "ConnectionState": "NotConnected",
           "GUID": "stub_wifi2",
           "Name": "wifi2_PSK",
@@ -335,8 +351,7 @@ var availableTests = [
     var expected = ["stub_ethernet",
                     "stub_wifi2",
                     "stub_vpn1",
-                    "stub_wifi1",
-                    "stub_cellular1"];
+                    "stub_wifi1"];
     var done = chrome.test.callbackAdded();
     var listener = new privateHelpers.listListener(expected, done);
     chrome.networkingPrivate.onNetworkListChanged.addListener(
@@ -381,7 +396,29 @@ var availableTests = [
       callbackPass(function(result) {
         assertEq("Connected", result);
       }));
-  }
+  },
+  function getCaptivePortalStatus() {
+    var networks = [['stub_ethernet', 'Online'],
+                    ['stub_wifi1', 'Offline'],
+                    ['stub_wifi2', 'Portal'],
+                    ['stub_cellular1', 'ProxyAuthRequired'],
+                    ['stub_vpn1', 'Unknown']];
+    networks.forEach(function(network) {
+      var servicePath = network[0];
+      var expectedStatus = network[1];
+      chrome.networkingPrivate.getCaptivePortalStatus(
+        servicePath,
+        callbackPass(function(status) {
+          assertEq(expectedStatus, status);
+        }));
+    });
+  },
+  function captivePortalNotification() {
+    var done = chrome.test.callbackAdded();
+    var listener =
+        new privateHelpers.watchForCaptivePortalState('wifi', 'Online', done);
+    chrome.test.sendMessage('notifyPortalDetectorObservers');
+  },
 ];
 
 var testToRun = window.location.search.substring(1);