Implement ProtoDatabase::GetEntry

components/leveldb_proto/proto_database_impl_unittest.cc

Index: components/leveldb_proto/proto_database_impl_unittest.cc
diff --git a/components/leveldb_proto/proto_database_impl_unittest.cc b/components/leveldb_proto/proto_database_impl_unittest.cc
index 79fa13172506463ac73c81aefea9e8c8e1e736c8..5245ec98c34813d319c012580bf918754d314781 100644
--- a/components/leveldb_proto/proto_database_impl_unittest.cc
+++ b/components/leveldb_proto/proto_database_impl_unittest.cc
@@ -42,12 +42,9 @@ class MockDB : public LevelDB {
   MOCK_METHOD1(Init, bool(const base::FilePath&));
   MOCK_METHOD2(Save, bool(const KeyValueVector&, const KeyVector&));
   MOCK_METHOD1(Load, bool(std::vector<std::string>*));
+  MOCK_METHOD2(Get, bool(const std::string&, std::string*));
 
-  MockDB() : LevelDB(kTestLevelDBClientName) {
-    ON_CALL(*this, Init(_)).WillByDefault(Return(true));
-    ON_CALL(*this, Save(_, _)).WillByDefault(Return(true));
-    ON_CALL(*this, Load(_)).WillByDefault(Return(true));

[Marc Treib, 2016/06/15 12:35:59]

All these default actions weren't actually needed - all tests still pass,
without any "uninteresting mock function call" warnings. And IMO these have the
potential of hiding problems, so I think it's best to just remove them. WDYT?

-  }
+  MockDB() : LevelDB(kTestLevelDBClientName) {}
 };
 
 class MockDatabaseCaller {
@@ -60,6 +57,11 @@ class MockDatabaseCaller {
     LoadCallback1(success, entries.get());
   }
   MOCK_METHOD2(LoadCallback1, void(bool, std::vector<TestProto>*));
+  void GetCallback(bool success,
+                   std::unique_ptr<TestProto> entry) {
+    GetCallback1(success, entry.get());
+  }
+  MOCK_METHOD2(GetCallback1, void(bool, TestProto*));
 };
 
 }  // namespace
@@ -202,6 +204,70 @@ TEST_F(ProtoDatabaseImplTest, TestDBLoadFailure) {
   base::RunLoop().RunUntilIdle();
 }
 
+ACTION_P(SetGetEntry, model) {
+  const std::string& key = arg0;
+  std::string* output = arg1;
+  auto it = model.find(key);
+  if (it == model.end())
+    return false;
+  *output = it->second.SerializeAsString();
+  return true;
+}
+
+ACTION_P(VerifyGetEntry, expected) {
+  TestProto* actual = arg1;
+  EXPECT_EQ(expected.SerializeAsString(), actual->SerializeAsString());
+}
+
+TEST_F(ProtoDatabaseImplTest, TestDBGetSuccess) {
+  base::FilePath path(FILE_PATH_LITERAL("/fake/path"));
+
+  MockDB* mock_db = new MockDB();
+  MockDatabaseCaller caller;
+  EntryMap model = GetSmallModel();
+
+  EXPECT_CALL(*mock_db, Init(_));
+  EXPECT_CALL(caller, InitCallback(_));
+  db_->InitWithDatabase(
+      base::WrapUnique(mock_db), path,
+      base::Bind(&MockDatabaseCaller::InitCallback, base::Unretained(&caller)));
+
+  std::string key("1");
+  ASSERT_TRUE(model.count(key));
+  EXPECT_CALL(*mock_db, Get(key, _)).WillOnce(SetGetEntry(model));
+  EXPECT_CALL(caller, GetCallback1(true, _))
+      .WillOnce(VerifyGetEntry(model[key]));
+  db_->GetEntry(
+      key,
+      base::Bind(&MockDatabaseCaller::GetCallback, base::Unretained(&caller)));
+
+  base::RunLoop().RunUntilIdle();
+}
+
+TEST_F(ProtoDatabaseImplTest, TestDBGetFailure) {
+  base::FilePath path(FILE_PATH_LITERAL("/fake/path"));
+
+  MockDB* mock_db = new MockDB();
+  MockDatabaseCaller caller;
+  EntryMap model = GetSmallModel();
+
+  EXPECT_CALL(*mock_db, Init(_));
+  EXPECT_CALL(caller, InitCallback(_));
+  db_->InitWithDatabase(
+      base::WrapUnique(mock_db), path,
+      base::Bind(&MockDatabaseCaller::InitCallback, base::Unretained(&caller)));
+
+  std::string key("does_not_exist");
+  ASSERT_FALSE(model.count(key));
+  EXPECT_CALL(*mock_db, Get(key, _)).WillOnce(Return(false));
+  EXPECT_CALL(caller, GetCallback1(false, nullptr));
+  db_->GetEntry(
+      key,
+      base::Bind(&MockDatabaseCaller::GetCallback, base::Unretained(&caller)));
+
+  base::RunLoop().RunUntilIdle();
+}
+
 ACTION_P(VerifyUpdateEntries, expected) {
   const KeyValueVector actual = arg0;
   // Create a vector of TestProto from |actual| to reuse the comparison