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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/sync_manager_impl_unittest.cc

Issue 10824410: [Sync] Refactor passphrase state handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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 | « sync/internal_api/sync_manager_impl.cc ('k') | sync/protocol/client_debug_info.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager_impl_unittest.cc
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index 36e3da1ff6d6df26775e22f36af7feac45060b6e..b64ecc3916354497b85cbbc48a4f59a91939310b 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -698,6 +698,7 @@ class SyncEncryptionHandlerObserverMock
void(ModelTypeSet, bool)); // NOLINT
MOCK_METHOD0(OnEncryptionComplete, void()); // NOLINT
MOCK_METHOD1(OnCryptographerStateChanged, void(Cryptographer*)); // NOLINT
+ MOCK_METHOD1(OnPassphraseStateChanged, void(PassphraseState)); // NOLINT
};
} // namespace
@@ -1504,6 +1505,8 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
EXPECT_CALL(encryption_observer_, OnPassphraseAccepted());
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_,
+ OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase", true);
EXPECT_TRUE(EncryptEverythingEnabledForTest());
@@ -1544,8 +1547,8 @@ TEST_F(SyncManagerTest, SetInitialGaiaPass) {
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
false);
- EXPECT_FALSE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(IMPLICIT_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1578,8 +1581,8 @@ TEST_F(SyncManagerTest, UpdateGaiaPass) {
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
false);
- EXPECT_FALSE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(IMPLICIT_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1622,11 +1625,13 @@ TEST_F(SyncManagerTest, SetPassphraseWithPassword) {
EXPECT_CALL(encryption_observer_, OnPassphraseAccepted());
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_,
+ OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
true);
- EXPECT_TRUE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(CUSTOM_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1678,8 +1683,8 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPass) {
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
sync_manager_.GetEncryptionHandler()->SetDecryptionPassphrase("passphrase2");
- EXPECT_FALSE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(IMPLICIT_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1734,8 +1739,8 @@ TEST_F(SyncManagerTest, SupplyPendingOldGAIAPass) {
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_gaia",
false);
- EXPECT_FALSE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(IMPLICIT_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
testing::Mock::VerifyAndClearExpectations(&encryption_observer_);
{
@@ -1756,8 +1761,8 @@ TEST_F(SyncManagerTest, SupplyPendingOldGAIAPass) {
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"old_gaia",
false);
- EXPECT_FALSE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(IMPLICIT_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
Cryptographer* cryptographer = trans.GetCryptographer();
@@ -1806,9 +1811,11 @@ TEST_F(SyncManagerTest, SupplyPendingExplicitPass) {
EXPECT_CALL(encryption_observer_, OnPassphraseAccepted());
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_,
+ OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetDecryptionPassphrase("explicit");
- EXPECT_TRUE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(CUSTOM_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1850,8 +1857,8 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPassUserProvided) {
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"passphrase",
false);
- EXPECT_FALSE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(IMPLICIT_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -1879,11 +1886,13 @@ TEST_F(SyncManagerTest, SetPassphraseWithEmptyPasswordNode) {
EXPECT_CALL(encryption_observer_, OnPassphraseAccepted());
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_,
+ OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
true);
- EXPECT_TRUE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(CUSTOM_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_FALSE(EncryptEverythingEnabledForTest());
{
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
@@ -2103,6 +2112,8 @@ TEST_F(SyncManagerTest, UpdateEntryWithEncryption) {
EXPECT_CALL(encryption_observer_, OnPassphraseAccepted());
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_,
+ OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
true);
@@ -2299,11 +2310,13 @@ TEST_F(SyncManagerTest, UpdatePasswordNewPassphrase) {
EXPECT_CALL(encryption_observer_, OnPassphraseAccepted());
EXPECT_CALL(encryption_observer_, OnEncryptionComplete());
EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_));
+ EXPECT_CALL(encryption_observer_,
+ OnPassphraseStateChanged(CUSTOM_PASSPHRASE));
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(
"new_passphrase",
true);
- EXPECT_TRUE(
- sync_manager_.GetEncryptionHandler()->IsUsingExplicitPassphrase());
+ EXPECT_EQ(CUSTOM_PASSPHRASE,
+ sync_manager_.GetEncryptionHandler()->GetPassphraseState());
EXPECT_TRUE(ResetUnsyncedEntry(PASSWORDS, client_tag));
}
« no previous file with comments | « sync/internal_api/sync_manager_impl.cc ('k') | sync/protocol/client_debug_info.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698