replaced QXmlPattern with pugixml

Author: AndriyP

src/webdriver/extension_qt/widget_view_executor.cc

@@ -48,10 +48,7 @@
 #include <QtGui/QListView>
 #endif
 
-#ifdef WD_CONFIG_XPATH
-#include <QtXmlPatterns/QXmlQuery>
-#include <QtXmlPatterns/QXmlResultItems>
-#endif
+#include "third_party/pugixml/pugixml.hpp"
 
 namespace webdriver {
 
@@ -838,11 +835,6 @@ bool QWidgetViewCmdExecutor::FilterNativeWidget(const QWidget* widget, const std
 }
 
 void QWidgetViewCmdExecutor::FindNativeElementsByXpath(QWidget* parent, const std::string &query, std::vector<ElementId>* elements, Error **error) {
-#ifndef WD_CONFIG_XPATH
-    *error = new Error(kXPathLookupError, "Finding elements by xpath is not supported");
-    return;
-#else
-    QXmlResultItems result;
     QByteArray byteArray;
     QBuffer buff(&byteArray);
 
@@ -853,50 +845,59 @@ void QWidgetViewCmdExecutor::FindNativeElementsByXpath(QWidget* parent, const st
         return;
 
     buff.seek(0);
-    QXmlQuery xmlquery;
-    xmlquery.bindVariable("buff", &buff);
-    xmlquery.setQuery("doc($buff) "+QString(query.c_str()));
 
-    if (!xmlquery.isValid()) {
-        *error = new Error(kXPathLookupError);
-        return;
-    }
-    xmlquery.evaluateTo(&result);
-
-    buff.close();
-    QXmlItem item(result.next());
-    while (!item.isNull()) {
-        if (item.isNode()) {
-            xmlquery.setFocus(item);
-            xmlquery.setQuery("./@elementId/string()");
-            if (!xmlquery.isValid()) {
-                *error = new Error(kXPathLookupError);
-                return;
-            }
-
-            QString elementId;
-            xmlquery.evaluateTo(&elementId);
-            if (!elementId.isEmpty()) {
-                // TODO: what this? why do we need to remove EOL?
-                elementId.remove('\n');
-
-                if (elementsMap.contains(elementId)) {
-                    ElementId elm;
-                    session_->AddElement(view_id_, new QElementHandle(elementsMap[elementId]), &elm);
-                    (*elements).push_back(elm);
-                    session_->logger().Log(kFineLogLevel, "element found: "+elm.id());
-                } else {
-                    session_->logger().Log(kSevereLogLevel, "cant get element from map, skipped");
+    // prepare pointer to data to parse
+    const void* content = byteArray.data();
+    int content_size = byteArray.size();
+
+    pugi::xml_document doc;
+    pugi::xml_parse_result result = doc.load_buffer(content, content_size);
+
+    if (result) {
+        session_->logger().Log(kFineLogLevel, "UI XML parsed without errors");
+
+        // Select nodes via compiled query
+        pugi::xpath_query query_nodes(query.c_str());
+        pugi::xpath_node_set found_nodes = query_nodes.evaluate_node_set(doc);
+
+        if (NULL == query_nodes.result().error) {
+            //pugi::xpath_node_set found_nodes = doc.select_nodes(query.c_str());
+            printf("!!!!!!!! found nodes: %d\n", found_nodes.size());
+            for (pugi::xpath_node_set::const_iterator it = found_nodes.begin(); it != found_nodes.end(); ++it) {
+                pugi::xpath_node node = *it;
+
+                QString elemId(node.node().attribute("elementId").value());
+
+                if (!elemId.isEmpty()) {
+                    if (elementsMap.contains(elemId)) {
+                        ElementId elm;
+                        session_->AddElement(view_id_, new QElementHandle(elementsMap[elemId]), &elm);
+                        (*elements).push_back(elm);
+                        session_->logger().Log(kFineLogLevel, "element found: "+elm.id());
+                    } else {
+                        session_->logger().Log(kSevereLogLevel, "cant get element from map, skipped");
+                    }
                 }
             }
+        } else {
+            std::string error_descr = "Cant evaluate XPath: ";       
+            error_descr += query_nodes.result().description();
+            session_->logger().Log(kWarningLogLevel, error_descr);
+            *error = new Error(kXPathLookupError);
         }
-        item = result.next();
     }
-    if (elements->empty())
+    else
     {
-        return;
+        std::string error_descr = "   Error description: ";
+        error_descr += result.description();
+        session_->logger().Log(kWarningLogLevel, "UI XML parsed with errors:");
+        session_->logger().Log(kWarningLogLevel, error_descr);
     }
-#endif
+
+    // destroy tree
+    doc.reset();
+
+    buff.close();
 }
 
 void QWidgetViewCmdExecutor::createUIXML(QWidget *parent, QIODevice* buff, XMLElementMap& elementsMap, Error** error, bool needAddWebSource) {