devtools v85-> v137, hotfix of compatibility issues

Author: mialeska

src/main/java/aquality/selenium/browser/devtools/DevToolsHandling.java

@@ -9,8 +9,8 @@
 import org.openqa.selenium.devtools.DevTools;
 import org.openqa.selenium.devtools.Event;
 import org.openqa.selenium.devtools.HasDevTools;
-import org.openqa.selenium.devtools.v85.performance.Performance;
-import org.openqa.selenium.devtools.v85.performance.model.Metric;
+import org.openqa.selenium.devtools.v137.performance.Performance;
+import org.openqa.selenium.devtools.v137.performance.model.Metric;
 
 import java.util.List;
 import java.util.Map;

src/main/java/aquality/selenium/browser/devtools/EmulationHandling.java

@@ -2,10 +2,10 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.openqa.selenium.devtools.Command;
-import org.openqa.selenium.devtools.v85.dom.model.RGBA;
-import org.openqa.selenium.devtools.v85.emulation.Emulation;
-import org.openqa.selenium.devtools.v85.emulation.model.MediaFeature;
-import org.openqa.selenium.devtools.v85.emulation.model.ScreenOrientation;
+import org.openqa.selenium.devtools.v137.dom.model.RGBA;
+import org.openqa.selenium.devtools.v137.emulation.Emulation;
+import org.openqa.selenium.devtools.v137.emulation.model.MediaFeature;
+import org.openqa.selenium.devtools.v137.emulation.model.ScreenOrientation;
 
 import java.util.Collections;
 import java.util.List;
