Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev

Author: Andrii.Boichuk

build.sh

@@ -28,7 +28,7 @@ else
 fi
 
 OUT_STATIC_LIB_FILES="libchromium_base.a libWebDriver_core.a libWebDriver_extension_qt_base.a libWebDriver_extension_qt_web.a libWebDriver_extension_qt_quick.a libWebDriver_extension_qt_quick_web.a"
-OUT_SHARED_LIB_FILES="libchromium_base.so libWebDriver_core.so libWebDriver_extension_qt_base.so libWebDriver_extension_qt_web.so libWebDriver_extension_qt_quick.so libWebDriver_extension_qt_quick_web.so libWebDriver_noWebkit_android.so"
+OUT_SHARED_LIB_FILES="libchromium_base.so libWebDriver_core.so libWebDriver_extension_qt_base.so libWebDriver_extension_qt_web.so libWebDriver_extension_qt_quick.so libWebDriver_extension_qt_quick_web.so libAndroidWD_QML.so libAndroidWD_Widgets.so"
 OUT_BIN_FILES="WebDriver WebDriver_noWebkit WebDriver_noWebkit_sharedLibs"
 GYP=`which gyp`
 

build_android.sh

@@ -5,30 +5,10 @@ archs=$1
 
 if [ -z $QT_DIR ]
 then
-  export QT_DIR=/opt/Qt5.1/5.1.0
+  export QT_DIR=/opt/Qt5.2/5.2.0
 fi
 
-if [ -z $QT_DESK_DIR ]
-then
-  export QT_DESK_DIR=/opt/Qt5.1/5.1.0/gcc
-fi
-
-echo "####################### Build androiddeployqt #######################"
-export QT_DESK_QMAKE=$QT_DESK_DIR/bin/qmake
-export ANDROID_DEPLOY_QT_PATH=./platform/android/androiddeployqt
-
-cd $ANDROID_DEPLOY_QT_PATH
-$QT_DESK_QMAKE androiddeployqt.pro -r -spec linux-g++
-make
-RETVAL=$?
-if [ $RETVAL -ne 0 ];
-then
-  echo "####################### Build androiddeployqt failed !!! #######################"
-  exit $RETVAL
-fi
-cd -
-
-export ANDROID_DEPLOY_QT=$ANDROID_DEPLOY_QT_PATH/androiddeployqt
+export QT_VERSION=5.2.0
 export ANDROID_PACKAGE=org.webdriver.qt
 export ANDROID_JAVA=`pwd`/platform/android/java/
 export ANDROID_APP_NAME=AndroidWD
@@ -91,6 +71,8 @@ do
   export LINK=$BIN/$ANDROID_TOOL_PREFIX-g++
   export AR=$BIN/$ANDROID_TOOL_PREFIX-ar
 
+  export ANDROID_DEPLOY_QT=$QT_DIR/android_$arch/bin/androiddeployqt
+
 
   export GYP_DEFINES="OS=android"
 
@@ -115,35 +97,59 @@ fi
     fi
 
     dist_dir=`pwd`/out/bin/$platform/$mode
-    export BINARY_PATH=$dist_dir/libWebDriver_noWebkit_android.so
+    export BINARY_PATH_WIDGETS=$dist_dir/libAndroidWD_Widgets.so
+    export BINARY_PATH_QML=$dist_dir/libAndroidWD_QML.so
 
     #clean android directory
     rm -rf $dist_dir/android
 
 
     echo "####################### Create apk "$arch" "$mode" #######################"
     mkdir -p $dist_dir/android/libs/$ANDROID_LIB_ARCH
-    cp $BINARY_PATH $dist_dir/android/libs/$ANDROID_LIB_ARCH
-
-    export ANDROID_JSON_CONFIG=$dist_dir/android/android_config.json 
-    python generate_android_json.py
+    cp $BINARY_PATH_WIDGETS $dist_dir/android/libs/$ANDROID_LIB_ARCH
 
     if [ $mode = "release" ]
     then
       export RELEASE_ARG="--sign "$KEY_STORE" "$ALIAS" --storepass "$PASSWORD
       echo $RELEASE_ARG
     fi
 
