mojo leveldb: Reenable tests which can be moved to the in-memory db.

components/leveldb/leveldb_service_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
 #include "components/leveldb/public/interfaces/leveldb.mojom.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 40 matching lines @@
   filesystem::FileSystemPtr& files() { return files_; }
   LevelDBServicePtr& leveldb() { return leveldb_; }
 
  private:
   filesystem::FileSystemPtr files_;
   LevelDBServicePtr leveldb_;
 
   DISALLOW_COPY_AND_ASSIGN(LevelDBServiceTest);
 };
 
-// TODO(crbug.com/602820) Test is flaky.
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_Basic DISABLED_Basic
-#else
-#define MAYBE_Basic Basic
-#endif
-TEST_F(LevelDBServiceTest, MAYBE_Basic) {
-  filesystem::DirectoryPtr directory;
-  GetUserDataDir(&directory);
-
+TEST_F(LevelDBServiceTest, Basic) {
   DatabaseError error;
   LevelDBDatabasePtr database;
-  leveldb()->Open(std::move(directory), "test", GetProxy(&database),
-                  Capture(&error));
+  leveldb()->OpenInMemory(GetProxy(&database), Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
   // Write a key to the database.
   error = DatabaseError::INVALID_ARGUMENT;
   database->Put(mojo::Array<uint8_t>::From(std::string("key")),
                 mojo::Array<uint8_t>::From(std::string("value")),
                 Capture(&error));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
@@ skipping 17 matching lines @@
   // Read the key back from the database.
   error = DatabaseError::INVALID_ARGUMENT;
   value.SetToEmpty();
   database->Get(mojo::Array<uint8_t>::From(std::string("key")),
                 Capture(&error, &value));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::NOT_FOUND, error);
   EXPECT_EQ("", value.To<std::string>());
 }
 
-// TODO(crbug.com/602820) Test is flaky.
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_WriteBatch DISABLED_WriteBatch
-#else
-#define MAYBE_WriteBatch WriteBatch
-#endif
-TEST_F(LevelDBServiceTest, MAYBE_WriteBatch) {
+TEST_F(LevelDBServiceTest, WriteBatch) {
   DatabaseError error;
   LevelDBDatabasePtr database;
   leveldb()->OpenInMemory(GetProxy(&database), Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
   // Write a key to the database.
   database->Put(mojo::Array<uint8_t>::From(std::string("key")),
                 mojo::Array<uint8_t>::From(std::string("value")),
                 Capture(&error));
@@ skipping 119 matching lines @@
     error = DatabaseError::INVALID_ARGUMENT;
     mojo::Array<uint8_t> value;
     database->Get(mojo::Array<uint8_t>::From(std::string("key")),
                   Capture(&error, &value));
     ASSERT_TRUE(database.WaitForIncomingResponse());
     EXPECT_EQ(DatabaseError::OK, error);
     EXPECT_EQ("value", value.To<std::string>());
   }
 }
 
-// TODO(crbug.com/602820) Test is flaky.
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_GetSnapshotSimple DISABLED_GetSnapshotSimple
-#else
-#define MAYBE_GetSnapshotSimple GetSnapshotSimple
-#endif
-TEST_F(LevelDBServiceTest, MAYBE_GetSnapshotSimple) {
+TEST_F(LevelDBServiceTest, GetSnapshotSimple) {
   DatabaseError error;
-
-  filesystem::DirectoryPtr directory;
-  GetUserDataDir(&directory);
-
   LevelDBDatabasePtr database;
-  leveldb()->Open(std::move(directory), "test", GetProxy(&database),
-                  Capture(&error));
+  leveldb()->OpenInMemory(GetProxy(&database), Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
   uint64_t snapshot_id = 0;
   database->GetSnapshot(Capture(&snapshot_id));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_NE(static_cast<uint64_t>(0), snapshot_id);
 }
 
-// TODO(crbug.com/602820) Test is flaky.
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_GetFromSnapshots DISABLED_GetFromSnapshots
-#else
-#define MAYBE_GetFromSnapshots GetFromSnapshots
-#endif
-TEST_F(LevelDBServiceTest, MAYBE_GetFromSnapshots) {
+TEST_F(LevelDBServiceTest, GetFromSnapshots) {
   DatabaseError error;
-
-  filesystem::DirectoryPtr directory;
-  GetUserDataDir(&directory);
-
   LevelDBDatabasePtr database;
-  leveldb()->Open(std::move(directory), "test", GetProxy(&database),
-                  Capture(&error));
+  leveldb()->OpenInMemory(GetProxy(&database), Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
   // Write a key to the database.
   error = DatabaseError::INVALID_ARGUMENT;
   database->Put(mojo::Array<uint8_t>::From(std::string("key")),
                 mojo::Array<uint8_t>::From(std::string("value")),
                 Capture(&error));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
@@ skipping 25 matching lines @@
   value.SetToEmpty();
   database->GetFromSnapshot(
       key_value_snapshot,
       mojo::Array<uint8_t>::From(std::string("key")),
       Capture(&error, &value));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
   EXPECT_EQ("value", value.To<std::string>());
 }
 
-// TODO(crbug.com/602820) Test is flaky.
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_InvalidArgumentOnInvalidSnapshot DISABLED_InvalidArgumentOnInvalidSnapshot
-#else
-#define MAYBE_InvalidArgumentOnInvalidSnapshot InvalidArgumentOnInvalidSnapshot
-#endif
-TEST_F(LevelDBServiceTest, MAYBE_InvalidArgumentOnInvalidSnapshot) {
-  filesystem::DirectoryPtr directory;
-  GetUserDataDir(&directory);
-
+TEST_F(LevelDBServiceTest, InvalidArgumentOnInvalidSnapshot) {
   LevelDBDatabasePtr database;
   DatabaseError error = DatabaseError::INVALID_ARGUMENT;
-  leveldb()->Open(std::move(directory), "test", GetProxy(&database),
-                  Capture(&error));
+  leveldb()->OpenInMemory(GetProxy(&database), Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
   uint64_t invalid_snapshot = 8;
 
   error = DatabaseError::OK;
   mojo::Array<uint8_t> value;
   database->GetFromSnapshot(
       invalid_snapshot,
       mojo::Array<uint8_t>::From(std::string("key")),
@@ skipping 172 matching lines @@
   key_values.SetToEmpty();
   database->GetPrefixed(mojo::Array<uint8_t>::From(prefix),
                         Capture(&error, &key_values));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
   EXPECT_TRUE(key_values.empty());
 }
 
 }  // namespace
 }  // namespace leveldb