File upload API in chromedriver

chrome/test/webdriver/commands/webelement_commands.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/webdriver/commands/webelement_commands.h"
 
+#include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "base/values.h"
 #include "chrome/test/webdriver/commands/response.h"
 #include "chrome/test/webdriver/session.h"
 #include "chrome/test/webdriver/webdriver_error.h"
 #include "third_party/webdriver/atoms.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
@@ skipping 40 matching lines @@
 }
 
 void ElementAttributeCommand::ExecuteGet(Response* const response) {
   // There should be at least 7 segments to match
   // "/session/$session/element/$id/attribute/$name"
   if (path_segments_.size() < 7) {
     response->SetError(new Error(kBadRequest, "Path segments is less than 7"));
     return;
   }
 
-  std::string script = base::StringPrintf(
-      "return (%s).apply(null, arguments);", atoms::GET_ATTRIBUTE);
-
-  ListValue args;
-  args.Append(element.ToValue());
-  args.Append(Value::CreateStringValue(path_segments_.at(6)));
-
-  Value* result = NULL;
-  Error* error = session_->ExecuteScript(script, &args, &result);
+  const std::string key = path_segments_.at(6);
+  Value* value;
+  Error* error = session_->GetAttribute(element, key, &value);
   if (error) {
     response->SetError(error);
     return;
   }
-  response->SetValue(result);
+
+  response->SetValue(value);
 }
 
 ///////////////////// ElementClearCommand ////////////////////
 
 ElementClearCommand::ElementClearCommand(
     const std::vector<std::string>& path_segments,
     DictionaryValue* parameters)
     : WebElementCommand(path_segments, parameters) {}
 
 ElementClearCommand::~ElementClearCommand() {}
@@ skipping 399 matching lines @@
   if (!result->IsType(Value::TYPE_STRING) &&
       !result->IsType(Value::TYPE_NULL)) {
     response->SetError(new Error(
         kUnknownError, "Result is not string or null type"));
     return;
   }
   response->SetValue(result.release());
 }
 
 void ElementValueCommand::ExecutePost(Response* const response) {
+  bool is_input = false;
+  Error* error = HasAttributeWithLowerCaseValueASCII("tagName", "input",
+                                                     &is_input);
+  if (error) {
+    response->SetError(error);
+    return;
+  }
+
+  bool is_file = false;
+  error = HasAttributeWithLowerCaseValueASCII("type", "file", &is_file);
+  if (error) {
+    response->SetError(error);
+    return;
+  }
+
+  // If the element is a file upload control, set the file paths to the element.
+  // Otherwise send the value to the element as key input.
+  if (is_input && is_file) {
+    error = DragAndDropFilePaths();
+  } else {
+    error = SendKeys();
+  }
+
+  if (error) {
+    response->SetError(error);
+    return;
+  }
+
+  response->SetStatus(kSuccess);

[kkania, 2011/06/01 16:16:41]

this is the default status of the response, so you can remove this line

[nodchip, 2011/06/02 07:15:53]

Done.

+}
+
+Error* ElementValueCommand::HasAttributeWithLowerCaseValueASCII(
+    const std::string& key, const std::string& value, bool* result) const {
+  Value* unscoped_value = NULL;
+  Error* error = session_->GetAttribute(element, key, &unscoped_value);
+  scoped_ptr<Value> scoped_value(unscoped_value);
+  unscoped_value = NULL;
+
+  if (error) {
+    return error;
+  }
+
+  if (!scoped_value->IsType(Value::TYPE_STRING)) {
+    return new Error(kUnknownError,
+                     "Could not get the attribute value as a string");
+  }
+
+  std::string actual_value;
+  if (!scoped_value->GetAsString(&actual_value)) {

[kkania, 2011/06/01 16:16:41]

I believe GetAsString will do the same check as you have above; if so, you can
remove the above check. This will not actually convert a number to a string, but
I think that is ok

[nodchip, 2011/06/02 07:15:53]

Done.

+    return new Error(kUnknownError, "Could not get the attribute value");

[kkania, 2011/06/01 16:16:41]

change error message to "Attribute '%s' did not have a string value",
key.c_str()

[nodchip, 2011/06/02 07:15:53]

Done.

+  }
+
+  *result = LowerCaseEqualsASCII(actual_value, value.c_str());
+  return NULL;
+}
+
+Error* ElementValueCommand::DragAndDropFilePaths() const {
+  ListValue* path_list;
+  if (!GetListParameter("value", &path_list)) {
+    return new Error(kBadRequest, "Missing or invalid 'value' parameter");
+  }
+
+  std::vector<std::string> paths;
+  for (size_t i = 0; i < path_list->GetSize(); ++i) {
+    FilePath::StringType path;
+    if (!path_list->GetString(i, &path)) {
+      return new Error(kBadRequest, "Invalid element in 'value' parameter");

[kkania, 2011/06/01 16:16:41]

this is a bit unclear, how about including something about the supposed path not
being a string in the message

[nodchip, 2011/06/02 07:15:53]

Done.

+    }
+
+    if (!file_util::PathExists(FilePath(path))) {
+      return new Error(kBadRequest, "Path does not exist");

[kkania, 2011/06/01 16:16:41]

put the path in the error msg

[nodchip, 2011/06/02 07:15:53]

Done.

+    }
+
+    paths.push_back(path);
+  }
+
+  gfx::Point location;
+  Error* error = session_->GetClickableLocation(element, &location);
+  if (error) {
+    return error;
+  }
+
+  return session_->DragAndDropFilePaths(location, paths);
+}
+
+Error* ElementValueCommand::SendKeys() const {
   ListValue* key_list;
   if (!GetListParameter("value", &key_list)) {
-    response->SetError(new Error(
-        kBadRequest, "Missing or invalid 'value' parameter"));
-    return;
+    return new Error(kBadRequest, "Missing or invalid 'value' parameter");
   }
+
   // Flatten the given array of strings into one.
   string16 keys;
   for (size_t i = 0; i < key_list->GetSize(); ++i) {
     string16 keys_list_part;
     key_list->GetString(i, &keys_list_part);
     for (size_t j = 0; j < keys_list_part.size(); ++j) {
       if (CBU16_IS_SURROGATE(keys_list_part[j])) {
-        response->SetError(new Error(
-            kBadRequest, "ChromeDriver only supports characters in the BMP"));
-        return;
+        return new Error(kBadRequest,
+                         "ChromeDriver only supports characters in the BMP");
       }
     }
     keys.append(keys_list_part);
   }
 
-  Error* error = session_->SendKeys(element, keys);
-  if (error)
-    response->SetError(error);
+  return session_->SendKeys(element, keys);
 }
 
 ///////////////////// ElementTextCommand ////////////////////
 
 ElementTextCommand::ElementTextCommand(
     const std::vector<std::string>& path_segments,
     DictionaryValue* parameters)
     : WebElementCommand(path_segments, parameters) {}
 
 ElementTextCommand::~ElementTextCommand() {}
@@ skipping 18 matching lines @@
     return;
   }
   if (!result->IsType(Value::TYPE_STRING)) {
     response->SetError(new Error(kUnknownError, "Result is not string type"));
     return;
   }
   response->SetValue(result.release());
 }
 
 }  // namespace webdriver