Componentize shortcuts_database_unittest

components/omnibox/browser/shortcuts_database_unittest.cc

 // Copyright (c) 2012 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 "components/omnibox/browser/shortcuts_database.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
+#include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/test/base/testing_profile.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/omnibox/browser/shortcuts_constants.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 #include "sql/statement.h"
 #include "sql/test/test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/page_transition_types.h"
 
 using base::ASCIIToUTF16;
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
@@ skipping 28 matching lines @@
     ui::PAGE_TRANSITION_LINK, AutocompleteMatchType::HISTORY_TITLE, "", 0,
     5},
 };
 
 typedef testing::Test ShortcutsDatabaseMigrationTest;
 
 // Checks that the database at |db| has the version 2 columns iff |is_v2|.
 void CheckV2ColumnExistence(const base::FilePath& db_path, bool is_v2) {
   sql::Connection connection;
   ASSERT_TRUE(connection.Open(db_path));
-  EXPECT_EQ(is_v2, connection.DoesColumnExist("omni_box_shortcuts",
-                                              "fill_into_edit"));
-  EXPECT_EQ(is_v2, connection.DoesColumnExist("omni_box_shortcuts",
-                                              "transition"));
+  EXPECT_EQ(is_v2,
+            connection.DoesColumnExist("omni_box_shortcuts", "fill_into_edit"));
+  EXPECT_EQ(is_v2,
+            connection.DoesColumnExist("omni_box_shortcuts", "transition"));
   EXPECT_EQ(is_v2, connection.DoesColumnExist("omni_box_shortcuts", "type"));
   EXPECT_EQ(is_v2, connection.DoesColumnExist("omni_box_shortcuts", "keyword"));
 }
 
+const base::FilePath& GetTestDataDir() {
+  CR_DEFINE_STATIC_LOCAL(base::FilePath, dir, ());
+  if (dir.empty()) {
+    PathService::Get(base::DIR_SOURCE_ROOT, &dir);
+    dir = dir.AppendASCII("components");
+    dir = dir.AppendASCII("test");
+    dir = dir.AppendASCII("data");
+    dir = dir.AppendASCII("omnibox");
+  }
+  return dir;

[droger, 2015/12/11 12:08:23]

I don't think the static local is useful here.

I would suggest simply:

base::FilePath path;
PathService::Get(base::DIR_SOURCE_ROOT, &path);
return path.AppendASCII("components/test/data/omnibox");

[Abhishek, 2015/12/11 15:54:11]

Done.

+}
+
 }  // namespace
 
 // ShortcutsDatabaseTest ------------------------------------------------------
 
 class ShortcutsDatabaseTest : public testing::Test {
  public:
   void SetUp() override;
   void TearDown() override;
 
   void ClearDB();
   size_t CountRecords() const;
 
   ShortcutsDatabase::Shortcut ShortcutFromTestInfo(
       const ShortcutsDatabaseTestInfo& info);
 
   void AddAll();
 
-  content::TestBrowserThreadBundle thread_bundle_;
-  scoped_ptr<TestingProfile> profile_;
+  base::MessageLoop message_loop_;

[droger, 2015/12/11 12:08:23]

Is this even needed?

[Abhishek, 2015/12/11 15:54:11]

Yeah! We don't require it now.
I've removed it.

   scoped_refptr<ShortcutsDatabase> db_;
 };
 
 void ShortcutsDatabaseTest::SetUp() {
-  profile_.reset(new TestingProfile());
-  db_ = new ShortcutsDatabase(
-      profile_->GetPath().Append(kShortcutsDatabaseName));
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath db_path(temp_dir.path().AppendASCII(kShortcutsDatabaseName));

[droger, 2015/12/11 12:08:23]

This does not compile on windows, can you try using Append() instead of
AppendASCII()?

[Abhishek, 2015/12/11 15:54:11]

Done.

+  db_ = new ShortcutsDatabase(db_path);
   ASSERT_TRUE(db_->Init());
   ClearDB();
 }
 
 void ShortcutsDatabaseTest::TearDown() {
   db_ = NULL;
 }
 
 void ShortcutsDatabaseTest::ClearDB() {
-  sql::Statement
-      s(db_->db_.GetUniqueStatement("DELETE FROM omni_box_shortcuts"));
+  sql::Statement s(
+      db_->db_.GetUniqueStatement("DELETE FROM omni_box_shortcuts"));
   EXPECT_TRUE(s.Run());
 }
 
 size_t ShortcutsDatabaseTest::CountRecords() const {
-  sql::Statement s(db_->db_.GetUniqueStatement(
-      "SELECT count(*) FROM omni_box_shortcuts"));
+  sql::Statement s(
+      db_->db_.GetUniqueStatement("SELECT count(*) FROM omni_box_shortcuts"));
   EXPECT_TRUE(s.Step());
   return static_cast<size_t>(s.ColumnInt(0));
 }
 
 ShortcutsDatabase::Shortcut ShortcutsDatabaseTest::ShortcutFromTestInfo(
     const ShortcutsDatabaseTestInfo& info) {
   return ShortcutsDatabase::Shortcut(
       info.guid, ASCIIToUTF16(info.text),
       ShortcutsDatabase::Shortcut::MatchCore(
           ASCIIToUTF16(info.fill_into_edit), GURL(info.destination_url),
           ASCIIToUTF16(info.contents), info.contents_class,
           ASCIIToUTF16(info.description), info.description_class,
           info.transition, info.type, ASCIIToUTF16(info.keyword)),
       base::Time::Now() - base::TimeDelta::FromDays(info.days_from_now),
       info.number_of_hits);
 }
 
 void ShortcutsDatabaseTest::AddAll() {
   ClearDB();
   for (size_t i = 0; i < arraysize(shortcut_test_db); ++i)
     db_->AddShortcut(ShortcutFromTestInfo(shortcut_test_db[i]));
   EXPECT_EQ(arraysize(shortcut_test_db), CountRecords());
 }
 
