Password Login Database: report correct changes from AddLogin().

chrome/browser/password_manager/native_backend_gnome_x_unittest.cc

 // Copyright (c) 2012 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 <stdarg.h>
 
 #include "base/basictypes.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/psl_matching_helper.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using autofill::PasswordForm;
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 using content::BrowserThread;
+using password_manager::PasswordStoreChange;
+using password_manager::PasswordStoreChangeList;
 
 namespace {
 
 // What follows is a very simple implementation of the subset of the GNOME
 // Keyring API that we actually use. It gets substituted for the real one by
 // MockGnomeKeyringLoader, which hooks into the facility normally used to load
 // the GNOME Keyring library at runtime to avoid a static dependency on it.
 
 struct MockKeyringItem {
   MockKeyringItem() {}
@@ skipping 235 matching lines @@
     GNOME_KEYRING_FOR_EACH_MOCKED_FUNC(GNOME_KEYRING_ASSIGN_POINTER)
 #undef GNOME_KEYRING_ASSIGN_POINTER
     keyring_loaded = true;
     // Reset the state of the mock library.
     mock_keyring_items.clear();
     mock_keyring_reject_local_ids = false;
     return true;
   }
 };
 
+void CheckPasswordChanges(const PasswordStoreChangeList& expected_list,
+                          const PasswordStoreChangeList& actual_list) {
+  ASSERT_EQ(expected_list.size(), actual_list.size());
+  for (size_t i = 0; i < expected_list.size(); ++i) {
+    EXPECT_EQ(expected_list[i].type(), actual_list[i].type());
+    const PasswordForm& expected = expected_list[i].form();
+    const PasswordForm& actual = actual_list[i].form();
+
+    EXPECT_EQ(expected.origin, actual.origin);
+    EXPECT_EQ(expected.password_value, actual.password_value);
+    EXPECT_EQ(expected.action, actual.action);
+    EXPECT_EQ(expected.username_element, actual.username_element);
+    EXPECT_EQ(expected.username_value, actual.username_value);
+    EXPECT_EQ(expected.password_element, actual.password_element);
+    EXPECT_EQ(expected.submit_element, actual.submit_element);
+    EXPECT_EQ(expected.signon_realm, actual.signon_realm);
+    EXPECT_EQ(expected.ssl_valid, actual.ssl_valid);
+    EXPECT_EQ(expected.preferred, actual.preferred);
+    // We don't check the date created. It varies due to bug in the
+    // serialization. Integer seconds are saved instead of microseconds.
+    EXPECT_EQ(expected.blacklisted_by_user, actual.blacklisted_by_user);
+    EXPECT_EQ(expected.type, actual.type);
+    EXPECT_EQ(expected.times_used, actual.times_used);
+    EXPECT_EQ(expected.scheme, actual.scheme);
+  }
+}
+
 }  // anonymous namespace
 
 class NativeBackendGnomeTest : public testing::Test {
  protected:
   enum UpdateType {  // Used in CheckPSLUpdate().
     UPDATE_BY_UPDATELOGIN,
     UPDATE_BY_ADDLOGIN,
   };
 
   NativeBackendGnomeTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {
   }
 
   virtual void SetUp() {
     ASSERT_TRUE(db_thread_.Start());
 
     ASSERT_TRUE(MockGnomeKeyringLoader::LoadMockGnomeKeyring());
 
     form_google_.origin = GURL("http://www.google.com/");
     form_google_.action = GURL("http://www.google.com/login");
     form_google_.username_element = UTF8ToUTF16("user");
     form_google_.username_value = UTF8ToUTF16("joeschmoe");
     form_google_.password_element = UTF8ToUTF16("pass");
     form_google_.password_value = UTF8ToUTF16("seekrit");
     form_google_.submit_element = UTF8ToUTF16("submit");
     form_google_.signon_realm = "http://www.google.com/";
     form_google_.type = PasswordForm::TYPE_GENERATED;
+    form_google_.date_created = base::Time::Now();
 
     form_facebook_.origin = GURL("http://www.facebook.com/");
     form_facebook_.action = GURL("http://www.facebook.com/login");
     form_facebook_.username_element = UTF8ToUTF16("user");
     form_facebook_.username_value = UTF8ToUTF16("a");
     form_facebook_.password_element = UTF8ToUTF16("password");
     form_facebook_.password_value = UTF8ToUTF16("b");
     form_facebook_.submit_element = UTF8ToUTF16("submit");
     form_facebook_.signon_realm = "http://www.facebook.com/";
+    form_facebook_.date_created = base::Time::Now();
 
     form_isc_.origin = GURL("http://www.isc.org/");
     form_isc_.action = GURL("http://www.isc.org/auth");
     form_isc_.username_element = UTF8ToUTF16("id");
     form_isc_.username_value = UTF8ToUTF16("janedoe");
     form_isc_.password_element = UTF8ToUTF16("passwd");
     form_isc_.password_value = UTF8ToUTF16("ihazabukkit");
     form_isc_.submit_element = UTF8ToUTF16("login");
     form_isc_.signon_realm = "http://www.isc.org/";
+    form_isc_.date_created = base::Time::Now();
 
     other_auth_.origin = GURL("http://www.example.com/");
     other_auth_.username_value = UTF8ToUTF16("username");
     other_auth_.password_value = UTF8ToUTF16("pass");
     other_auth_.signon_realm = "http://www.example.com/Realm";
+    other_auth_.date_created = base::Time::Now();
   }
 
   virtual void TearDown() {
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
     base::MessageLoop::current()->Run();
     db_thread_.Stop();
   }
 
   void RunBothThreads() {
@@ skipping 453 matching lines @@
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, AddDuplicateLogin) {
   NativeBackendGnome backend(42);
   backend.Init();
 
-  BrowserThread::PostTask(
+  PasswordStoreChangeList changes;
+  changes.push_back(PasswordStoreChange(PasswordStoreChange::ADD,
+                                        form_google_));
+  BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::DB, FROM_HERE,
-      base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin),
-                 base::Unretained(&backend), form_google_));
-  BrowserThread::PostTask(
+      base::Bind(&NativeBackendGnome::AddLogin,
+                 base::Unretained(&backend), form_google_),
+      base::Bind(&CheckPasswordChanges, changes));
+
+  changes.clear();
+  changes.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE,
+                                        form_google_));
+  form_google_.times_used++;
+  changes.push_back(PasswordStoreChange(PasswordStoreChange::ADD,
+                                        form_google_));
+
+  BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::DB, FROM_HERE,
-      base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin),
-                 base::Unretained(&backend), form_google_));
+      base::Bind(&NativeBackendGnome::AddLogin,
+                 base::Unretained(&backend), form_google_),
+      base::Bind(&CheckPasswordChanges, changes));
 
   RunBothThreads();
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, ListLoginsAppends) {
   NativeBackendGnome backend(42);
@@ skipping 22 matching lines @@
   // Quick check that we got two results back.
   EXPECT_EQ(2u, form_list.size());
   STLDeleteElements(&form_list);
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 // TODO(mdm): add more basic tests here at some point.