@@ -45,7 +45,8 @@ public boolean canEmulate() {
      * @param accuracy Accuracy of the location
      */
     public void setGeolocationOverride(double latitude, double longitude, double accuracy) {
-        setGeolocationOverride(Optional.of(latitude), Optional.of(longitude), Optional.of(accuracy));
+        setGeolocationOverride(Optional.of(latitude), Optional.of(longitude), Optional.of(accuracy), Optional.empty(),
+                Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     /**
@@ -64,8 +65,10 @@ public void setGeolocationOverride(double latitude, double longitude) {
      * @param longitude Longitude of location
      * @param accuracy Accuracy of the location
      */
-    public void setGeolocationOverride(Optional<Number> latitude, Optional<Number> longitude, Optional<Number> accuracy) {
-        tools.sendCommand(Emulation.setGeolocationOverride(latitude, longitude, accuracy));
+    public void setGeolocationOverride(Optional<Number> latitude, Optional<Number> longitude, Optional<Number> accuracy,
+                                       Optional<Number> altitude, Optional<Number> altitudeAccuracy, Optional<Number> heading,
+                                       Optional<Number> speed) {
+        tools.sendCommand(Emulation.setGeolocationOverride(latitude, longitude, accuracy, altitude, altitudeAccuracy, heading, speed));
     }
 
     /**
@@ -115,7 +118,7 @@ public void setDeviceMetricsOverride(Integer width, Integer height, Number devic
             screenOrientation = Optional.of(new ScreenOrientation(ScreenOrientation.Type.fromString(screenOrientationType.get()), angle));
         }
         tools.sendCommand(Emulation.setDeviceMetricsOverride(width, height, deviceScaleFactor, mobile, Optional.empty(), Optional.empty(), Optional.empty(),
-                Optional.empty(), Optional.empty(), Optional.empty(), screenOrientation, Optional.empty()));
+                Optional.empty(), Optional.empty(), Optional.empty(), screenOrientation, Optional.empty(), Optional.empty(), Optional.empty()));
     }
 
     /**

src/main/java/aquality/selenium/browser/devtools/JavaScriptHandling.java

@@ -12,9 +12,9 @@
 import org.openqa.selenium.devtools.idealized.Javascript;
 import org.openqa.selenium.devtools.idealized.ScriptId;
 import org.openqa.selenium.devtools.idealized.target.model.SessionID;
-import org.openqa.selenium.devtools.v85.page.Page;
-import org.openqa.selenium.devtools.v85.page.model.ScriptIdentifier;
-import org.openqa.selenium.devtools.v85.runtime.Runtime;
+import org.openqa.selenium.devtools.v137.page.Page;
+import org.openqa.selenium.devtools.v137.page.model.ScriptIdentifier;
+import org.openqa.selenium.devtools.v137.runtime.Runtime;
 import org.openqa.selenium.logging.EventType;
 import org.openqa.selenium.logging.HasLogEvents;
 import org.openqa.selenium.remote.Augmenter;
@@ -55,7 +55,7 @@ public JavaScriptHandling(DevToolsHandling tools) {
     public void addScriptCallbackBinding(String scriptName) {
         logger.info("loc.browser.javascript.scriptcallbackbinding.add", scriptName);
         bindings.add(scriptName);
-        tools.sendCommand(Runtime.addBinding(scriptName, Optional.empty()));
+        tools.sendCommand(Runtime.addBinding(scriptName, Optional.empty(), Optional.empty()));
     }
 
     /**

src/main/java/aquality/selenium/browser/devtools/NetworkHandling.java

@@ -8,7 +8,7 @@
 import org.openqa.selenium.UsernameAndPassword;
 import org.openqa.selenium.devtools.NetworkInterceptor;
 import org.openqa.selenium.devtools.idealized.Network;
-import org.openqa.selenium.devtools.v85.network.model.*;
+import org.openqa.selenium.devtools.v137.network.model.*;
 import org.openqa.selenium.remote.http.*;
 
 import java.net.URI;
@@ -22,11 +22,11 @@
 
 import static aquality.selenium.browser.AqualityServices.getBrowser;
 import static aquality.selenium.logging.LocalizedLoggerUtility.logByLevel;
-import static org.openqa.selenium.devtools.v85.network.Network.*;
+import static org.openqa.selenium.devtools.v137.network.Network.*;
 
 /**
  * DevTools commands for version-independent network interception.
- * For more information, see {@link org.openqa.selenium.devtools.v85.network.Network} and {@link Network}.
+ * For more information, see {@link org.openqa.selenium.devtools.v137.network.Network} and {@link Network}.
  */
 public class NetworkHandling {
     public static final String LOC_NETWORK_INTERCEPTOR_START = "loc.browser.network.interceptor.start";
@@ -199,7 +199,7 @@ private Consumer<ResponseReceived> getResponseLogger(HttpExchangeLoggingOptions
                         formatHeaders(response.getHeaders()));
             }
             if (loggingOptions.getResponseBody().isEnabled()) {
-                String responseBody = tools.sendCommand(org.openqa.selenium.devtools.v85.network.Network.getResponseBody(requestId)).getBody();
+                String responseBody = tools.sendCommand(org.openqa.selenium.devtools.v137.network.Network.getResponseBody(requestId)).getBody();
                 if (StringUtils.isNotEmpty(responseBody)) {
                     logByLevel(loggingOptions.getResponseBody().getLogLevel(),
                             "loc.browser.network.event.responsereceived.log.body",
@@ -323,7 +323,8 @@ public void clearNetworkInterceptor() {
      */
     public void emulateConditions(Boolean offline, Number latency, Number downloadThroughput, Number uploadThroughput) {
         tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty()));
-        tools.sendCommand(emulateNetworkConditions(offline, latency, downloadThroughput, uploadThroughput, Optional.empty()));
+        tools.sendCommand(emulateNetworkConditions(offline, latency, downloadThroughput, uploadThroughput, Optional.empty(),
+                Optional.empty(), Optional.empty(), Optional.empty()));
     }
 
     /**
@@ -339,6 +340,6 @@ public void emulateConditions(Boolean offline, Number latency, Number downloadTh
     public void emulateConditions(Boolean offline, Number latency, Number downloadThroughput, Number uploadThroughput, String connectionType) {
         tools.sendCommand(enable(Optional.empty(), Optional.empty(), Optional.empty()));
         tools.sendCommand(emulateNetworkConditions(offline, latency, downloadThroughput, uploadThroughput,
-                Optional.of(ConnectionType.fromString(connectionType))));
+                Optional.of(ConnectionType.fromString(connectionType)), Optional.empty(), Optional.empty(), Optional.empty()));
     }
 }

src/test/java/tests/usecases/devtools/DeviceEmulationTest.java

@@ -3,8 +3,8 @@
 import aquality.selenium.browser.AqualityServices;
 import aquality.selenium.browser.devtools.EmulationHandling;
 import com.google.common.collect.ImmutableMap;
-import org.openqa.selenium.devtools.v132.emulation.Emulation;
-import org.openqa.selenium.devtools.v132.emulation.model.DisplayFeature;
+import org.openqa.selenium.devtools.v137.emulation.Emulation;
+import org.openqa.selenium.devtools.v137.emulation.model.DisplayFeature;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

src/test/java/tests/usecases/devtools/NetworkSpeedEmulationTest.java

@@ -2,7 +2,7 @@
 
 import aquality.selenium.browser.AqualityServices;
 import org.openqa.selenium.TimeoutException;
-import org.openqa.selenium.devtools.v132.network.model.ConnectionType;
+import org.openqa.selenium.devtools.v137.network.model.ConnectionType;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import tests.BaseTest;

src/test/java/tests/usecases/devtools/OverrideUserAgentTest.java

@@ -8,7 +8,7 @@
 import manytools.BrowserLanguageForm;
 import manytools.UserAgentForm;
 import org.openqa.selenium.devtools.idealized.Network;
-import org.openqa.selenium.devtools.v132.emulation.Emulation;
+import org.openqa.selenium.devtools.v137.emulation.Emulation;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;