add findChild for QML JS

Author: hekra

Diff for: src/webdriver/extension_qt/qml_objname_util.cc

@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright © 1992-2014 Cisco and/or its affiliates. All rights reserved.
+** All rights reserved.
+**
+** $CISCO_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $CISCO_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qml_objname_util.h"
+#include "webdriver_util.h"
+
+
+namespace webdriver {
+
+ObjectNameUtils::ObjectNameUtils(QQuickItem *root) : root_(root) {}
+ObjectNameUtils::~ObjectNameUtils() {}
+
+QObject *ObjectNameUtils::findChild(const QString& name) {
+   QObject *obj = findChild(root_, name);
+   return obj;
+}
+
+} // namespace webdriver

Diff for: src/webdriver/extension_qt/qml_objname_util.h

@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright © 1992-2014 Cisco and/or its affiliates. All rights reserved.
+** All rights reserved.
+**
+** $CISCO_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $CISCO_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WEBDRIVER_QT_QML_OBJN_UTIL_H_
+#define WEBDRIVER_QT_QML_OBJN_UTIL_H_
+
+#include <string>
+#include <QtCore/QDebug>
+#include <QtQuick/QQuickItem>
+#include "common_util.h"
+
+namespace webdriver {
+
+class ObjectNameUtils
+   : public QObject
+{
+    Q_OBJECT
+public:
+    ObjectNameUtils(QQuickItem *root);
+    ~ObjectNameUtils();
+    Q_INVOKABLE QObject *findChild(const QString& name);
+protected:
+    QQuickItem* root_;
+
+    QObject * findChild(const QQuickItem* item, const QString& name) {
+        QList<QQuickItem*> childs = item->childItems();
+
+        foreach(QQuickItem *child, childs) {
+            if (!child) continue;
+            if (name == child->objectName())
+               return child;
+
+            QObject* q = findChild(child, name);
+
+            if (q)
+                return q;
+        }
+
+        return NULL;
+    }
+
+};
+}  // namespace webdriver
+
+#endif  // WEBDRIVER_QT_QML_OBJN_UTIL_H_

Diff for: src/webdriver/extension_qt/quick2_view_executor.cc

@@ -29,6 +29,7 @@
 #include "webdriver_util.h"
 #include "q_key_converter.h"
 #include "qml_view_util.h"
+#include "qml_objname_util.h"
 
 #include "extension_qt/event_dispatcher.h"
 #include "extension_qt/wd_event_dispatcher.h"
@@ -40,6 +41,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QTimer>
 #include <QtGui/QGuiApplication>
+#include <QtQml/QQmlContext>
 #include <QtQml/QQmlExpression>
 #include <QtQml/QQmlEngine>
 #include <QtGui/QStyleHints>
@@ -889,7 +891,16 @@ void Quick2ViewCmdExecutor::ExecuteScript(const std::string& script, const base:
         script.c_str(),
         args_as_json.c_str());
 
-    QQmlExpression expr(view->rootContext(), view, jscript.c_str());
+    QQuickItem *rootItem = qobject_cast<QQuickItem*>(view->contentItem());
+    QQmlContext *rootContext = view->rootContext();
+    QVariant p = rootContext->contextProperty("ObjectNameUtils");
+
+    if (p.isNull()) {
+        ObjectNameUtils* objn = new ObjectNameUtils(rootItem);
+        rootContext->setContextProperty("ObjectNameUtils", objn);
+    }
+
+    QQmlExpression expr(rootContext, view, jscript.c_str());
     QVariant result = expr.evaluate();
     if (expr.hasError()) {
         *error = new Error(kJavaScriptError, expr.error().toString().toStdString());

Diff for: wd_ext_qt.gyp

@@ -110,6 +110,9 @@
             'src/webdriver/extension_qt/quick2_view_enumerator.cc',
             'src/webdriver/extension_qt/quick2_view_executor.cc',
             'src/webdriver/extension_qt/qml_view_util.cc',
+            'src/webdriver/extension_qt/qml_objname_util.h',
+            'src/webdriver/extension_qt/qml_objname_util.cc',
+            '<(INTERMEDIATE_DIR)/moc_qml_objname_util.cc',
           ],
         } , {