+    export ANDROID_JSON_CONFIG=$dist_dir/android/android_config.json 
+
+
+    echo "####################### Widgets #######################"
+    export BINARY_PATH=$BINARY_PATH_WIDGETS
+    python generate_android_json.py
+
+    $ANDROID_DEPLOY_QT --output $dist_dir/android --input $ANDROID_JSON_CONFIG --verbose $MINISTRO $RELEASE_ARG 
+    RETVAL=$?
+    if [ $RETVAL -ne 0 ];
+    then
+      echo "####################### androiddeployqt widgets error!!! #######################"
+      echo $RETVAL
+      exit $RETVAL
+    fi
+
+    cp $dist_dir/android/bin/QtApp-release.apk $dist_dir/AndroidWD_Widgets.apk
+    rm -rf $dist_dir/android
+
+
+    echo "####################### QML #######################"
+    mkdir -p $dist_dir/android/libs/$ANDROID_LIB_ARCH
+    cp $BINARY_PATH_QML $dist_dir/android/libs/$ANDROID_LIB_ARCH
+    export BINARY_PATH=$BINARY_PATH_QML
+    python generate_android_json.py
+
     $ANDROID_DEPLOY_QT --output $dist_dir/android --input $ANDROID_JSON_CONFIG --verbose $MINISTRO $RELEASE_ARG 
     RETVAL=$?
     if [ $RETVAL -ne 0 ];
     then
-      echo "####################### androiddeployqt error!!! #######################"
+      echo "####################### androiddeployqt qml error!!! #######################"
       echo $RETVAL
       exit $RETVAL
     fi
 
-    cp $dist_dir/android/bin/QtApp-release.apk $dist_dir/AndroidWD.apk
+    cp $dist_dir/android/bin/QtApp-release.apk $dist_dir/AndroidWD_QML.apk
     rm -rf $dist_dir/android
 
   done

build_ios.sh

@@ -3,21 +3,38 @@
 export QT_DIR=/usr/local/opt/qt5_ios
 export PATH=$QT_DIR/bin:$PATH
 
+cat > wd.gypi <<EOF
+{
+  'variables': 
+  {
+    'QT5': '1',
+    'QT_BIN_PATH':       '${QT_DIR}/bin',
+    'QT_INC_PATH':       '${QT_DIR}/include',
+    'QT_LIB_PATH':       '${QT_DIR}/lib',
+    'WD_CONFIG_WEBKIT':  '0',
+    'WD_CONFIG_QUICK':   '1',
+    'WD_CONFIG_PLAYER':  '1',
+    'WD_BUILD_MONGOOSE': '1',
+  },
+}
+EOF
+
 python generate_wdversion.py
 
 gyp --depth . -G output_dir=. -D platform=desktop -D mode=debug -f xcode -D OS=ios --generator-output=out/ wd.gyp
 
 if [ "$1" == "-all" ]
 then
 
-xcodebuild -project out/wd_test.xcodeproj -target test_ios_WD -arch i386 -sdk iphonesimulator clean build
-
-cd ./platform/ios/wd
-qmake wd.pro -r -spec unsupported/macx-iossimulator-clang CONFIG+=x86
-make -release
+#xcodebuild -project out/wd_test.xcodeproj -target test_ios_WD -arch i386 -sdk iphonesimulator #clean build
+xcodebuild -project out/base.xcodeproj -target chromium_base -arch i386 -sdk iphonesimulator6.0 clean build
+xcodebuild -project out/wd_core.xcodeproj -target WebDriver_core -arch i386 -sdk iphonesimulator6.0 clean build
+xcodebuild -project out/wd_ext_qt.xcodeproj -target WebDriver_extension_qt_base -arch i386 -sdk iphonesimulator6.0 clean build
+xcodebuild -project out/wd_ext_qt.xcodeproj -target WebDriver_extension_qt_quick -arch i386 -sdk iphonesimulator6.0 clean build
 
-cd ../wd_test
 
-xcodebuild -project wd_test.xcodeproj -alltargets -arch i386 -sdk iphonesimulator -configuration Debug ONLY_ACTIVE_ARCH=NO VALID_ARCHS="armv7 i386" clean build
+cd ./platform/ios/wd
+qmake wd.pro -r -spec macx-ios-clang CONFIG+=x86 CONFIG+=iphonesimulator CONFIG+=release
+make
 
 fi

generate_android_json.py

@@ -14,7 +14,7 @@
 jsonfile.write("\"target-architecture\": \"" +os.environ['ANDROID_LIB_ARCH'] +"\",\n")
 jsonfile.write("\"application-binary\": \"" +os.environ['BINARY_PATH'] +"\",\n")
 jsonfile.write("\"android-package\": \"" +os.environ['ANDROID_PACKAGE'] +"\",\n")
-jsonfile.write("\"android-package-source-directory\": \"" +os.environ['ANDROID_JAVA'] +"\",\n")
+# jsonfile.write("\"android-package-source-directory\": \"" +os.environ['ANDROID_JAVA'] +"\",\n")
 jsonfile.write("\"android-app-name\": \"" +os.environ['ANDROID_APP_NAME'] +"\"\n")
 jsonfile.write("}")
 jsonfile.close()

