Add TakesScreenshot, SessionStorage and LocalStorage testsets

Author: dteteruk

java/client/src/org/openqa/selenium/qtwebkit/QtWebKitDriver.java

@@ -18,16 +18,26 @@
 
 package org.openqa.selenium.qtwebkit;
 
+import org.openqa.selenium.html5.*;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.remote.DriverCommand;
 import org.openqa.selenium.remote.RemoteWebDriver;
+import org.openqa.selenium.remote.html5.RemoteLocalStorage;
+import org.openqa.selenium.remote.html5.RemoteSessionStorage;
 
 
-public class QtWebKitDriver extends RemoteWebDriver implements TakesScreenshot {
+
+public class QtWebKitDriver extends RemoteWebDriver implements TakesScreenshot, WebStorage {
+
+    private RemoteLocalStorage localStorage;
+    private RemoteSessionStorage sessionStorage;
+
     public QtWebKitDriver(Capabilities capabilities) {
         super(QtWebKitDriverService.getCommandExecutor(), capabilities);
+        localStorage = new RemoteLocalStorage(getExecuteMethod());
+        sessionStorage = new RemoteSessionStorage(getExecuteMethod());
     }
 
 
@@ -38,5 +48,14 @@ public <X> X getScreenshotAs(OutputType<X> target) {
         return target.convertFromBase64Png(base64);
     }
 
+    @Override
+    public LocalStorage getLocalStorage() {
+        return localStorage;
+    }
+
+    @Override
+    public SessionStorage getSessionStorage() {
+        return sessionStorage;
+    }
 }
 

java/client/test/org/openqa/selenium/testing/drivers/QtWebKitDriverSupplier.java

@@ -10,7 +10,7 @@
 import com.google.common.base.Supplier;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.qtwebkit.QtWebDriverExecutor;
+import org.openqa.selenium.qtwebkit.QtWebKitDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.LocalFileDetector;
 import org.openqa.selenium.remote.RemoteWebDriver;
@@ -40,21 +40,14 @@ public WebDriver get() {
             return null;
         }
 
-        java.net.URL hostURL;
+        String remoteIpProperty = "RemoteIP";
+        String ip = System.getProperty(remoteIpProperty);
+        if (ip == null)
+            System.setProperty(remoteIpProperty, "http://localhost:9517");
 
-        try {
-            hostURL = new java.net.URL("http://localhost:9517");
-        } catch (java.net.MalformedURLException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-            return null;
-        }
+        RemoteWebDriver driver = new QtWebKitDriver(desiredCapabilities);
+		driver.setFileDetector(new LocalFileDetector());
 
-        /*RemoteWebDriver driver = new RemoteWebDriver(
-                hostURL, desiredCapabilities, requiredCapabilities);*/
-        QtWebDriverExecutor executor = new QtWebDriverExecutor(hostURL);
-        RemoteWebDriver driver = new RemoteWebDriver(
-                executor, desiredCapabilities, requiredCapabilities);
-        driver.setFileDetector(new LocalFileDetector());
         return driver;
     }
 }