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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/importer/bookmark_html_writer_unittest.cc

Issue 18501013: Move most importer code to chrome/utility/importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac4 Created 7 years, 5 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
« chrome/browser/bookmarks/DEPS ('K') | « chrome/browser/importer/bookmark_html_reader_unittest.cc ('k') | chrome/browser/importer/bookmarks_file_importer.h » ('j') | chrome/browser/importer/firefox_importer_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/bookmark_html_writer_unittest.cc
diff --git a/chrome/browser/importer/bookmark_html_writer_unittest.cc b/chrome/browser/importer/bookmark_html_writer_unittest.cc
deleted file mode 100644
index 37beb814b577a5500a19912c1dc438489ecac26c..0000000000000000000000000000000000000000
--- a/chrome/browser/importer/bookmark_html_writer_unittest.cc
+++ /dev/null
@@ -1,283 +0,0 @@
-// 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 "chrome/browser/bookmarks/bookmark_html_writer.h"
-
-#include "base/files/scoped_temp_dir.h"
-#include "base/i18n/time_formatting.h"
-#include "base/path_service.h"
-#include "base/run_loop.h"
-#include "base/strings/string16.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/time/time.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/favicon/favicon_service.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
-#include "chrome/browser/history/history_service.h"
-#include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/importer/bookmark_html_reader.h"
-#include "chrome/common/importer/imported_bookmark_entry.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
-#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/test/test_browser_thread_bundle.h"
-#include "grit/generated_resources.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/codec/png_codec.h"
-
-using content::BrowserThread;
-
-namespace {
-
-const int kIconWidth = 16;
-const int kIconHeight = 16;
-
-void MakeTestSkBitmap(int w, int h, SkBitmap* bmp) {
- bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
- bmp->allocPixels();
-
- uint32_t* src_data = bmp->getAddr32(0, 0);
- for (int i = 0; i < w * h; i++) {
- src_data[i] = SkPreMultiplyARGB(i % 255, i % 250, i % 245, i % 240);
- }
-}
-
-} // namespace
-
-class BookmarkHTMLWriterTest : public testing::Test {
- protected:
- virtual void SetUp() {
- testing::Test::SetUp();
- ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- path_ = temp_dir_.path().AppendASCII("bookmarks.html");
- }
-
- // Converts an ImportedBookmarkEntry to a string suitable for assertion
- // testing.
- string16 BookmarkEntryToString(const ImportedBookmarkEntry& entry) {
- string16 result;
- result.append(ASCIIToUTF16("on_toolbar="));
- if (entry.in_toolbar)
- result.append(ASCIIToUTF16("true"));
- else
- result.append(ASCIIToUTF16("false"));
-
- result.append(ASCIIToUTF16(" url=") + UTF8ToUTF16(entry.url.spec()));
-
- result.append(ASCIIToUTF16(" path="));
- for (size_t i = 0; i < entry.path.size(); ++i) {
- if (i != 0)
- result.append(ASCIIToUTF16("/"));
- result.append(entry.path[i]);
- }
-
- result.append(ASCIIToUTF16(" title="));
- result.append(entry.title);
-
- result.append(ASCIIToUTF16(" time="));
- result.append(base::TimeFormatFriendlyDateAndTime(entry.creation_time));
- return result;
- }
-
- // Creates a set of bookmark values to a string for assertion testing.
- string16 BookmarkValuesToString(bool on_toolbar,
- const GURL& url,
- const string16& title,
- base::Time creation_time,
- const string16& f1,
- const string16& f2,
- const string16& f3) {
- ImportedBookmarkEntry entry;
- entry.in_toolbar = on_toolbar;
- entry.url = url;
- if (!f1.empty()) {
- entry.path.push_back(f1);
- if (!f2.empty()) {
- entry.path.push_back(f2);
- if (!f3.empty())
- entry.path.push_back(f3);
- }
- }
- entry.title = title;
- entry.creation_time = creation_time;
- return BookmarkEntryToString(entry);
- }
-
- void AssertBookmarkEntryEquals(const ImportedBookmarkEntry& entry,
- bool on_toolbar,
- const GURL& url,
- const string16& title,
- base::Time creation_time,
- const string16& f1,
- const string16& f2,
- const string16& f3) {
- EXPECT_EQ(BookmarkValuesToString(on_toolbar, url, title, creation_time,
- f1, f2, f3),
- BookmarkEntryToString(entry));
- }
-
- base::ScopedTempDir temp_dir_;
- base::FilePath path_;
-};
-
-// Class that will notify message loop when file is written.
-class BookmarksObserver : public BookmarksExportObserver {
- public:
- explicit BookmarksObserver(base::RunLoop* loop) : loop_(loop) {
- DCHECK(loop);
- }
-
- virtual void OnExportFinished() OVERRIDE {
- loop_->Quit();
- }
-
- private:
- base::RunLoop* loop_;
-
- DISALLOW_COPY_AND_ASSIGN(BookmarksObserver);
-};
-
-// Tests bookmark_html_writer by populating a BookmarkModel, writing it out by
-// way of bookmark_html_writer, then using the importer to read it back in.
-TEST_F(BookmarkHTMLWriterTest, Test) {
- content::TestBrowserThreadBundle thread_bundle;
-
- TestingProfile profile;
- profile.CreateHistoryService(true, false);
- profile.BlockUntilHistoryProcessesPendingRequests();
- profile.CreateFaviconService();
- profile.CreateBookmarkModel(true);
-
- BookmarkModel* model = BookmarkModelFactory::GetForProfile(&profile);
- ui_test_utils::WaitForBookmarkModelToLoad(model);
-
- // Create test PNG representing favicon for url1.
- SkBitmap bitmap;
- MakeTestSkBitmap(kIconWidth, kIconHeight, &bitmap);
- std::vector<unsigned char> icon_data;
- gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, &icon_data);
-
- // Populate the BookmarkModel. This creates the following bookmark structure:
- // Bookmarks bar
- // F1
- // url1
- // F2
- // url2
- // url3
- // url4
- // Other
- // url1
- // url2
- // F3
- // F4
- // url1
- // Mobile
- // url1
- // <bookmark without a title.>
- string16 f1_title = ASCIIToUTF16("F\"&;<1\"");
- string16 f2_title = ASCIIToUTF16("F2");
- string16 f3_title = ASCIIToUTF16("F 3");
- string16 f4_title = ASCIIToUTF16("F4");
- string16 url1_title = ASCIIToUTF16("url 1");
- string16 url2_title = ASCIIToUTF16("url&2");
- string16 url3_title = ASCIIToUTF16("url\"3");
- string16 url4_title = ASCIIToUTF16("url\"&;");
- string16 unnamed_bookmark_title = ASCIIToUTF16("");
- GURL url1("http://url1");
- GURL url1_favicon("http://url1/icon.ico");
- GURL url2("http://url2");
- GURL url3("http://url3");
- GURL url4("javascript:alert(\"Hello!\");");
- GURL unnamed_bookmark_url("about:blank");
- base::Time t1(base::Time::Now());
- base::Time t2(t1 + base::TimeDelta::FromHours(1));
- base::Time t3(t1 + base::TimeDelta::FromHours(1));
- base::Time t4(t1 + base::TimeDelta::FromHours(1));
- const BookmarkNode* f1 = model->AddFolder(
- model->bookmark_bar_node(), 0, f1_title);
- model->AddURLWithCreationTime(f1, 0, url1_title, url1, t1);
- HistoryServiceFactory::GetForProfile(&profile, Profile::EXPLICIT_ACCESS)->
- AddPage(url1, base::Time::Now(), history::SOURCE_BROWSED);
- FaviconServiceFactory::GetForProfile(
- &profile, Profile::EXPLICIT_ACCESS)->SetFavicons(
- url1, url1_favicon, chrome::FAVICON,
- gfx::Image::CreateFrom1xBitmap(bitmap));
- const BookmarkNode* f2 = model->AddFolder(f1, 1, f2_title);
- model->AddURLWithCreationTime(f2, 0, url2_title, url2, t2);
- model->AddURLWithCreationTime(model->bookmark_bar_node(),
- 1, url3_title, url3, t3);
-
- model->AddURLWithCreationTime(model->other_node(), 0, url1_title, url1, t1);
- model->AddURLWithCreationTime(model->other_node(), 1, url2_title, url2, t2);
- const BookmarkNode* f3 = model->AddFolder(model->other_node(), 2, f3_title);
- const BookmarkNode* f4 = model->AddFolder(f3, 0, f4_title);
- model->AddURLWithCreationTime(f4, 0, url1_title, url1, t1);
- model->AddURLWithCreationTime(model->bookmark_bar_node(), 2, url4_title,
- url4, t4);
- model->AddURLWithCreationTime(model->mobile_node(), 0, url1_title, url1, t1);
- model->AddURLWithCreationTime(model->mobile_node(), 1, unnamed_bookmark_title,
- unnamed_bookmark_url, t2);
-
- base::RunLoop run_loop;
-
- // Write to a temp file.
- BookmarksObserver observer(&run_loop);
- bookmark_html_writer::WriteBookmarks(&profile, path_, &observer);
- run_loop.Run();
-
- // Clear favicon so that it would be read from file.
- FaviconServiceFactory::GetForProfile(
- &profile, Profile::EXPLICIT_ACCESS)->SetFavicons(
- url1, url1_favicon, chrome::FAVICON, gfx::Image());
-
- // Read the bookmarks back in.
- std::vector<ImportedBookmarkEntry> parsed_bookmarks;
- std::vector<ImportedFaviconUsage> favicons;
- bookmark_html_reader::ImportBookmarksFile(base::Callback<bool(void)>(),
- base::Callback<bool(const GURL&)>(),
- path_,
- &parsed_bookmarks,
- &favicons);
-
- // Check loaded favicon (url1 is represented by 4 separate bookmarks).
- EXPECT_EQ(4U, favicons.size());
- for (size_t i = 0; i < favicons.size(); i++) {
- if (url1_favicon == favicons[i].favicon_url) {
- EXPECT_EQ(1U, favicons[i].urls.size());
- std::set<GURL>::const_iterator iter = favicons[i].urls.find(url1);
- ASSERT_TRUE(iter != favicons[i].urls.end());
- ASSERT_TRUE(*iter == url1);
- ASSERT_TRUE(favicons[i].png_data == icon_data);
- }
- }
-
- // Verify we got back what we wrote.
- ASSERT_EQ(9U, parsed_bookmarks.size());
- // Windows and ChromeOS builds use Sentence case.
- string16 bookmark_folder_name =
- l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_FOLDER_NAME);
- AssertBookmarkEntryEquals(parsed_bookmarks[0], true, url1, url1_title, t1,
- bookmark_folder_name, f1_title, string16());
- AssertBookmarkEntryEquals(parsed_bookmarks[1], true, url2, url2_title, t2,
- bookmark_folder_name, f1_title, f2_title);
- AssertBookmarkEntryEquals(parsed_bookmarks[2], true, url3, url3_title, t3,
- bookmark_folder_name, string16(), string16());
- AssertBookmarkEntryEquals(parsed_bookmarks[3], true, url4, url4_title, t4,
- bookmark_folder_name, string16(), string16());
- AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1,
- string16(), string16(), string16());
- AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2,
- string16(), string16(), string16());
- AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1,
- f3_title, f4_title, string16());
- AssertBookmarkEntryEquals(parsed_bookmarks[7], false, url1, url1_title, t1,
- string16(), string16(), string16());
- AssertBookmarkEntryEquals(parsed_bookmarks[8], false, unnamed_bookmark_url,
- unnamed_bookmark_title, t2,
- string16(), string16(), string16());
-}
« chrome/browser/bookmarks/DEPS ('K') | « chrome/browser/importer/bookmark_html_reader_unittest.cc ('k') | chrome/browser/importer/bookmarks_file_importer.h » ('j') | chrome/browser/importer/firefox_importer_utils.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698