-
 // Actual tests ---------------------------------------------------------------
 
 TEST_F(ShortcutsDatabaseTest, AddShortcut) {
   ClearDB();
   EXPECT_EQ(0U, CountRecords());
   EXPECT_TRUE(db_->AddShortcut(ShortcutFromTestInfo(shortcut_test_db[0])));
   EXPECT_EQ(1U, CountRecords());
   EXPECT_TRUE(db_->AddShortcut(ShortcutFromTestInfo(shortcut_test_db[1])));
   EXPECT_EQ(2U, CountRecords());
   EXPECT_TRUE(db_->AddShortcut(ShortcutFromTestInfo(shortcut_test_db[2])));
@@ skipping 49 matching lines @@
       shortcuts.find(shortcut_test_db[0].guid);
   EXPECT_TRUE(it != shortcuts.end());
 
   it = shortcuts.find(shortcut_test_db[1].guid);
   EXPECT_TRUE(it == shortcuts.end());
 
   it = shortcuts.find(shortcut_test_db[2].guid);
   EXPECT_TRUE(it == shortcuts.end());
 }
 
-
 TEST_F(ShortcutsDatabaseTest, DeleteAllShortcuts) {
   AddAll();
   ShortcutsDatabase::GuidToShortcutMap shortcuts;
   db_->LoadShortcuts(&shortcuts);
   EXPECT_EQ(arraysize(shortcut_test_db), shortcuts.size());
   EXPECT_TRUE(db_->DeleteAllShortcuts());
   db_->LoadShortcuts(&shortcuts);
   EXPECT_EQ(0U, shortcuts.size());
 }
 
 TEST(ShortcutsDatabaseMigrationTest, MigrateTableAddFillIntoEdit) {
   // Use the pre-v0 test file to create a test database in a temp dir.
-  base::FilePath sql_path;
-  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &sql_path));
-  sql_path = sql_path.AppendASCII("History").AppendASCII(
+  base::FilePath sql_path = GetTestDataDir().AppendASCII(
 #if defined(OS_ANDROID)
       "Shortcuts.v1.sql");
 #else
       "Shortcuts.no_fill_into_edit.sql");
 #endif
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath db_path(temp_dir.path().AppendASCII("TestShortcuts1.db"));
   ASSERT_TRUE(sql::test::CreateDatabaseFromSQL(db_path, sql_path));
 
@@ skipping 27 matching lines @@
     EXPECT_TRUE(statement.ColumnString(4).empty());
   }
   EXPECT_TRUE(statement.Succeeded());
 #if !defined(OS_WIN)
   EXPECT_TRUE(temp_dir.Delete());
 #endif
 }
 
 TEST(ShortcutsDatabaseMigrationTest, MigrateV0ToV1) {
   // Use the v0 test file to create a test database in a temp dir.
-  base::FilePath sql_path;
-  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &sql_path));
-  sql_path = sql_path.AppendASCII("History").AppendASCII("Shortcuts.v0.sql");
+  base::FilePath sql_path = GetTestDataDir().AppendASCII("Shortcuts.v0.sql");
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath db_path(temp_dir.path().AppendASCII("TestShortcuts2.db"));
   ASSERT_TRUE(sql::test::CreateDatabaseFromSQL(db_path, sql_path));
 
   // Create a ShortcutsDatabase from the test database, which will migrate the
   // test database to the current version.
   {
     scoped_refptr<ShortcutsDatabase> db(new ShortcutsDatabase(db_path));
     db->Init();
   }
 
   // Check that all the old type values got converted to new values.
   sql::Connection connection;
   ASSERT_TRUE(connection.Open(db_path));
   sql::Statement statement(connection.GetUniqueStatement(
       "SELECT count(1) FROM omni_box_shortcuts WHERE type in (9, 10, 11, 12)"));
   ASSERT_TRUE(statement.is_valid());
   while (statement.Step())
     EXPECT_EQ(0, statement.ColumnInt(0));
   EXPECT_TRUE(statement.Succeeded());
 #if !defined(OS_WIN)
   EXPECT_TRUE(temp_dir.Delete());
 #endif
 }