Merge branch 'master' of https://portal-ua.globallogic.com/git/wd

Author: Andrii Boichuk

src/Test/main.cc

@@ -9,7 +9,10 @@
 #include <QtWidgets/QApplication>
 #else
 #include <QtCore/QtConcurrentRun>
+//#include <QDebug>
+
 #include <QtGui/QApplication>
+
 #include <QtWebKit/QtWebKit>
 #endif
 
@@ -36,7 +39,6 @@ int main(int argc, char *argv[])
     QWebSettings::globalSettings()->setOfflineStoragePath("./web/html5");
     QWebSettings::globalSettings()->setOfflineWebApplicationCachePath("./web/html5");
 
-    //Test
     regitsterView<QWebView>("QWebView");
     regitsterView<QWidget>("QWidget");
 

src/base/debug/debugger_posix.cc

@@ -224,6 +224,8 @@ bool BeingDebugged() {
 #endif
 #elif defined(ARCH_CPU_MIPS_FAMILY)
 #define DEBUG_BREAK() asm("break 2")
+#elif defined(__SH4__)
+#define DEBUG_BREAK() abort()
 #else
 #define DEBUG_BREAK() asm("int3")
 #endif

src/chrome/test/automation/automation_json_requests.cc

@@ -111,15 +111,15 @@ WebViewId WebViewId::ForView(const AutomationId& view_id)
   return id;
 }
 
-WebViewId  WebViewId::ForQtView(QWebView *view)
+WebViewId  WebViewId::ForQtView(QWidget *view)
 {
     WebViewId id;
     id.old_style_ = false;
-    id.webView_ = view;
+    id.view_ = view;
 
     int automationId;
     QVariant viewAutomationId = view->property("automationId");
-
+    QWebView* pView = qobject_cast<QWebView*>(view);
     if (viewAutomationId.isValid())
        automationId = viewAutomationId.toInt();
     else
@@ -128,11 +128,21 @@ WebViewId  WebViewId::ForQtView(QWebView *view)
         automationId = qrand();
         view->setProperty("automationId", automationId);
     }
-    AutomationId aId(AutomationId::kTypeTab, QString::number(automationId).toStdString());
-    id.id_ = aId;
+
+    if (pView != NULL)
+    {
+        AutomationId aId(AutomationId::kTypeTab, QString::number(automationId).toStdString());
+        id.id_ = aId;
+    }
+    else
+    {
+        AutomationId aId(AutomationId::kTypeAppShell, QString::number(automationId).toStdString());
+        id.id_ = aId;
+    }
     return id;
 }
 
+
 // static
 //WebViewId WebViewId::ForOldStyleTab(int tab_id, QWebView *view)
 WebViewId WebViewId::ForOldStyleTab(int tab_id)
@@ -147,7 +157,7 @@ WebViewId WebViewId::ForOldStyleTab(int tab_id)
 
 WebViewId::WebViewId()
     : old_style_(true),
