chrome/browser/sync/engine/nigori_util_unittest.cc - Issue 7795002: [Sync] Gracefully handle writing to a node when the cryptographer is not ready.

Side by Side Diff: chrome/browser/sync/engine/nigori_util_unittest.cc

Issue 7795002: [Sync] Gracefully handle writing to a node when the cryptographer is not ready. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reviewer comments 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

	5 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"

5 #include "chrome/browser/sync/util/cryptographer.h"	6 #include "chrome/browser/sync/util/cryptographer.h"

6 #include "chrome/browser/sync/engine/nigori_util.h"	7 #include "chrome/browser/sync/engine/nigori_util.h"

7 #include "testing/gtest/include/gtest/gtest.h"	8 #include "testing/gtest/include/gtest/gtest.h"

8	9

9 namespace syncable {	10 namespace syncable {

10	11

11 typedef testing::Test NigoriUtilTest;	12 typedef testing::Test NigoriUtilTest;

12	13

13 TEST_F(NigoriUtilTest, NigoriEncryptionTypes) {	14 TEST_F(NigoriUtilTest, NigoriEncryptionTypes) {

14 browser_sync::Cryptographer cryptographer;	15 browser_sync::Cryptographer cryptographer;

(...skipping 15 matching lines...) Expand all Loading...
30 EXPECT_EQ(encrypted_types, test_types);	31 EXPECT_EQ(encrypted_types, test_types);

31	32

32 encrypted_types.erase(syncable::BOOKMARKS);	33 encrypted_types.erase(syncable::BOOKMARKS);

33 encrypted_types.erase(syncable::SESSIONS);	34 encrypted_types.erase(syncable::SESSIONS);

34 FillNigoriEncryptedTypes(encrypted_types, &nigori);	35 FillNigoriEncryptedTypes(encrypted_types, &nigori);

35 cryptographer.SetEncryptedTypes(nigori);	36 cryptographer.SetEncryptedTypes(nigori);

36 test_types = cryptographer.GetEncryptedTypes();	37 test_types = cryptographer.GetEncryptedTypes();

37 EXPECT_EQ(encrypted_types, test_types);	38 EXPECT_EQ(encrypted_types, test_types);

38 }	39 }

39	40

	41 TEST(NigoriUtilTest, SpecificsNeedsEncryption) {

	42 ModelTypeSet encrypted_types;

	43 encrypted_types.insert(BOOKMARKS);

	44 encrypted_types.insert(PASSWORDS);

	45

	46 sync_pb::EntitySpecifics specifics;

	47 EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), specifics));

	48 EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, specifics));

	49

	50 AddDefaultExtensionValue(PREFERENCES, &specifics);

	51 EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, specifics));

	52

	53 sync_pb::EntitySpecifics bookmark_specifics;

	54 AddDefaultExtensionValue(BOOKMARKS, &bookmark_specifics);

	55 EXPECT_TRUE(SpecificsNeedsEncryption(encrypted_types, bookmark_specifics));

	56

	57 bookmark_specifics.MutableExtension(sync_pb::bookmark)->set_title("title");

	58 bookmark_specifics.MutableExtension(sync_pb::bookmark)->set_url("url");

	59 EXPECT_TRUE(SpecificsNeedsEncryption(encrypted_types, bookmark_specifics));

	60 EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), bookmark_specifics));

	61

	62 bookmark_specifics.mutable_encrypted();

	63 EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, bookmark_specifics));

	64 EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), bookmark_specifics));

	65

	66 sync_pb::EntitySpecifics password_specifics;

	67 AddDefaultExtensionValue(PASSWORDS, &password_specifics);

	68 EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, password_specifics));

	69 }

	70

40 // ProcessUnsyncedChangesForEncryption and other methods that rely on the syncer	71 // ProcessUnsyncedChangesForEncryption and other methods that rely on the syncer

41 // are tested in apply_updates_command_unittest.cc	72 // are tested in apply_updates_command_unittest.cc

42	73

43 } // namespace syncable	74 } // namespace syncable

OLD	NEW

« no previous file with comments | « chrome/browser/sync/engine/nigori_util.cc ('k') | chrome/browser/sync/engine/syncer_unittest.cc » ('j') | no next file with comments »