inc/commands/set_timeout_commands.h

@@ -18,6 +18,12 @@ namespace webdriver {
 
 class Response;
 
+/// Set the amount of time that a particular type of operation can execute (/session/*/timeouts").
+/// Valid values are: "script" for script timeouts,
+/// "implicit" for modifying the implicit wait timeout
+/// and "page load" for setting a page load timeout.
+/// E.g. - {"ms": 2000, "type": "page load"}
+
 class SetTimeoutCommand : public WebDriverCommand {
 public:
     SetTimeoutCommand(const std::vector<std::string>& path_segments,
@@ -26,9 +32,13 @@ class SetTimeoutCommand : public WebDriverCommand {
 
     virtual bool DoesPost() const OVERRIDE;
     virtual void ExecutePost(Response* const response) OVERRIDE;
-    virtual void SetTimeout(int timeout_ms) = 0;
+    virtual Error* SetTimeout(int timeout_ms);
+
+    /// Amount of time of operation can execute (/session/*/timeouts") by default, in ms.
+    static const int DEFAULT_TIMEOUT;
 
 private:
+    Error* SetTimeout(int timeout_ms, std::string type);
     DISALLOW_COPY_AND_ASSIGN(SetTimeoutCommand);
 };
 
@@ -38,7 +48,7 @@ class SetAsyncScriptTimeoutCommand : public SetTimeoutCommand {
     SetAsyncScriptTimeoutCommand(const std::vector<std::string>& path_segments,
                                const base::DictionaryValue* const parameters);
     virtual ~SetAsyncScriptTimeoutCommand();
-    virtual void SetTimeout(int timeout_ms) OVERRIDE;
+    virtual Error* SetTimeout(int timeout_ms) OVERRIDE;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(SetAsyncScriptTimeoutCommand);
@@ -50,7 +60,7 @@ class ImplicitWaitCommand : public SetTimeoutCommand {
     ImplicitWaitCommand(const std::vector<std::string>& path_segments,
                       const base::DictionaryValue* const parameters);
     virtual ~ImplicitWaitCommand();
-    virtual void SetTimeout(int timeout_ms) OVERRIDE;
+    virtual Error* SetTimeout(int timeout_ms) OVERRIDE;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(ImplicitWaitCommand);

inc/extension_qt/qwebviewext.h

@@ -14,7 +14,7 @@ class QWebViewExt : public QWebView
     Q_OBJECT
 public:
     explicit QWebViewExt(QWidget *parent = 0);
-    ~QWebViewExt();
+    virtual ~QWebViewExt();
 
 
 protected:

inc/webdriver_error.h

@@ -25,11 +25,13 @@ enum ErrorCode {
     kElementNotSelectable = 15,
     kJavaScriptError = 17,
     kXPathLookupError = 19,
+    kTimeout = 21,
     kNoSuchWindow = 23,
     kInvalidCookieDomain = 24,
     kUnableToSetCookie = 25,
     kUnexpectedAlertOpen = 26,
     kNoAlertOpenError = 27,
+    kScriptTimeout = 28,
     kMoveTargetOutOfBounds = 34,
     kCommandNotSupported = 50,
 

inc/webdriver_route_patterns.h

@@ -23,6 +23,7 @@ class CommandRoutes {
     static const char kNewSession[];
     static const char kSession[];
     static const char kSessions[];
+    static const char kTimeOuts[];
     static const char kImplicitlyWait[];
     static const char kSetScriptTimeout[];
     static const char kGetAvailableLogTypes[];

inc/webdriver_route_table.h

@@ -37,6 +37,7 @@
 /// - kNewSession[]                 = "/session";
 /// - kSession[]                    = "/session/*";
 /// - kSessions[]                   = "/sessions";
+/// - kTimeOuts[]                   = "/session/*/timeouts";
 /// - kImplicitlyWait[]             = "/session/*/timeouts/implicit_wait";
 /// - kSetScriptTimeout[]           = "/session/*/timeouts/async_script";
 /// - kGetAvailableLogTypes[]       = "/session/*/log/types";

inc/webdriver_session.h

@@ -125,6 +125,9 @@ class Session {
 
     void set_current_view(const ViewId& viewId);
 
+    void set_page_load_timeout(int timeout_ms);
+    int page_load_timeout() const;
+
     void set_async_script_timeout(int timeout_ms);
     int async_script_timeout() const;
 
@@ -240,6 +243,9 @@ class Session {
 
     base::Thread thread_;
 
+    // Timeout (in ms) for page loads.
+    int page_load_timeout_;
+
     // Timeout (in ms) for asynchronous script execution.
     int async_script_timeout_;