-      webView_(NULL)
+      view_(NULL)
 {}
 
 /*void WebViewId::UpdateDictionary(DictionaryValue* dict,
@@ -177,6 +187,10 @@ bool WebViewId::IsTab() const {
   return old_style_ || id_.type() == AutomationId::kTypeTab;
 }
 
+bool WebViewId::IsApp() const {
+  return id_.type() == AutomationId::kTypeAppShell;
+}
+
 int WebViewId::tab_id() const {
   return tab_id_;
 }
@@ -186,9 +200,9 @@ bool WebViewId::old_style() const
   return old_style_;
 }
 
-QWebView* WebViewId::GetWebView() const
+QWidget* WebViewId::GetView() const
 {
-    return webView_;
+    return view_;
 }
 
 /*

src/chrome/test/automation/automation_json_requests.h

@@ -71,9 +71,9 @@ class WebViewId {
   //static WebViewId ForView(const AutomationId& view_id, QWebView *view);
   static WebViewId ForView(const AutomationId& view_id);
 
-  // Creates an ID for the given view ID.
+    // Creates an ID for the given view ID.
   //static WebViewId ForView(const AutomationId& view_id, QWebView *view);
-  static WebViewId ForQtView(QWebView *view);
+  static WebViewId ForQtView(QWidget *view);
 
   // Creates an ID for the given tab ID.
   //WebViewId ForOldStyleTab(int tab_id, QWebView *view);
@@ -97,23 +97,26 @@ class WebViewId {
   // Returns whether this ID refers to a tab.
   bool IsTab() const;
 
+  // Returns whether this ID refers to app.
+  bool IsApp() const;
+
   int tab_id() const;
 
   // The old style is to use a single integer ID for a tab. The new style is
   // to use an automation ID which may refer to a number of different object
   // types.
   bool old_style() const;
 
-  // return pointer to WebView widget
-  QWebView* GetWebView() const;
+    // return pointer to view widget
+  QWidget* GetView() const;
 
  private:
   // Whether this ID is an old-style integer tab ID.
   bool old_style_;
 
   AutomationId id_;
   int tab_id_;
-  QWebView *webView_;
+  QWidget *view_;
 };
 
 // Used to locate a WebView. The same locator may locate different WebViews

src/chrome/test/webdriver/commands/create_session.cc

@@ -33,6 +33,11 @@ void CreateSession::ExecutePost(Response* const response) {
     return;
   }
 
+  if (SessionManager::GetInstance()->GetSessions().size()  > 0)
+  {
+      response->SetError(new Error(kUnknownError, "Cannot start session. WD support only one session at the moment"));
+      return;
+  }
   // Session manages its own liftime, so do not call delete.
   Session* session = new Session();
   Error* error = session->Init(dict);

src/chrome/test/webdriver/commands/mouse_commands.cc

@@ -36,55 +36,15 @@ bool MoveAndClickCommand::DoesPost() {
 }
 
 void MoveAndClickCommand::ExecutePost(Response* response) {
-  std::string tag_name;
-  Error* error = session_->GetElementTagName(
-      session_->current_target(), element, &tag_name);
-  if (error) {
-    response->SetError(error);
-    return;
-  }
+    Error* error = NULL;
+
+    error = session_->MoveAndClickElement(session_->current_target(), element);
 
-  if (tag_name == "option") {
-    const char* kCanOptionBeToggledScript =
-        "function(option) {"
-        "  for (var parent = option.parentElement;"
-        "       parent;"
-        "       parent = parent.parentElement) {"
-        "    if (parent.tagName.toLowerCase() == 'select') {"
-        "      return parent.multiple;"
-        "    }"
-        "  }"
-        "  throw new Error('Option element is not in a select');"
-        "}";
-    bool can_be_toggled;
-    error = session_->ExecuteScriptAndParse(
-        session_->current_target(),
-        kCanOptionBeToggledScript,
-        "canOptionBeToggled",
-        CreateListValueFrom(element),
-        CreateDirectValueParser(&can_be_toggled));
     if (error) {
       response->SetError(error);
-      return;
     }
 
-    if (can_be_toggled) {
-      error = session_->ToggleOptionElement(
-          session_->current_target(), element);
-    } else {
-      error = session_->SetOptionElementSelected(
-          session_->current_target(), element, true);
-    }
-  } else {
-    Point location;
-    error = session_->GetClickableLocation(element, &location);
-    if (!error)
-      error = session_->MouseMoveAndClick(location, automation::kLeftButton);
-  }
-  if (error) {
-    response->SetError(error);
     return;
-  }
 }
 
 HoverCommand::HoverCommand(const std::vector<std::string>& path_segments,

src/chrome/test/webdriver/commands/target_locator_commands.cc

@@ -115,6 +115,14 @@ void SwitchFrameCommand::ExecutePost(Response* const response) {
   int index = 0;
   ElementId element;
   Error* error = NULL;
+
+  // TODO: move this function to session?
+  if ( session_->current_target().view_id.IsApp() )
+  {
+      error = new Error(kUnknownError, "This trget doesnt support switchFrame command");
+      return;
+  }
+
   if (GetStringParameter("id", &id)) {
     error = session_->SwitchToFrameWithNameOrId(id);
   } else if (GetIntegerParameter("id", &index)) {
@@ -158,15 +166,14 @@ bool ActiveElementCommand::DoesPost() {
 }
 
 void ActiveElementCommand::ExecutePost(Response* const response) {
-  ListValue args;
-  Value* result = NULL;
-  Error* error = session_->ExecuteScript(
-      "return document.activeElement || document.body", &args, &result);
-  if (error) {
-    response->SetError(error);
-    return;
-  }
-  response->SetValue(result);
+    ElementId element;
+    Error* error = session_->ActiveElement(
+        session_->current_target(), &element);
+    if (error) {
+      response->SetError(error);
+      return;
+    }
+    response->SetValue(element.ToValue());
 }
 
 }  // namespace webdriver