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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/utility/importer/firefox_importer_unittest.cc

Issue 2451223004: Improve Firefox importer to handle all Firefox profiles. (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « chrome/utility/importer/firefox_importer.cc ('k') | chrome/utility/importer/firefox_places_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/firefox_importer_unittest.cc
diff --git a/chrome/utility/importer/firefox_importer_unittest.cc b/chrome/utility/importer/firefox_importer_unittest.cc
index 80e763ad4626833a2b35740091d849e03546245a..6376ba8399b8f5f5f53aebec9f28ecb73e51b838 100644
--- a/chrome/utility/importer/firefox_importer_unittest.cc
+++ b/chrome/utility/importer/firefox_importer_unittest.cc
@@ -8,6 +8,9 @@
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/common/importer/importer_data_types.h"
+#include "chrome/common/importer/mock_importer_bridge.h"
+#include "chrome/utility/importer/firefox_importer.h"
#include "chrome/utility/importer/firefox_importer_unittest_utils.h"
#include "chrome/utility/importer/nss_decryptor.h"
#include "sql/connection.h"
@@ -39,11 +42,13 @@ TEST(FirefoxImporterTest, MAYBE_NSS(Firefox3NSS3Decryptor)) {
ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
- EXPECT_EQ(base::ASCIIToUTF16("hello"),
+ EXPECT_EQ(
+ base::ASCIIToUTF16("hello"),
decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECKa"
"jtRg4qFSHBAhv9luFkXgDJA=="));
// Test UTF-16 encoding.
- EXPECT_EQ(base::WideToUTF16(L"\x4E2D"),
+ EXPECT_EQ(
+ base::WideToUTF16(L"\x4E2D"),
decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECLW"
"qqiccfQHWBAie74hxnULxlw=="));
@@ -114,3 +119,218 @@ TEST(FirefoxImporterTest, MAYBE_NSS(FirefoxNSSDecryptorDeduceAuthScheme)) {
EXPECT_EQ(autofill::PasswordForm::SCHEME_BASIC, forms[0].scheme);
EXPECT_EQ(autofill::PasswordForm::SCHEME_HTML, forms[1].scheme);
}
+
+TEST(FirefoxImporterTest, ImportBookmarksSchemaV11) {
+ using ::testing::_;
+ base::FilePath places_path;
+ ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &places_path));
+ places_path =
+ places_path.AppendASCII("import").AppendASCII("firefox").AppendASCII(
+ "4.0");
+ scoped_refptr<FirefoxImporter> importer = new FirefoxImporter;
+ importer::SourceProfile profile;
+ profile.source_path = places_path;
+ scoped_refptr<MockImporterBridge> bridge = new MockImporterBridge;
+ std::vector<ImportedBookmarkEntry> bookmarks;
+ favicon_base::FaviconUsageDataList favicons;
+ EXPECT_CALL(*bridge, NotifyStarted());
+ EXPECT_CALL(*bridge, NotifyItemStarted(importer::FAVORITES));
+ EXPECT_CALL(*bridge, AddBookmarks(_, _))
+ .WillOnce(::testing::SaveArg<0>(&(bookmarks)));
+ EXPECT_CALL(*bridge, SetFavicons(_))
+ .WillOnce(::testing::SaveArg<0>(&(favicons)));
+ EXPECT_CALL(*bridge, NotifyItemEnded(importer::FAVORITES));
+ EXPECT_CALL(*bridge, NotifyEnded());
+ importer->StartImport(profile, importer::FAVORITES, bridge.get());
+ EXPECT_EQ(6, bookmarks.size());
+ EXPECT_EQ("http://www.mozilla.com/en-US/firefox/central/",
+ bookmarks[0].url.spec());
+ EXPECT_EQ("http://www.mozilla.com/en-US/firefox/help/",
+ bookmarks[1].url.spec());
+ EXPECT_EQ("http://www.mozilla.com/en-US/firefox/customize/",
+ bookmarks[2].url.spec());
+ EXPECT_EQ("http://www.mozilla.com/en-US/firefox/community/",
+ bookmarks[3].url.spec());
+ EXPECT_EQ("http://www.mozilla.com/en-US/about/",
+ bookmarks[4].url.spec());
+ EXPECT_EQ("http://www.google.com/",
+ bookmarks[5].url.spec());
+ EXPECT_EQ(4, favicons.size());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/0-1473342759588000",
+ favicons[0].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/1-1473342759589000",
+ favicons[1].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/2-1473342759589000",
+ favicons[2].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/3-1473342759590000",
+ favicons[3].favicon_url.spec());
+}
+
+TEST(FirefoxImporterTest, ImportHistorySchemaV11) {
+ using ::testing::_;
+ base::FilePath places_path;
+ ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &places_path));
+ places_path =
+ places_path.AppendASCII("import").AppendASCII("firefox").AppendASCII(
+ "4.0");
+ scoped_refptr<FirefoxImporter> importer = new FirefoxImporter;
+ importer::SourceProfile profile;
+ profile.source_path = places_path;
+ scoped_refptr<MockImporterBridge> bridge = new MockImporterBridge;
+ std::vector<ImporterURLRow> history;
+ EXPECT_CALL(*bridge, NotifyStarted());
+ EXPECT_CALL(*bridge, NotifyItemStarted(importer::HISTORY));
+ EXPECT_CALL(*bridge, SetHistoryItems(_, _))
+ .WillOnce(::testing::SaveArg<0>(&(history)));
+ EXPECT_CALL(*bridge, NotifyItemEnded(importer::HISTORY));
+ EXPECT_CALL(*bridge, NotifyEnded());
+ importer->StartImport(profile, importer::HISTORY, bridge.get());
+ EXPECT_EQ(2, history.size());
+ EXPECT_EQ("http://www.mozilla.com/en-US/firefox/4.0/firstrun/",
+ history[0].url.spec());
+ EXPECT_EQ("http://google.com/", history[1].url.spec());
+}
+
+TEST(FirefoxImporterTest, ImportBookmarksSchemaV25) {
+ using ::testing::_;
+ base::FilePath places_path;
+ ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &places_path));
+ places_path =
+ places_path.AppendASCII("import").AppendASCII("firefox").AppendASCII(
+ "36.0.1");
+ scoped_refptr<FirefoxImporter> importer = new FirefoxImporter;
+ importer::SourceProfile profile;
+ profile.source_path = places_path;
+ scoped_refptr<MockImporterBridge> bridge = new MockImporterBridge;
+ std::vector<ImportedBookmarkEntry> bookmarks;
+ favicon_base::FaviconUsageDataList favicons;
+ EXPECT_CALL(*bridge, NotifyStarted());
+ EXPECT_CALL(*bridge, NotifyItemStarted(importer::FAVORITES));
+ EXPECT_CALL(*bridge, AddBookmarks(_, _))
+ .WillOnce(::testing::SaveArg<0>(&(bookmarks)));
+ EXPECT_CALL(*bridge, SetFavicons(_))
+ .WillOnce(::testing::SaveArg<0>(&(favicons)));
+ EXPECT_CALL(*bridge, NotifyItemEnded(importer::FAVORITES));
+ EXPECT_CALL(*bridge, NotifyEnded());
+ importer->StartImport(profile, importer::FAVORITES, bridge.get());
+ EXPECT_EQ(6, bookmarks.size());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/central/",
+ bookmarks[0].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/help/",
+ bookmarks[1].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/customize/",
+ bookmarks[2].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/contribute/",
+ bookmarks[3].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/about/",
+ bookmarks[4].url.spec());
+ EXPECT_EQ("https://www.google.com/",
+ bookmarks[5].url.spec());
+ EXPECT_EQ(4, favicons.size());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/0-1473412028106",
+ favicons[0].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/1-1473412028107",
+ favicons[1].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/2-1473412028107",
+ favicons[2].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/3-1473412028108",
+ favicons[3].favicon_url.spec());
+}
+
+TEST(FirefoxImporterTest, ImportHistorySchemaV25) {
+ using ::testing::_;
+ base::FilePath places_path;
+ ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &places_path));
+ places_path =
+ places_path.AppendASCII("import").AppendASCII("firefox").AppendASCII(
+ "36.0.1");
+ scoped_refptr<FirefoxImporter> importer = new FirefoxImporter;
+ importer::SourceProfile profile;
+ profile.source_path = places_path;
+ scoped_refptr<MockImporterBridge> bridge = new MockImporterBridge;
+ std::vector<ImporterURLRow> history;
+ EXPECT_CALL(*bridge, NotifyStarted());
+ EXPECT_CALL(*bridge, NotifyItemStarted(importer::HISTORY));
+ EXPECT_CALL(*bridge, SetHistoryItems(_, _))
+ .WillOnce(::testing::SaveArg<0>(&(history)));
+ EXPECT_CALL(*bridge, NotifyItemEnded(importer::HISTORY));
+ EXPECT_CALL(*bridge, NotifyEnded());
+ importer->StartImport(profile, importer::HISTORY, bridge.get());
+ EXPECT_EQ(2, history.size());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/36.0.1/firstrun/",
+ history[0].url.spec());
+ EXPECT_EQ("http://google.com/", history[1].url.spec());
+}
+
+TEST(FirefoxImporterTest, ImportBookmarksSchemaV31) {
+ using ::testing::_;
+ base::FilePath places_path;
+ ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &places_path));
+ places_path =
+ places_path.AppendASCII("import").AppendASCII("firefox").AppendASCII(
+ "48.0.2");
+ scoped_refptr<FirefoxImporter> importer = new FirefoxImporter;
+ importer::SourceProfile profile;
+ profile.source_path = places_path;
+ scoped_refptr<MockImporterBridge> bridge = new MockImporterBridge;
+ std::vector<ImportedBookmarkEntry> bookmarks;
+ favicon_base::FaviconUsageDataList favicons;
+ EXPECT_CALL(*bridge, NotifyStarted());
+ EXPECT_CALL(*bridge, NotifyItemStarted(importer::FAVORITES));
+ EXPECT_CALL(*bridge, AddBookmarks(_, _))
+ .WillOnce(::testing::SaveArg<0>(&(bookmarks)));
+ EXPECT_CALL(*bridge, SetFavicons(_))
+ .WillOnce(::testing::SaveArg<0>(&(favicons)));
+ EXPECT_CALL(*bridge, NotifyItemEnded(importer::FAVORITES));
+ EXPECT_CALL(*bridge, NotifyEnded());
+ importer->StartImport(profile, importer::FAVORITES, bridge.get());
+ ASSERT_EQ(6, bookmarks.size());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/central/",
+ bookmarks[0].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/help/",
+ bookmarks[1].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/customize/",
+ bookmarks[2].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/contribute/",
+ bookmarks[3].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/about/", bookmarks[4].url.spec());
+ EXPECT_EQ("https://www.google.com/", bookmarks[5].url.spec());
+ ASSERT_EQ(5, favicons.size());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/0-1473403921346",
+ favicons[0].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/1-1473403921347",
+ favicons[1].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/2-1473403921348",
+ favicons[2].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/3-1473403921349",
+ favicons[3].favicon_url.spec());
+ EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/4-1473403921349",
+ favicons[4].favicon_url.spec());
+}
+
+TEST(FirefoxImporterTest, ImportHistorySchemaV31) {
+ using ::testing::_;
+ base::FilePath places_path;
+ ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &places_path));
+ places_path =
+ places_path.AppendASCII("import").AppendASCII("firefox").AppendASCII(
+ "48.0.2");
+ scoped_refptr<FirefoxImporter> importer = new FirefoxImporter;
+ importer::SourceProfile profile;
+ profile.source_path = places_path;
+ scoped_refptr<MockImporterBridge> bridge = new MockImporterBridge;
+ std::vector<ImporterURLRow> history;
+ EXPECT_CALL(*bridge, NotifyStarted());
+ EXPECT_CALL(*bridge, NotifyItemStarted(importer::HISTORY));
+ EXPECT_CALL(*bridge, SetHistoryItems(_, _))
+ .WillOnce(::testing::SaveArg<0>(&(history)));
+ EXPECT_CALL(*bridge, NotifyItemEnded(importer::HISTORY));
+ EXPECT_CALL(*bridge, NotifyEnded());
+ importer->StartImport(profile, importer::HISTORY, bridge.get());
+ ASSERT_EQ(3, history.size());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/48.0.2/firstrun/learnmore/",
+ history[0].url.spec());
+ EXPECT_EQ("https://www.mozilla.org/en-US/firefox/48.0.2/firstrun/",
+ history[1].url.spec());
+ EXPECT_EQ("http://google.com/", history[2].url.spec());
+}
« no previous file with comments | « chrome/utility/importer/firefox_importer.cc ('k') | chrome/utility/importer/firefox_places_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698