Add unit test for password filling logic

Bug: 865114
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I5617f95e83c661d046e1a9d148362c2b436d2240
Reviewed-on: https://chromium-review.googlesource.com/1195292Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Scott Wu <scottwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588528}

components/password_manager/ios/BUILD.gn

@@ -36,6 +36,7 @@ static_library("test_support") {
   ]
 
   deps = [
+    ":ios",
     "//base",
     "//components/autofill/core/common",
     "//url",

components/password_manager/ios/account_select_fill_data_unittest.cc

@@ -33,10 +33,10 @@ class AccountSelectFillDataTest : public PlatformTest {
  public:
   AccountSelectFillDataTest() {
     for (size_t i = 0; i < base::size(form_data_); ++i) {
-      SetPasswordFormFillData(form_data_[i], kUrl, kUrl, kUsernameElements[i],
-                              kUsernames[i], kPasswordElements[i],
-                              kPasswords[i], kAdditionalUsernames[i],
-                              kAdditionalPasswords[i], false);
+      SetPasswordFormFillData(kUrl, kUrl, kUsernameElements[i], kUsernames[i],
+                              kPasswordElements[i], kPasswords[i],
+                              kAdditionalUsernames[i], kAdditionalPasswords[i],
+                              false, &form_data_[i]);
 
       form_data_[i].name = base::ASCIIToUTF16(kFormNames[i]);
     }

components/password_manager/ios/password_controller_helper.mm

@@ -74,6 +74,15 @@ constexpr char kCommandPrefix[] = "passwordForm";
             withUsername:(const base::string16&)username
                 password:(const base::string16&)password
        completionHandler:(nullable void (^)(BOOL))completionHandler;
+
+@end
+
+// Category for test only.
+@interface PasswordControllerHelper (Testing)
+
+// Replaces JsPasswordManager for test.
+- (void)setJsPasswordManager:(JsPasswordManager*)jsPasswordManager;
+
 @end
 
 @implementation PasswordControllerHelper {
@@ -302,6 +311,12 @@ constexpr char kCommandPrefix[] = "passwordForm";
       }];
 }
 
+#pragma mark - Private methods for test only
+
+- (void)setJsPasswordManager:(JsPasswordManager*)jsPasswordManager {
+  _jsPasswordManager = jsPasswordManager;
+}
+
 #pragma mark - Public methods
 
 - (void)findPasswordFormsWithCompletionHandler:

components/password_manager/ios/test_helpers.cc

@@ -6,15 +6,15 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
+#include "components/password_manager/ios/account_select_fill_data.h"
 #include "url/gurl.h"
 
 using autofill::PasswordFormFillData;
+using password_manager::FillData;
 
 namespace test_helpers {
 
-// Populates |form_data| with test values.
-void SetPasswordFormFillData(PasswordFormFillData& form_data,
-                             const std::string& origin,
+void SetPasswordFormFillData(const std::string& origin,
                              const std::string& action,
                              const char* username_field,
                              const char* username_value,
@@ -22,28 +22,45 @@ void SetPasswordFormFillData(PasswordFormFillData& form_data,
                              const char* password_value,
                              const char* additional_username,
                              const char* additional_password,
-                             bool wait_for_username) {
-  form_data.origin = GURL(origin);
-  form_data.action = GURL(action);
+                             bool wait_for_username,
+                             PasswordFormFillData* form_data) {
+  form_data->origin = GURL(origin);
+  form_data->action = GURL(action);
   autofill::FormFieldData username;
   username.name = base::UTF8ToUTF16(username_field);
   username.id = base::UTF8ToUTF16(username_field);
   username.value = base::UTF8ToUTF16(username_value);
-  form_data.username_field = username;
+  form_data->username_field = username;
   autofill::FormFieldData password;
   password.name = base::UTF8ToUTF16(password_field);
   password.id = base::UTF8ToUTF16(password_field);
   password.value = base::UTF8ToUTF16(password_value);
-  form_data.password_field = password;
+  form_data->password_field = password;
   if (additional_username) {
     autofill::PasswordAndRealm additional_password_data;
     additional_password_data.password = base::UTF8ToUTF16(additional_password);
     additional_password_data.realm.clear();
-    form_data.additional_logins.insert(
+    form_data->additional_logins.insert(
         std::pair<base::string16, autofill::PasswordAndRealm>(
             base::UTF8ToUTF16(additional_username), additional_password_data));
   }
-  form_data.wait_for_username = wait_for_username;
+  form_data->wait_for_username = wait_for_username;
+}
+
+void SetFillData(const std::string& origin,
+                 const std::string& action,
+                 const char* username_field,
+                 const char* username_value,
+                 const char* password_field,
+                 const char* password_value,
+                 FillData* fill_data) {
+  DCHECK(fill_data);
+  fill_data->origin = GURL(origin);
+  fill_data->action = GURL(action);
+  fill_data->username_element = base::UTF8ToUTF16(username_field);
+  fill_data->username_value = base::UTF8ToUTF16(username_value);
+  fill_data->password_element = base::UTF8ToUTF16(password_field);
+  fill_data->password_value = base::UTF8ToUTF16(password_value);
 }
 
 }  // namespace  test_helpers

components/password_manager/ios/test_helpers.h

@@ -9,13 +9,16 @@
 
 namespace autofill {
 struct PasswordFormFillData;
-}
+}  // namespace autofill
+
+namespace password_manager {
+struct FillData;
+}  // namespace password_manager
 
 namespace test_helpers {
 
 // Populates |form_data| with test values.
-void SetPasswordFormFillData(autofill::PasswordFormFillData& form_data,
-                             const std::string& origin,
+void SetPasswordFormFillData(const std::string& origin,
                              const std::string& action,
                              const char* username_field,
                              const char* username_value,
@@ -23,8 +26,18 @@ void SetPasswordFormFillData(autofill::PasswordFormFillData& form_data,
                              const char* password_value,
                              const char* additional_username,
                              const char* additional_password,
-                             bool wait_for_username);
+                             bool wait_for_username,
+                             autofill::PasswordFormFillData* form_data);
+
+// Populates |fill_data| with test values.
+void SetFillData(const std::string& origin,
+                 const std::string& action,
+                 const char* username_field,
+                 const char* username_value,
+                 const char* password_field,
+                 const char* password_value,
+                 password_manager::FillData* fill_data);
 
-}  // namespace  test_helpers
+}  // namespace test_helpers
 
 #endif  // COMPONENTS_PASSWORD_MANAGER_IOS_TEST_HELPERS_H_

ios/chrome/browser/passwords/password_controller_unittest.mm

@@ -727,10 +727,10 @@ TEST_F(PasswordControllerTest, FillPasswordForm) {
     ExecuteJavaScript(kClearInputFieldsScript);
 
     PasswordFormFillData form_data;
-    SetPasswordFormFillData(form_data, data.origin, data.action,
-                            data.username_field, data.username_value,
-                            data.password_field, data.password_value, nullptr,
-                            nullptr, false);
+    SetPasswordFormFillData(data.origin, data.action, data.username_field,
+                            data.username_value, data.password_field,
+                            data.password_value, nullptr, nullptr, false,
+                            &form_data);
 
     __block BOOL block_was_called = NO;
     [passwordController_ fillPasswordForm:form_data
@@ -810,8 +810,8 @@ BOOL PasswordControllerTest::BasicFormFill(NSString* html) {
   LoadHtml(html);
   const std::string base_url = BaseUrl();
   PasswordFormFillData form_data;
-  SetPasswordFormFillData(form_data, base_url, base_url, "un0", "test_user",
-                          "pw0", "test_password", nullptr, nullptr, false);
+  SetPasswordFormFillData(base_url, base_url, "un0", "test_user", "pw0",
+                          "test_password", nullptr, nullptr, false, &form_data);
   __block BOOL block_was_called = NO;
   __block BOOL return_value = NO;
   [passwordController_ fillPasswordForm:form_data
@@ -938,8 +938,8 @@ TEST_F(PasswordControllerTest, SuggestionUpdateTests) {
   // we can test with an initially-empty username field. Testing with a
   // username field that contains input is performed by a specific test below.
   PasswordFormFillData form_data;
-  SetPasswordFormFillData(form_data, base_url, base_url, "un", "user0", "pw",
-                          "password0", "abc", "def", true);
+  SetPasswordFormFillData(base_url, base_url, "un", "user0", "pw", "password0",
+                          "abc", "def", true, &form_data);
   form_data.name = base::ASCIIToUTF16(FormName(0));
 
   __block BOOL block_was_called = NO;
@@ -1035,9 +1035,9 @@ TEST_F(PasswordControllerTest, SelectingSuggestionShouldFillPasswordForm) {
     const auto& test_data = kTestData[form_i];
 
     PasswordFormFillData form_data;
-    SetPasswordFormFillData(
-        form_data, base_url, base_url, test_data.username_element, "user0",
-        test_data.password_element, "password0", "abc", "def", true);
+    SetPasswordFormFillData(base_url, base_url, test_data.username_element,
+                            "user0", test_data.password_element, "password0",
+                            "abc", "def", true, &form_data);
     form_data.name = base::ASCIIToUTF16(test_data.form_name);
 
     __block BOOL block_was_called = NO;