Simulating window.getPosition and setPosition operations

Author: barancev

java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -859,9 +859,14 @@ public void setSize(Dimension targetSize) {
       }
 
       public void setPosition(Point targetPosition) {
-        execute(DriverCommand.SET_WINDOW_POSITION,
-            ImmutableMap
-                .of("windowHandle", "current", "x", targetPosition.x, "y", targetPosition.y));
+        if (getW3CStandardComplianceLevel() == 0) {
+          execute(DriverCommand.SET_WINDOW_POSITION,
+                  ImmutableMap
+                    .of("windowHandle", "current", "x", targetPosition.x, "y", targetPosition.y));
+        } else {
+          executeScript("window.screenX = arguments[0]; window.screenY = arguments[1]",
+                        targetPosition.x, targetPosition.y);
+        }
       }
 
       @SuppressWarnings({"unchecked"})
@@ -879,10 +884,16 @@ public Dimension getSize() {
       }
 
       @SuppressWarnings({"unchecked"})
+      Map<String, Object> rawPoint;
       public Point getPosition() {
-        Response response = execute(DriverCommand.GET_WINDOW_POSITION,
-            ImmutableMap.of("windowHandle", "current"));
-        Map<String, Object> rawPoint = (Map<String, Object>) response.getValue();
+        if (getW3CStandardComplianceLevel() == 0) {
+          Response response = execute(DriverCommand.GET_WINDOW_POSITION,
+                                      ImmutableMap.of("windowHandle", "current"));
+          rawPoint = (Map<String, Object>) response.getValue();
+        } else {
+          rawPoint = (Map<String, Object>) executeScript(
+              "return {x: window.screenX, y: window.screenY}");
+        }
 
         int x = ((Number) rawPoint.get("x")).intValue();
         int y = ((Number) rawPoint.get("y")).intValue();

java/client/test/org/openqa/selenium/WindowTest.java

@@ -24,7 +24,6 @@
 import static org.junit.Assume.assumeFalse;
 import static org.openqa.selenium.Platform.ANDROID;
 import static org.openqa.selenium.Platform.LINUX;
-import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
 import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
 
@@ -96,7 +95,6 @@ public void testSetsTheSizeOfTheCurrentWindowFromIframe() {
   }
 
   @Test
-  @Ignore(MARIONETTE)
   public void testGetsThePositionOfTheCurrentWindow() {
     // Window position is undefined on ANDROID (and most mobile platforms
     // though others aren't defined in org.openqa.selenium.Platform).
@@ -108,7 +106,7 @@ public void testGetsThePositionOfTheCurrentWindow() {
   }
 
   @Test
-  @Ignore(value = {SAFARI, PHANTOMJS, MARIONETTE},
+  @Ignore(value = {SAFARI, PHANTOMJS},
       reason = "Safari: getPosition after setPosition doesn't match up exactly, " +
           "as expected - probably due to nuances in Mac OSX window manager.")
   public void testSetsThePositionOfTheCurrentWindow() throws InterruptedException {