Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(875)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc

Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/live_sync/two_client_extensions_sync_test.cc ('k') | chrome/browser/sync/test/live_sync/two_client_preferences_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc
diff --git a/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc
deleted file mode 100644
index fd39c854b4364582f844a2434d81599015a610bc..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc
+++ /dev/null
@@ -1,323 +0,0 @@
-// 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 "base/utf_string_conversions.h"
-#include "chrome/browser/sync/engine/model_safe_worker.h"
-#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/sessions/session_state.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-#include "chrome/browser/sync/test/live_sync/passwords_helper.h"
-
-using passwords_helper::AddLogin;
-using passwords_helper::AllProfilesContainSamePasswordForms;
-using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier;
-using passwords_helper::CreateTestPasswordForm;
-using passwords_helper::GetPasswordCount;
-using passwords_helper::GetPasswordStore;
-using passwords_helper::GetVerifierPasswordCount;
-using passwords_helper::GetVerifierPasswordStore;
-using passwords_helper::ProfileContainsSamePasswordFormsAsVerifier;
-using passwords_helper::RemoveLogin;
-using passwords_helper::RemoveLogins;
-using passwords_helper::SetPassphrase;
-using passwords_helper::UpdateLogin;
-
-using webkit_glue::PasswordForm;
-
-static const char* kValidPassphrase = "passphrase!";
-
-class TwoClientPasswordsSyncTest : public LiveSyncTest {
- public:
- TwoClientPasswordsSyncTest() : LiveSyncTest(TWO_CLIENT) {}
- virtual ~TwoClientPasswordsSyncTest() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientPasswordsSyncTest);
-};
-
-// TCM ID - 3732277
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_Add) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, Add) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-
- PasswordForm form = CreateTestPasswordForm(0);
- AddLogin(GetVerifierPasswordStore(), form);
- ASSERT_EQ(1, GetVerifierPasswordCount());
- AddLogin(GetPasswordStore(0), form);
- ASSERT_EQ(1, GetPasswordCount(0));
-
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-}
-
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_Race) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, Race) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllProfilesContainSamePasswordForms());
-
- PasswordForm form0 = CreateTestPasswordForm(0);
- AddLogin(GetPasswordStore(0), form0);
-
- PasswordForm form1 = form0;
- form1.password_value = ASCIIToUTF16("password1");
- AddLogin(GetPasswordStore(1), form1);
-
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllProfilesContainSamePasswordForms());
-}
-
-// TCM ID - 4577932.
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_DisablePasswords) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DisablePasswords) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-
- ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::PASSWORDS));
- PasswordForm form = CreateTestPasswordForm(0);
- AddLogin(GetVerifierPasswordStore(), form);
- ASSERT_EQ(1, GetVerifierPasswordCount());
- AddLogin(GetPasswordStore(0), form);
- ASSERT_EQ(1, GetPasswordCount(0));
-
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(ProfileContainsSamePasswordFormsAsVerifier(0));
- ASSERT_FALSE(ProfileContainsSamePasswordFormsAsVerifier(1));
-
- ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::PASSWORDS));
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
- ASSERT_EQ(1, GetPasswordCount(1));
-}
-
-// TCM ID - 4649281.
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_DisableSync) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DisableSync) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-
- ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
- PasswordForm form = CreateTestPasswordForm(0);
- AddLogin(GetVerifierPasswordStore(), form);
- ASSERT_EQ(1, GetVerifierPasswordCount());
- AddLogin(GetPasswordStore(0), form);
- ASSERT_EQ(1, GetPasswordCount(0));
-
- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Added a password."));
- ASSERT_TRUE(ProfileContainsSamePasswordFormsAsVerifier(0));
- ASSERT_FALSE(ProfileContainsSamePasswordFormsAsVerifier(1));
-
- ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
- ASSERT_EQ(1, GetPasswordCount(1));
-}
-
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_SetPassphrase) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, SetPassphrase) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- SetPassphrase(0, kValidPassphrase);
- ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- SetPassphrase(1, kValidPassphrase);
- ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
- ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase."));
-}
-
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
- DISABLED_SetPassphraseAndAddPassword) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
- SetPassphraseAndAddPassword) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- SetPassphrase(0, kValidPassphrase);
- ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- SetPassphrase(1, kValidPassphrase);
- ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
-
- PasswordForm form = CreateTestPasswordForm(0);
- AddLogin(GetPasswordStore(0), form);
- ASSERT_EQ(1, GetPasswordCount(0));
-
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_EQ(1, GetPasswordCount(1));
-}
-
-// TCM ID - 4603879
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_Update) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, Update) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-
- PasswordForm form = CreateTestPasswordForm(0);
- AddLogin(GetVerifierPasswordStore(), form);
- AddLogin(GetPasswordStore(0), form);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- form.password_value = ASCIIToUTF16("updated");
- UpdateLogin(GetVerifierPasswordStore(), form);
- UpdateLogin(GetPasswordStore(1), form);
- ASSERT_TRUE(AwaitQuiescence());
-
- ASSERT_EQ(1, GetVerifierPasswordCount());
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-}
-
-// TCM ID - 3719309
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_Delete) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, Delete) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-
- PasswordForm form0 = CreateTestPasswordForm(0);
- AddLogin(GetVerifierPasswordStore(), form0);
- AddLogin(GetPasswordStore(0), form0);
- PasswordForm form1 = CreateTestPasswordForm(1);
- AddLogin(GetVerifierPasswordStore(), form1);
- AddLogin(GetPasswordStore(0), form1);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- RemoveLogin(GetPasswordStore(1), form0);
- RemoveLogin(GetVerifierPasswordStore(), form0);
- ASSERT_TRUE(AwaitQuiescence());
-
- ASSERT_EQ(1, GetVerifierPasswordCount());
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-}
-
-// TCM ID - 7573511
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_DeleteAll) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DeleteAll) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-
- PasswordForm form0 = CreateTestPasswordForm(0);
- AddLogin(GetVerifierPasswordStore(), form0);
- AddLogin(GetPasswordStore(0), form0);
- PasswordForm form1 = CreateTestPasswordForm(1);
- AddLogin(GetVerifierPasswordStore(), form1);
- AddLogin(GetPasswordStore(0), form1);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- RemoveLogins(GetPasswordStore(1));
- RemoveLogins(GetVerifierPasswordStore());
- ASSERT_TRUE(AwaitQuiescence());
-
- ASSERT_EQ(0, GetVerifierPasswordCount());
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-}
-
-// TCM ID - 3694311
-// http://crbug.com/90460
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DISABLED_Merge) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-
- PasswordForm form0 = CreateTestPasswordForm(0);
- AddLogin(GetVerifierPasswordStore(), form0);
- AddLogin(GetPasswordStore(0), form0);
- PasswordForm form1 = CreateTestPasswordForm(1);
- AddLogin(GetVerifierPasswordStore(), form1);
- AddLogin(GetPasswordStore(0), form1);
- AddLogin(GetPasswordStore(1), form1);
- PasswordForm form2 = CreateTestPasswordForm(2);
- AddLogin(GetVerifierPasswordStore(), form2);
- AddLogin(GetPasswordStore(1), form2);
- ASSERT_TRUE(AwaitQuiescence());
-
- ASSERT_EQ(3, GetVerifierPasswordCount());
- ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
-}
-
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
- DISABLED_SetPassphraseAndThenSetupSync) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
- SetPassphraseAndThenSetupSync) {
-#endif
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
-
- ASSERT_TRUE(GetClient(0)->SetupSync());
- SetPassphrase(0, kValidPassphrase);
- ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Initial sync."));
-
- ASSERT_FALSE(GetClient(1)->SetupSync());
- SetPassphrase(1, kValidPassphrase);
- ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
- ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Initial sync."));
-
- // Following ensures types are enabled and active (see bug 87572).
- browser_sync::ModelSafeRoutingInfo routes;
- GetClient(0)->service()->GetModelSafeRoutingInfo(&routes);
- ASSERT_EQ(browser_sync::GROUP_PASSWORD, routes[syncable::PASSWORDS]);
- routes.clear();
- GetClient(1)->service()->GetModelSafeRoutingInfo(&routes);
- ASSERT_EQ(browser_sync::GROUP_PASSWORD, routes[syncable::PASSWORDS]);
-}
-
-// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
- DISABLED_SetPassphraseTwice) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
- SetPassphraseTwice) {
-#endif
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- SetPassphrase(0, kValidPassphrase);
- ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- SetPassphrase(1, kValidPassphrase);
- ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
- ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase."));
-
- SetPassphrase(1, kValidPassphrase);
- ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());
- ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase again."));
-}
« no previous file with comments | « chrome/browser/sync/test/live_sync/two_client_extensions_sync_test.cc ('k') | chrome/browser/sync/test/live_sync/two_client_preferences_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698