On Behalf of velma911: add Get/Set network connection commands to JsonHttpCommandHandler to be able to use commands in selenium grid.

(fixes google code issue 7749)

Author: lukeis

Diff for: java/server/src/org/openqa/selenium/remote/server/JsonHttpCommandHandler.java

@@ -126,6 +126,8 @@
 import org.openqa.selenium.remote.server.handler.interactions.touch.Scroll;
 import org.openqa.selenium.remote.server.handler.interactions.touch.SingleTapOnElement;
 import org.openqa.selenium.remote.server.handler.interactions.touch.Up;
+import org.openqa.selenium.remote.server.handler.mobile.GetNetworkConnection;
+import org.openqa.selenium.remote.server.handler.mobile.SetNetworkConnection;
 import org.openqa.selenium.remote.server.rest.RestishHandler;
 import org.openqa.selenium.remote.server.rest.ResultConfig;
 
@@ -313,5 +315,8 @@ private void setUpMappings() {
     addNewMapping(GET_AVAILABLE_LOG_TYPES, GetAvailableLogTypesHandler.class);
     addNewMapping(GET_LOG, GetLogHandler.class);
     addNewMapping(GET_SESSION_LOGS, GetSessionLogsHandler.class);
+
+    addNewMapping(GET_NETWORK_CONNECTION, GetNetworkConnection.class);
+    addNewMapping(SET_NETWORK_CONNECTION, SetNetworkConnection.class);
   }
 }

Diff for: java/server/src/org/openqa/selenium/remote/server/handler/html5/Utils.java

@@ -26,11 +26,13 @@
 import org.openqa.selenium.html5.ApplicationCache;
 import org.openqa.selenium.html5.LocationContext;
 import org.openqa.selenium.html5.WebStorage;
+import org.openqa.selenium.mobile.NetworkConnection;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.ExecuteMethod;
 import org.openqa.selenium.remote.html5.RemoteApplicationCache;
 import org.openqa.selenium.remote.html5.RemoteLocationContext;
 import org.openqa.selenium.remote.html5.RemoteWebStorage;
+import org.openqa.selenium.remote.mobile.RemoteNetworkConnection;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -39,13 +41,18 @@
  * role interfaces. Each method will throw an {@link UnsupportedCommandException} if the driver
  * does not support the corresponding HTML5 feature.
  */
-class Utils {
+public class Utils {
 
   static ApplicationCache getApplicationCache(WebDriver driver) {
     return convert(driver, ApplicationCache.class, CapabilityType.SUPPORTS_APPLICATION_CACHE,
                    RemoteApplicationCache.class);
   }
 
+  public static NetworkConnection getNetworkConnection(WebDriver driver) {
+	    return convert(driver, NetworkConnection.class, CapabilityType.SUPPORTS_NETWORK_CONNECTION,
+	        RemoteNetworkConnection.class);
+  }
+
   static LocationContext getLocationContext(WebDriver driver) {
     return convert(driver, LocationContext.class, CapabilityType.SUPPORTS_LOCATION_CONTEXT,
         RemoteLocationContext.class);

Diff for: java/server/src/org/openqa/selenium/remote/server/handler/mobile/GetNetworkConnection.java

@@ -0,0 +1,40 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.remote.server.handler.mobile;
+
+import org.openqa.selenium.mobile.NetworkConnection.ConnectionType;
+import org.openqa.selenium.remote.server.Session;
+import org.openqa.selenium.remote.server.handler.WebDriverHandler;
+import org.openqa.selenium.remote.server.handler.html5.Utils;
+
+public class GetNetworkConnection extends WebDriverHandler<ConnectionType> {
+
+  public GetNetworkConnection(Session session) {
+    super(session);
+  }
+
+  @Override
+  public ConnectionType call() throws Exception {
+    return Utils.getNetworkConnection(getUnwrappedDriver()).getNetworkConnection();
+  }
+
+  @Override
+  public String toString() {
+    return "[get network connection state]";
+  }
+}

Diff for: java/server/src/org/openqa/selenium/remote/server/handler/mobile/SetNetworkConnection.java

@@ -0,0 +1,55 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.remote.server.handler.mobile;
+
+import java.util.Map;
+
+import org.openqa.selenium.mobile.NetworkConnection.ConnectionType;
+import org.openqa.selenium.remote.server.JsonParametersAware;
+import org.openqa.selenium.remote.server.Session;
+import org.openqa.selenium.remote.server.handler.WebDriverHandler;
+import org.openqa.selenium.remote.server.handler.html5.Utils;
+
+public class SetNetworkConnection extends WebDriverHandler<Number> implements JsonParametersAware {
+  private volatile ConnectionType type;
+
+  public SetNetworkConnection(Session session) {
+    super(session);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public void setJsonParameters(Map<String, Object> allParameters) throws Exception {
+	  Map<String, Map<String, Object>> parameters = (Map<String, Map<String, Object>>)allParameters.get("parameters");
+	  Map<String, Object> typeMap = parameters.get("type");
+	  
+	  type = new ConnectionType(Boolean.parseBoolean(typeMap.get("wifiEnabled").toString()), 
+			  					Boolean.parseBoolean(typeMap.get("dataEnabled").toString()),
+			  					Boolean.parseBoolean(typeMap.get("airplaneMode").toString()));
+  }
+
+  @Override
+  public Number call() throws Exception {
+    return Integer.parseInt(Utils.getNetworkConnection(getUnwrappedDriver()).setNetworkConnection(type).toString());
+  }
+
+  @Override
+  public String toString() {
+    return String.format("[set network connection : %s]", type.toString());
+  }
+}