Importing certain bookmarks from firefox and HTML file as search engines.

chrome/utility/importer/bookmark_html_reader_unittest.cc

 // Copyright 2013 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 "chrome/utility/importer/bookmark_html_reader.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 134 matching lines @@
 
  protected:
   void ExpectFirstFirefox2Bookmark(const ImportedBookmarkEntry& entry);
   void ExpectSecondFirefox2Bookmark(const ImportedBookmarkEntry& entry);
   void ExpectThirdFirefox2Bookmark(const ImportedBookmarkEntry& entry);
   void ExpectFirstEpiphanyBookmark(const ImportedBookmarkEntry& entry);
   void ExpectSecondEpiphanyBookmark(const ImportedBookmarkEntry& entry);
   void ExpectFirstFirefox23Bookmark(const ImportedBookmarkEntry& entry);
   void ExpectSecondFirefox23Bookmark(const ImportedBookmarkEntry& entry);
   void ExpectThirdFirefox23Bookmark(const ImportedBookmarkEntry& entry);
+  void ExpectFirstFirefoxBookmarkWithKeyword(
+      const importer::SearchEngineInfo& info);
+  void ExpectSecondFirefoxBookmarkWithKeyword(
+      const importer::SearchEngineInfo& info);
 
   base::FilePath test_data_path_;
 };
 
 void BookmarkHTMLReaderTestWithData::SetUp() {
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_path_));
   test_data_path_ = test_data_path_.AppendASCII("bookmark_html_reader");
 }
 
 void BookmarkHTMLReaderTestWithData::ExpectFirstFirefox2Bookmark(
@@ skipping 64 matching lines @@
 void BookmarkHTMLReaderTestWithData::ExpectThirdFirefox23Bookmark(
     const ImportedBookmarkEntry& entry) {
   EXPECT_EQ(ASCIIToUTF16("CodeSearch"), entry.title);
   EXPECT_FALSE(entry.is_folder);
   EXPECT_EQ(base::Time::FromTimeT(1376102224), entry.creation_time);
   EXPECT_EQ(1U, entry.path.size());
   EXPECT_EQ(ASCIIToUTF16("Chromium"), entry.path.front());
   EXPECT_EQ("http://code.google.com/p/chromium/codesearch", entry.url.spec());
 }
 
+void BookmarkHTMLReaderTestWithData::ExpectFirstFirefoxBookmarkWithKeyword(
+    const importer::SearchEngineInfo& info) {
+  EXPECT_EQ(ASCIIToUTF16("http://example.%s.com/"), info.url);
+  EXPECT_EQ(ASCIIToUTF16("keyword"), info.keyword);
+  EXPECT_EQ(ASCIIToUTF16("Bookmark Keyword"), info.display_name);
+}
+
+void BookmarkHTMLReaderTestWithData::ExpectSecondFirefoxBookmarkWithKeyword(
+    const importer::SearchEngineInfo& info) {
+  EXPECT_EQ(ASCIIToUTF16("http://example.com/?q=%s"), info.url);
+  EXPECT_EQ(ASCIIToUTF16("keyword"), info.keyword);
+  EXPECT_EQ(ASCIIToUTF16("BookmarkName"), info.display_name);
+}
+
 }  // namespace
 
 TEST_F(BookmarkHTMLReaderTestWithData, Firefox2BookmarkFileImport) {
   base::FilePath path = test_data_path_.AppendASCII("firefox2.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   ImportBookmarksFile(base::Callback<bool(void)>(),
                       base::Callback<bool(const GURL&)>(),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   ASSERT_EQ(3U, bookmarks.size());
   ExpectFirstFirefox2Bookmark(bookmarks[0]);
   ExpectSecondFirefox2Bookmark(bookmarks[1]);
   ExpectThirdFirefox2Bookmark(bookmarks[2]);
 }
 
 TEST_F(BookmarkHTMLReaderTestWithData, BookmarkFileWithHrTagImport) {
   base::FilePath path = test_data_path_.AppendASCII("firefox23.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   ImportBookmarksFile(base::Callback<bool(void)>(),
                       base::Callback<bool(const GURL&)>(),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   ASSERT_EQ(3U, bookmarks.size());
   ExpectFirstFirefox23Bookmark(bookmarks[0]);
   ExpectSecondFirefox23Bookmark(bookmarks[1]);
   ExpectThirdFirefox23Bookmark(bookmarks[2]);
 }
 
 TEST_F(BookmarkHTMLReaderTestWithData, EpiphanyBookmarkFileImport) {
   base::FilePath path = test_data_path_.AppendASCII("epiphany.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   ImportBookmarksFile(base::Callback<bool(void)>(),
                       base::Callback<bool(const GURL&)>(),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   ASSERT_EQ(2U, bookmarks.size());
   ExpectFirstEpiphanyBookmark(bookmarks[0]);
   ExpectSecondEpiphanyBookmark(bookmarks[1]);
 }
 
+TEST_F(BookmarkHTMLReaderTestWithData, FirefoxBookmarkFileWithKeywordImport) {
+  base::FilePath path = test_data_path_.AppendASCII(
+      "firefox_bookmark_keyword.html");
+
+  std::vector<importer::SearchEngineInfo> search_engines;
+  ImportBookmarksFile(base::Callback<bool(void)>(),
+                      base::Callback<bool(const GURL&)>(),
+                      path, NULL, &search_engines, NULL);
+
+  ASSERT_EQ(2U, search_engines.size());
+  ExpectFirstFirefoxBookmarkWithKeyword(search_engines[0]);
+  ExpectSecondFirefoxBookmarkWithKeyword(search_engines[1]);
+}
+
 namespace {
 
 class CancelAfterFifteenCalls {
   int count;
  public:
   CancelAfterFifteenCalls() : count(0) { }
   bool ShouldCancel() {
     return ++count > 16;
   }
 };
 
 }  // namespace
 
 TEST_F(BookmarkHTMLReaderTestWithData, CancellationCallback) {
   // Use a file for testing that has multiple bookmarks.
   base::FilePath path = test_data_path_.AppendASCII("firefox2.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   CancelAfterFifteenCalls cancel_fifteen;
   ImportBookmarksFile(base::Bind(&CancelAfterFifteenCalls::ShouldCancel,
                                  base::Unretained(&cancel_fifteen)),
                       base::Callback<bool(const GURL&)>(),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   // The cancellation callback is checked before each line is read, so fifteen
   // lines are imported. The first fifteen lines of firefox2.html include only
   // one bookmark.
   ASSERT_EQ(1U, bookmarks.size());
   ExpectFirstFirefox2Bookmark(bookmarks[0]);
 }
 
 namespace {

[Ilya Sherman, 2014/11/07 00:22:34]

nit: Please restore the newline after this line.

[Tapu Ghose, 2014/11/09 14:03:07]

Done.

-
 bool IsURLValid(const GURL& url) {
   // No offense to whomever owns this domain...
   return !url.DomainIs("tamurayukari.com");
 }
 
 }  // namespace
 
 TEST_F(BookmarkHTMLReaderTestWithData, ValidURLCallback) {
   // Use a file for testing that has multiple bookmarks.
   base::FilePath path = test_data_path_.AppendASCII("firefox2.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   ImportBookmarksFile(base::Callback<bool(void)>(),
                       base::Bind(&IsURLValid),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   ASSERT_EQ(2U, bookmarks.size());
   ExpectFirstFirefox2Bookmark(bookmarks[0]);
   ExpectThirdFirefox2Bookmark(bookmarks[1]);
 }
 
 }  // namespace bookmark_html_reader

[Ilya Sherman, 2014/11/07 00:22:34]

Please add test coverage specifically for CanImportURLAsSearchEngine(), since
that's exported as part of the public API for this file.

[Tapu Ghose, 2014/11/09 14:03:07]

Added.