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

Unified Diff: components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc

Issue 2660673002: [Sync] Not having an autocomplete ModelTypeState is valid. (Closed)
Patch Set: Update AutocompleteSyncBridge unittests to not rely on initial metadata. Created 3 years, 11 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
Index: components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc
diff --git a/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc
index 104f055959f496e368e3fd1fb73d105f2a475a2f..a4334eaa230e8d7e0dfcd8307a93224ab8f03d14 100644
--- a/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc
+++ b/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc
@@ -34,7 +34,9 @@ using base::ScopedTempDir;
using base::Time;
using base::TimeDelta;
using sync_pb::AutofillSpecifics;
+using sync_pb::EntityMetadata;
using sync_pb::EntitySpecifics;
+using sync_pb::ModelTypeState;
using syncer::DataBatch;
using syncer::EntityChange;
using syncer::EntityChangeList;
@@ -132,20 +134,18 @@ class AutocompleteSyncBridgeTest : public testing::Test {
db_.AddTable(&table_);
db_.Init(temp_dir_.GetPath().AppendASCII("SyncTestWebDatabase"));
backend_.SetWebDatabase(&db_);
-
- sync_pb::ModelTypeState model_type_state;
- model_type_state.set_initial_sync_done(true);
- table_.UpdateModelTypeState(syncer::AUTOFILL, model_type_state);
-
- bridge_.reset(new AutocompleteSyncBridge(
- &backend_,
- base::Bind(
- &AutocompleteSyncBridgeTest::CreateModelTypeChangeProcessor,
- base::Unretained(this))));
+ ResetBridge();
}
}
~AutocompleteSyncBridgeTest() override {}
+ void ResetBridge() {
+ bridge_.reset(new AutocompleteSyncBridge(
+ &backend_,
+ base::Bind(&AutocompleteSyncBridgeTest::CreateModelTypeChangeProcessor,
+ base::Unretained(this))));
+ }
+
void SaveSpecificsToTable(
const std::vector<AutofillSpecifics>& specifics_list) {
std::vector<AutofillEntry> new_entries;
@@ -582,8 +582,23 @@ TEST_F(AutocompleteSyncBridgeTest, LocalEntryDeleted) {
}
TEST_F(AutocompleteSyncBridgeTest, LoadMetadataCalled) {
- EXPECT_NE(processor()->metadata(), nullptr);
+ EXPECT_NE(nullptr, processor()->metadata());
+ EXPECT_FALSE(
+ processor()->metadata()->GetModelTypeState().initial_sync_done());
+ EXPECT_EQ(0u, processor()->metadata()->TakeAllMetadata().size());
+
+ ModelTypeState model_type_state;
+ model_type_state.set_initial_sync_done(true);
+ EXPECT_TRUE(
+ table()->UpdateModelTypeState(syncer::AUTOFILL, model_type_state));
+ EXPECT_TRUE(
+ table()->UpdateSyncMetadata(syncer::AUTOFILL, "key", EntityMetadata()));
+
+ ResetBridge();
+
+ EXPECT_NE(nullptr, processor()->metadata());
EXPECT_TRUE(processor()->metadata()->GetModelTypeState().initial_sync_done());
+ EXPECT_EQ(1u, processor()->metadata()->TakeAllMetadata().size());
}
TEST_F(AutocompleteSyncBridgeTest, MergeSyncDataEmpty) {

Powered by Google App Engine
This is Rietveld 408576698