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

Side by Side Diff: sync/internal_api/public/change_record_unittest.cc

Issue 17034006: Add base namespace to more values in sync and elsewhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "sync/internal_api/public/change_record.h" 5 #include "sync/internal_api/public/change_record.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/test/values_test_util.h" 9 #include "base/test/values_test_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 if (record.action == ChangeRecord::ACTION_DELETE) { 53 if (record.action == ChangeRecord::ACTION_DELETE) {
54 scoped_ptr<base::DictionaryValue> expected_extra_value; 54 scoped_ptr<base::DictionaryValue> expected_extra_value;
55 if (record.extra.get()) { 55 if (record.extra.get()) {
56 expected_extra_value.reset(record.extra->ToValue()); 56 expected_extra_value.reset(record.extra->ToValue());
57 } 57 }
58 const base::Value* extra_value = NULL; 58 const base::Value* extra_value = NULL;
59 EXPECT_EQ(record.extra.get() != NULL, 59 EXPECT_EQ(record.extra.get() != NULL,
60 value.Get("extra", &extra_value)); 60 value.Get("extra", &extra_value));
61 EXPECT_TRUE(Value::Equals(extra_value, expected_extra_value.get())); 61 EXPECT_TRUE(Value::Equals(extra_value, expected_extra_value.get()));
62 62
63 scoped_ptr<DictionaryValue> expected_specifics_value( 63 scoped_ptr<base::DictionaryValue> expected_specifics_value(
64 EntitySpecificsToValue(record.specifics)); 64 EntitySpecificsToValue(record.specifics));
65 ExpectDictDictionaryValue(*expected_specifics_value, 65 ExpectDictDictionaryValue(*expected_specifics_value,
66 value, "specifics"); 66 value, "specifics");
67 } 67 }
68 } 68 }
69 69
70 class MockExtraChangeRecordData 70 class MockExtraChangeRecordData
71 : public ExtraPasswordChangeRecordData { 71 : public ExtraPasswordChangeRecordData {
72 public: 72 public:
73 MOCK_CONST_METHOD0(ToValue, DictionaryValue*()); 73 MOCK_CONST_METHOD0(ToValue, base::DictionaryValue*());
74 }; 74 };
75 75
76 TEST_F(ChangeRecordTest, ChangeRecordToValue) { 76 TEST_F(ChangeRecordTest, ChangeRecordToValue) {
77 sync_pb::EntitySpecifics old_specifics; 77 sync_pb::EntitySpecifics old_specifics;
78 old_specifics.mutable_extension()->set_id("old"); 78 old_specifics.mutable_extension()->set_id("old");
79 sync_pb::EntitySpecifics new_specifics; 79 sync_pb::EntitySpecifics new_specifics;
80 old_specifics.mutable_extension()->set_id("new"); 80 old_specifics.mutable_extension()->set_id("new");
81 81
82 const int64 kTestId = 5; 82 const int64 kTestId = 5;
83 83
84 // Add 84 // Add
85 { 85 {
86 ChangeRecord record; 86 ChangeRecord record;
87 record.action = ChangeRecord::ACTION_ADD; 87 record.action = ChangeRecord::ACTION_ADD;
88 record.id = kTestId; 88 record.id = kTestId;
89 record.specifics = old_specifics; 89 record.specifics = old_specifics;
90 record.extra.reset(new StrictMock<MockExtraChangeRecordData>()); 90 record.extra.reset(new StrictMock<MockExtraChangeRecordData>());
91 scoped_ptr<DictionaryValue> value(record.ToValue()); 91 scoped_ptr<base::DictionaryValue> value(record.ToValue());
92 CheckChangeRecordValue(record, *value); 92 CheckChangeRecordValue(record, *value);
93 } 93 }
94 94
95 // Update 95 // Update
96 { 96 {
97 ChangeRecord record; 97 ChangeRecord record;
98 record.action = ChangeRecord::ACTION_UPDATE; 98 record.action = ChangeRecord::ACTION_UPDATE;
99 record.id = kTestId; 99 record.id = kTestId;
100 record.specifics = old_specifics; 100 record.specifics = old_specifics;
101 record.extra.reset(new StrictMock<MockExtraChangeRecordData>()); 101 record.extra.reset(new StrictMock<MockExtraChangeRecordData>());
102 scoped_ptr<DictionaryValue> value(record.ToValue()); 102 scoped_ptr<base::DictionaryValue> value(record.ToValue());
103 CheckChangeRecordValue(record, *value); 103 CheckChangeRecordValue(record, *value);
104 } 104 }
105 105
106 // Delete (no extra) 106 // Delete (no extra)
107 { 107 {
108 ChangeRecord record; 108 ChangeRecord record;
109 record.action = ChangeRecord::ACTION_DELETE; 109 record.action = ChangeRecord::ACTION_DELETE;
110 record.id = kTestId; 110 record.id = kTestId;
111 record.specifics = old_specifics; 111 record.specifics = old_specifics;
112 scoped_ptr<DictionaryValue> value(record.ToValue()); 112 scoped_ptr<base::DictionaryValue> value(record.ToValue());
113 CheckChangeRecordValue(record, *value); 113 CheckChangeRecordValue(record, *value);
114 } 114 }
115 115
116 // Delete (with extra) 116 // Delete (with extra)
117 { 117 {
118 ChangeRecord record; 118 ChangeRecord record;
119 record.action = ChangeRecord::ACTION_DELETE; 119 record.action = ChangeRecord::ACTION_DELETE;
120 record.id = kTestId; 120 record.id = kTestId;
121 record.specifics = old_specifics; 121 record.specifics = old_specifics;
122 122
123 DictionaryValue extra_value; 123 base::DictionaryValue extra_value;
124 extra_value.SetString("foo", "bar"); 124 extra_value.SetString("foo", "bar");
125 scoped_ptr<StrictMock<MockExtraChangeRecordData> > extra( 125 scoped_ptr<StrictMock<MockExtraChangeRecordData> > extra(
126 new StrictMock<MockExtraChangeRecordData>()); 126 new StrictMock<MockExtraChangeRecordData>());
127 EXPECT_CALL(*extra, ToValue()).Times(2).WillRepeatedly( 127 EXPECT_CALL(*extra, ToValue()).Times(2).WillRepeatedly(
128 Invoke(&extra_value, &DictionaryValue::DeepCopy)); 128 Invoke(&extra_value, &base::DictionaryValue::DeepCopy));
129 129
130 record.extra.reset(extra.release()); 130 record.extra.reset(extra.release());
131 scoped_ptr<DictionaryValue> value(record.ToValue()); 131 scoped_ptr<base::DictionaryValue> value(record.ToValue());
132 CheckChangeRecordValue(record, *value); 132 CheckChangeRecordValue(record, *value);
133 } 133 }
134 } 134 }
135 135
136 } // namespace 136 } // namespace
137 } // namespace syncer 137 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/internal_api/public/base/progress_marker_map.cc ('k') | sync/internal_api/public/engine/model_safe_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698