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

Unified Diff: chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc

Issue 428063002: [SyncFS] Replace leveldb classes with LevelDBWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on cl/437943002 Created 6 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
Index: chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
index 8af2da7629fc237dfae3f03edb75cea478b587f3..8c7a072c8f03f39604c52d8f72c14cb2d5196d2f 100644
--- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
#include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
#include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h"
+#include "chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h"
#include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
#include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
@@ -27,7 +28,6 @@
#include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
#include "third_party/leveldatabase/src/include/leveldb/db.h"
#include "third_party/leveldatabase/src/include/leveldb/env.h"
-#include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
namespace sync_file_system {
namespace drive_backend {
@@ -77,7 +77,7 @@ class RegisterAppTaskTest : public testing::Test {
}
protected:
- scoped_ptr<leveldb::DB> OpenLevelDB() {
+ scoped_ptr<LevelDBWrapper> OpenLevelDB() {
leveldb::DB* db = NULL;
leveldb::Options options;
options.create_if_missing = true;
@@ -85,10 +85,10 @@ class RegisterAppTaskTest : public testing::Test {
leveldb::Status status =
leveldb::DB::Open(options, database_dir_.path().AsUTF8Unsafe(), &db);
EXPECT_TRUE(status.ok());
- return make_scoped_ptr<leveldb::DB>(db);
+ return make_scoped_ptr(new LevelDBWrapper(make_scoped_ptr(db)));
}
- void SetUpInitialData(leveldb::DB* db) {
+ void SetUpInitialData(LevelDBWrapper* db) {
ServiceMetadata service_metadata;
service_metadata.set_largest_change_id(100);
service_metadata.set_sync_root_tracker_id(kSyncRootTrackerID);
@@ -111,16 +111,15 @@ class RegisterAppTaskTest : public testing::Test {
*sync_root_tracker.mutable_synced_details() = sync_root_details;
sync_root_tracker.set_active(true);
- leveldb::WriteBatch batch;
- batch.Put(kDatabaseVersionKey,
- base::Int64ToString(kCurrentDatabaseVersion));
- PutServiceMetadataToBatch(service_metadata, &batch);
- PutFileMetadataToBatch(sync_root_metadata, &batch);
- PutFileTrackerToBatch(sync_root_tracker, &batch);
- EXPECT_TRUE(db->Write(leveldb::WriteOptions(), &batch).ok());
+ db->Put(kDatabaseVersionKey,
+ base::Int64ToString(kCurrentDatabaseVersion));
+ PutServiceMetadataToDB(service_metadata, db);
+ PutFileMetadataToDB(sync_root_metadata, db);
+ PutFileTrackerToDB(sync_root_tracker, db);
+ EXPECT_TRUE(db->Commit().ok());
}
- void CreateMetadataDatabase(scoped_ptr<leveldb::DB> db) {
+ void CreateMetadataDatabase(scoped_ptr<LevelDBWrapper> db) {
ASSERT_TRUE(db);
ASSERT_FALSE(context_->GetMetadataDatabase());
scoped_ptr<MetadataDatabase> metadata_db;
@@ -140,7 +139,7 @@ class RegisterAppTaskTest : public testing::Test {
void SetUpRegisteredAppRoot(
const std::string& app_id,
- leveldb::DB* db) {
+ LevelDBWrapper* db) {
FileDetails details;
details.set_title(app_id);
details.set_file_kind(FILE_KIND_FOLDER);
@@ -159,14 +158,13 @@ class RegisterAppTaskTest : public testing::Test {
*tracker.mutable_synced_details() = details;
tracker.set_active(true);
- leveldb::WriteBatch batch;
- PutFileMetadataToBatch(metadata, &batch);
- PutFileTrackerToBatch(tracker, &batch);
- EXPECT_TRUE(db->Write(leveldb::WriteOptions(), &batch).ok());
+ PutFileMetadataToDB(metadata, db);
+ PutFileTrackerToDB(tracker, db);
+ EXPECT_TRUE(db->Commit().ok());
}
void SetUpUnregisteredAppRoot(const std::string& app_id,
- leveldb::DB* db) {
+ LevelDBWrapper* db) {
FileDetails details;
details.set_title(app_id);
details.set_file_kind(FILE_KIND_FOLDER);
@@ -184,10 +182,9 @@ class RegisterAppTaskTest : public testing::Test {
*tracker.mutable_synced_details() = details;
tracker.set_active(false);
- leveldb::WriteBatch batch;
- PutFileMetadataToBatch(metadata, &batch);
- PutFileTrackerToBatch(tracker, &batch);
- EXPECT_TRUE(db->Write(leveldb::WriteOptions(), &batch).ok());
+ PutFileMetadataToDB(metadata, db);
+ PutFileTrackerToDB(tracker, db);
+ EXPECT_TRUE(db->Commit().ok());
}
size_t CountRegisteredAppRoot() {
@@ -253,7 +250,7 @@ class RegisterAppTaskTest : public testing::Test {
};
TEST_F(RegisterAppTaskTest, AlreadyRegistered) {
- scoped_ptr<leveldb::DB> db(OpenLevelDB());
+ scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
ASSERT_TRUE(db);
SetUpInitialData(db.get());
@@ -268,7 +265,7 @@ TEST_F(RegisterAppTaskTest, AlreadyRegistered) {
}
TEST_F(RegisterAppTaskTest, CreateAppFolder) {
- scoped_ptr<leveldb::DB> db(OpenLevelDB());
+ scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
ASSERT_TRUE(db);
SetUpInitialData(db.get());
@@ -284,7 +281,7 @@ TEST_F(RegisterAppTaskTest, CreateAppFolder) {
}
TEST_F(RegisterAppTaskTest, RegisterExistingFolder) {
- scoped_ptr<leveldb::DB> db(OpenLevelDB());
+ scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
ASSERT_TRUE(db);
SetUpInitialData(db.get());
@@ -299,7 +296,7 @@ TEST_F(RegisterAppTaskTest, RegisterExistingFolder) {
}
TEST_F(RegisterAppTaskTest, RegisterExistingFolder_MultipleCandidate) {
- scoped_ptr<leveldb::DB> db(OpenLevelDB());
+ scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
ASSERT_TRUE(db);
SetUpInitialData(db.get());

Powered by Google App Engine
This is Rietveld 408576698