cisco-open-source · rajeshinfotech · Aug 29, 2013 · Aug 29, 2013 · Aug 29, 2013 · Aug 30, 2013
diff --git a/.git-fixfiles b/.git-fixfiles
@@ -1,4 +1,4 @@
 #!/bin/sh
 git update-index --assume-unchanged cpp/prebuilt/**/*.so
-git update-index --assume-unchanged cpp/iedriver/Generated/atoms.h
+#git update-index --assume-unchanged cpp/iedriver/Generated/atoms.h
 exit 0
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,9 @@ javascript/node/selenium-webdriver/node_modules/
 .idea/vcs.xml
 .idea/misc.xml
 .idea/workspace.xml
+.idea/projectCodeStyle.xml
+*.idea*
+*.iml
 .idea/dictionaries/
 .idea/scopes/
 .idea/qaplug_profiles.xml
@@ -66,4 +69,4 @@ GSYMS
 GTAGS
 .project
 Gemfile.lock
-/rb/.bundle
+/rb/.bundle
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/libraries/commons_collections.xml b/.idea/libraries/commons_collections.xml
diff --git a/.idea/libraries/little_proxy.xml b/.idea/libraries/little_proxy.xml
diff --git a/README.md b/README.md
@@ -1,11 +1,19 @@
-# Selenium
+# Selenium (branch with QtWebDriver)
 
 Selenium is an umbrella project for various tools and libraries that
 enable automation of web browsers.  Amongst other things it provides
 the support infrastructure for the [W3C WebDriver
 specification](https://dvcs.w3.org/hg/webdriver/raw-file/tip/webdriver-spec.html),
 that lets you write interchangable code for all major web browsers.
 
+This fork of Selenium includes Java language bindings for [QtWebDriver]
+(https://github.com/cisco-open-source/qtwebdriver), see [QtWebDriverService]
+(https://github.com/cisco-open-source/selenium/blob/master/java/client/src/org/openqa/selenium/qtwebkit/QtWebDriverService.java) class.
+It is possible to test QWidget, QWebView, QQuick1 (Qt4),
+QQuick2 (Qt5) or hybrid applications using this driver. QtWebDriver features
+are covered by series tests included in this repository. Information
+how to run them is available below.
+
 The project is made possible by volunteer contributors who have put in
 thousands of hours of their own time, and made the source code freely
 available under the [Apache 2.0
@@ -180,6 +188,23 @@ Note that the `test_chrome` target requires that you have the separate
 [Chrome Driver](http://code.google.com/p/selenium/wiki/ChromeDriver)
 binary available on your `PATH`.
 
+To run QtWebDriver tests try:
+
+```sh
+./go test_qtwebkit
+./go test_wd_native_qt4
+./go test_wd_native_qt5
+./go test_wd_hybrid_qt4
+./go test_wd_hybrid_qt5
+./go test_wd_quick1
+./go test_wd_quick2
+```
+
+These targets require environment variable `qtwebdriver` to contain path
+to the separate [QtWebDriver](https://github.com/cisco-open-source/qtwebdriver)
+binary. Additional command line arguments to run this binary can be
+provided with `qtwebdriverargs` environment variable.
+
 If you are interested in a single language binding, try one of:
 
 ```sh

diff --git a/Rakefile b/Rakefile
@@ -165,6 +165,16 @@ task :test_remote => [
   '//java/client/test/org/openqa/selenium/remote:client-tests:run',
   :test_remote_server
 ]
+task :test_qtwebkit => [
+  '//java/client/test/org/openqa/selenium/qtwebkit:test_qtwebkit:run'
+]
+task :test_wd_native_qt4 => [  '//java/client/test/org/openqa/selenium/qtwebkit/nativetests:nativetests_qt4:run' ]
+task :test_wd_native_qt5 => [  '//java/client/test/org/openqa/selenium/qtwebkit/nativetests:nativetests_qt5:run' ]
+task :test_wd_hybrid_qt4 => [  '//java/client/test/org/openqa/selenium/qtwebkit/hybridtests:hybrid_tests_qt4:run' ]
+task :test_wd_hybrid_qt5 => [  '//java/client/test/org/openqa/selenium/qtwebkit/hybridtests:hybrid_tests_qt5:run' ]
+task :test_wd_quick1 => [  '//java/client/test/org/openqa/selenium/qtwebkit/quick_tests:quick1_tests:run' ]
+task :test_wd_quick2 => [  '//java/client/test/org/openqa/selenium/qtwebkit/quick_tests:quick2_tests:run' ]
+task :test_wd_visualizer => [  '//java/client/test/org/openqa/selenium/qtwebkit/visualizer_tests:test_wd_visualizer:run' ]
 task :test_safari => [ "//java/client/test/org/openqa/selenium/safari:test:run" ]
 task :test_phantomjs => [ "//java/client/test/org/openqa/selenium/phantomjs:test:run" ]
 task :test_support => [

diff --git a/android/Android.iml b/android/Android.iml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
+        <option name="REGENERATE_R_JAVA" value="true" />
+        <option name="REGENERATE_JAVA_BY_AIDL" value="true" />
+        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
+        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
+        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
+        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
+        <option name="APK_PATH" value="" />
+        <option name="LIBRARY_PROJECT" value="false" />
+        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
+        <option name="GENERATE_UNSIGNED_APK" value="false" />
+        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
+        <option name="PACK_TEST_CODE" value="false" />
+        <option name="RUN_PROGUARD" value="false" />
+        <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
+        <resOverlayFolders>
+          <path>/res-overlay</path>
+        </resOverlayFolders>
+        <includeSystemProguardFile>true</includeSystemProguardFile>
+        <includeAssetsFromLibraries>false</includeAssetsFromLibraries>
+        <additionalNativeLibs />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../third_party/java/android/android-14.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="webbit" level="project" />
+    <orderEntry type="library" name="selenium1" level="project" />
+    <orderEntry type="library" name="guava-libraries" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../build/java/server/test/org/openqa/selenium/remote/server/test_qtwebkit.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../third_party/closure/bin/compiler-20120917.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="server1" level="project" />
+    <orderEntry type="library" name="selenium2" level="project" />
+    <orderEntry type="library" name="logging" level="project" />
+    <orderEntry type="library" name="remote1" level="project" />
+    <orderEntry type="library" name="remote" level="project" />
+    <orderEntry type="module" module-name="Client" />
+    <orderEntry type="module" module-name="Server" />
+  </component>
+</module>
+
diff --git a/android/android.iml b/android/android.iml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
+        <option name="REGENERATE_R_JAVA" value="true" />
+        <option name="REGENERATE_JAVA_BY_AIDL" value="true" />
+        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
+        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
+        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
+        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
+        <option name="APK_PATH" value="" />
+        <option name="LIBRARY_PROJECT" value="false" />
+        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
+        <option name="GENERATE_UNSIGNED_APK" value="false" />
+        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
+        <option name="PACK_TEST_CODE" value="false" />
+        <option name="RUN_PROGUARD" value="false" />
+        <option name="PROGUARD_CFG_PATH" value="/proguard.cfg" />
+        <resOverlayFolders />
+        <includeSystemProguardFile>false</includeSystemProguardFile>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/production" />
+    <output-test url="file://$MODULE_DIR$/build/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="server" />
+    <orderEntry type="library" scope="PROVIDED" name="android" level="project" />
+    <orderEntry type="library" name="webbit" level="project" />
+    <orderEntry type="library" scope="TEST" name="junit" level="project" />
+  </component>
+</module>
+
diff --git a/android/gen/org/openqa/selenium/android/app/BuildConfig.java b/android/gen/org/openqa/selenium/android/app/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package org.openqa.selenium.android.app;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
diff --git a/build.xml b/build.xml
@@ -0,0 +1,16 @@
+<project name="MyProject" default="dist" basedir=".">
+    <description>
+        simple example build file
+    </description>
+
+    <property name="report" value="./build/test_logs" />
+
+  	<target name="test">
+		<junitreport todir="${report}">
+			<fileset dir="${report}">
+				<include name="TEST-*.xml" />
+			</fileset>
+			<report format="frames" todir="${report}/html" />
+		</junitreport>
+  	</target>
+</project>
diff --git a/common/src/web/HTML5_Audio/mp3.mp3 b/common/src/web/HTML5_Audio/mp3.mp3
diff --git a/common/src/web/HTML5_Audio/ogg.ogg b/common/src/web/HTML5_Audio/ogg.ogg
diff --git a/common/src/web/HTML5_Audio/wav.wav b/common/src/web/HTML5_Audio/wav.wav
diff --git a/common/src/web/HTML5_Audio/weba.weba b/common/src/web/HTML5_Audio/weba.weba
diff --git a/common/src/web/HTML5_Audio_Test.html b/common/src/web/HTML5_Audio_Test.html
@@ -0,0 +1,15 @@
+
+<!DOCTYPE html>
+<html>
+<body>
+
+<audio id="audioPlayer" controls preload="auto">
+<source src="HTML5_Audio/weba.weba">
+<source src="HTML5_Audio/ogg.ogg">
+<source src="HTML5_Audio/mp3.mp3">
+<source src="HTML5_Audio/wav.wav">
+  Your browser does not support the audio tag.
+</audio>
+
+</body>
+</html>
diff --git a/common/src/web/HTML5_Video/big_buck_bunny.mp4 b/common/src/web/HTML5_Video/big_buck_bunny.mp4
diff --git a/common/src/web/HTML5_Video/big_buck_bunny.ogv b/common/src/web/HTML5_Video/big_buck_bunny.ogv
diff --git a/common/src/web/HTML5_Video/big_buck_bunny.webm b/common/src/web/HTML5_Video/big_buck_bunny.webm
diff --git a/common/src/web/HTML5_Video_Test.html b/common/src/web/HTML5_Video_Test.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<body>
+
+<video id="videoPlayer" controls>
+  <source src="HTML5_Video/big_buck_bunny.webm" type="video/webm">
+  <source src="HTML5_Video/big_buck_bunny.ogv" type="video/ogg">
+  <source src="HTML5_Video/videos/big_buck_bunny.mp4" type="video/mp4">
+  Your browser does not support the video tag.
+</video>
+
+</body>
+</html>
diff --git a/common/src/web/pageWithOnBeforeUnloadMessage.html b/common/src/web/pageWithOnBeforeUnloadMessage.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <!-- 
+    <!--
     This page differs from pageWithOnUnload.html in that it returns a string in the
     event handler, which causes a different type of alert to appear (the "Stay on
     page/Leave current page" alert).