chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm - Issue 23570009: bookmarks: Cleanup, remove BookmarkModelTestUtils class.

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 23570009: bookmarks: Cleanup, remove BookmarkModelTestUtils class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

index 5c578b74d891e509d18da8b4c231cb76db5de955..801a06a60bdc7d33d5002dd5ed7435f75a839f48 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

@@ -13,7 +13,7 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/bookmarks/bookmark_model.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

-#include "chrome/browser/bookmarks/bookmark_model_test_utils.h"

+#include "chrome/browser/bookmarks/bookmark_test_helpers.h"

#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/extensions/test_extension_system.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"

@@ -1237,11 +1237,10 @@ TEST_F(BookmarkBarControllerTest, TestFolderButtons) {

BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b 4f:[ 4f1b 4f2b ] ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

// Validate initial model and that we do not have a folder controller.

- std::string actualModelString =

- BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actualModelString = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actualModelString);

EXPECT_FALSE([bar_ folderController]);

@@ -1452,11 +1451,10 @@ TEST_F(BookmarkBarControllerTest, MoveRemoveAddButtons) {

BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

// Validate initial model.

- std::string actualModelString =

- BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actualModelString = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actualModelString);

// Remember how many buttons are showing.

@@ -1526,7 +1524,7 @@ TEST_F(BookmarkBarControllerTest, LastBookmarkResizeBehavior) {

BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

[bar_ frameDidChange];

CGFloat viewWidths[] = { 123.0, 124.0, 151.0, 152.0, 153.0, 154.0, 155.0,

@@ -1562,7 +1560,7 @@ TEST_F(BookmarkBarControllerWithInstantExtendedTest,

BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

[bar_ frameDidChange];

// Apps page shortcut button should be visible.

@@ -1766,11 +1764,10 @@ TEST_F(BookmarkBarControllerDragDropTest, DragMoveBarBookmarkToOffTheSide) {

"3bWithLongName 4bWithLongName 5bWithLongName 6bWithLongName "

"7bWithLongName 8bWithLongName 9bWithLongName 10bWithLongName "

"11bWithLongName 12bWithLongName 13b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

// Validate initial model.

- std::string actualModelString =

- BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actualModelString = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actualModelString);

// Insure that the off-the-side is not showing.

@@ -1819,18 +1816,16 @@ TEST_F(BookmarkBarControllerDragDropTest, DragOffTheSideToOther) {

"11bWithLongName 12bWithLongName 13bWithLongName 14bWithLongName "

"15bWithLongName 16bWithLongName 17bWithLongName 18bWithLongName "

"19bWithLongName 20bWithLongName ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

const BookmarkNode* other = model->other_node();

const std::string other_string("1other 2other 3other ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, other, other_string);

+ test::AddNodesFromModelString(model, other, other_string);

// Validate initial model.

- std::string actualModelString =

- BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actualModelString = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actualModelString);

- std::string actualOtherString =

- BookmarkModelTestUtils::ModelStringFromNode(other);

+ std::string actualOtherString = test::ModelStringFromNode(other);

EXPECT_EQ(other_string, actualOtherString);

// Insure that the off-the-side is showing.

@@ -1874,16 +1869,16 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "

"2f3b ] 3b 4b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

const BookmarkNode* other = model->other_node();

const std::string other_string("O1b O2b O3f:[ O3f1b O3f2f ] "

"O4f:[ O4f1b O4f2f ] 05b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, other, other_string);

+ test::AddNodesFromModelString(model, other, other_string);

// Validate initial model.

- std::string actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actual = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actual);

- actual = BookmarkModelTestUtils::ModelStringFromNode(other);

+ actual = test::ModelStringFromNode(other);

EXPECT_EQ(other_string, actual);

// Remember the little ones.

@@ -1905,7 +1900,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {

// Verify the model.

const std::string expected("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "

"2f3b ] O3f:[ O3f1b O3f2f ] 3b 4b ");

- actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ actual = test::ModelStringFromNode(root);

EXPECT_EQ(expected, actual);

oldChildCount = newChildCount;

@@ -1925,7 +1920,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {

const std::string expected1("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "

"2f3b O4f:[ O4f1b O4f2f ] ] O3f:[ O3f1b O3f2f ] "

"3b 4b ");

- actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ actual = test::ModelStringFromNode(root);

EXPECT_EQ(expected1, actual);

}

@@ -1934,10 +1929,10 @@ TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "

"2f3b ] 3b 4b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

// Validate initial model.

- std::string actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actual = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actual);

// Remember the children.

@@ -1957,7 +1952,7 @@ TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {

// Verify the model.

const std::string expected("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "

"2f3b ] SiteA SiteB 3b 4b ");

- actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ actual = test::ModelStringFromNode(root);

EXPECT_EQ(expected, actual);

}

@@ -1965,11 +1960,10 @@ TEST_F(BookmarkBarControllerDragDropTest, ControllerForNode) {

BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

// Validate initial model.

- std::string actualModelString =

- BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actualModelString = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actualModelString);

// Find the main bar controller.

@@ -1982,10 +1976,10 @@ TEST_F(BookmarkBarControllerDragDropTest, DropPositionIndicator) {

BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

// Validate initial model.

- std::string actualModel = BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actualModel = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actualModel);

// Test a series of points starting at the right edge of the bar.

@@ -2052,10 +2046,10 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkDataToTrash) {

const BookmarkNode* root = model->bookmark_bar_node();

const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "

"2f3b ] 3b 4b ");

- BookmarkModelTestUtils::AddNodesFromModelString(model, root, model_string);

+ test::AddNodesFromModelString(model, root, model_string);

// Validate initial model.

- std::string actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ std::string actual = test::ModelStringFromNode(root);

EXPECT_EQ(model_string, actual);

int oldChildCount = root->child_count();

@@ -2072,7 +2066,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkDataToTrash) {

// Verify the model.

const std::string expected("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "

"2f3b ] 4b ");

- actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ actual = test::ModelStringFromNode(root);

EXPECT_EQ(expected, actual);

// Verify that the other bookmark folder can't be deleted.