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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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

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

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

index 4ed276c70f4401d4e6a8d350de0350aa384bc01a..88b29cd29033a402481b433812ca2a1c15d65e15 100644

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

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

@@ -7,7 +7,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"

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

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

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

@@ -725,11 +725,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {

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

"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "

"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- 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);

// Pop up a folder menu and drag in a button from the bar.

@@ -758,7 +757,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {

const std::string expected_string("2f:[ 2f1b 1b 2f2f:[ 2f2f1b "

"2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "

"4f2f1b 4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- EXPECT_EQ(expected_string, BookmarkModelTestUtils::ModelStringFromNode(root));

+ EXPECT_EQ(expected_string, test::ModelStringFromNode(root));

// Verify the window still appears by looking for its controller.

EXPECT_TRUE([bar_ folderController]);

@@ -789,7 +788,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {

[bar_ dragButton:draggedButton

to:[targetButton left]

copy:NO];

- EXPECT_EQ(model_string, BookmarkModelTestUtils::ModelStringFromNode(root));

+ EXPECT_EQ(model_string, test::ModelStringFromNode(root));

// Don't check the folder window since it's not supposed to be showing.

}

@@ -799,11 +798,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {

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

"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "

"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- 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);

// Pop up a folder menu and copy in a button from the bar.

@@ -831,7 +829,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {

const std::string expected_1("1b 2f:[ 2f1b 1b 2f2f:[ 2f2f1b "

"2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "

"4f2f1b 4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- EXPECT_EQ(expected_1, BookmarkModelTestUtils::ModelStringFromNode(root));

+ EXPECT_EQ(expected_1, test::ModelStringFromNode(root));

// Gather the new frames.

NSRect newToFolderFrame = [toFolder frame];

@@ -855,7 +853,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {

const std::string expected_2("1b 2f:[ 2f1b 1b 2f2f:[ 2f2f1b "

"2f2f2b 2f2f3b ] 2f3b ] 3b 1b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "

"4f2f1b 4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- EXPECT_EQ(expected_2, BookmarkModelTestUtils::ModelStringFromNode(root));

+ EXPECT_EQ(expected_2, test::ModelStringFromNode(root));

}

TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {

@@ -864,11 +862,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {

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

"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "

"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- 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);

// Pop up a folder menu and a subfolder menu.

@@ -906,7 +903,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {

const std::string expected_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b "

"2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "

"4f2f1b 4f2f2b 4f2f3b 5b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] ");

- EXPECT_EQ(expected_string, BookmarkModelTestUtils::ModelStringFromNode(root));

+ EXPECT_EQ(expected_string, test::ModelStringFromNode(root));

// Check button spacing.

[folderController validateMenuSpacing];

@@ -930,11 +927,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {

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

"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "

"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- 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);

// Pop up a folder menu.

@@ -961,7 +957,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {

const std::string expected_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b "

"2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f2f:[ 4f2f1b 4f2f2b 4f2f3b ] "

"4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- EXPECT_EQ(expected_string, BookmarkModelTestUtils::ModelStringFromNode(root));

+ EXPECT_EQ(expected_string, test::ModelStringFromNode(root));

// The window should not have gone away.

EXPECT_TRUE([bar_ folderController]);

@@ -980,11 +976,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragParentOntoChild) {

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

"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "

"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- 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);

// Pop up a folder menu.

@@ -1006,7 +1001,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragParentOntoChild) {

to:[targetButton top]

copy:NO];

// The model should not have changed.

- EXPECT_EQ(model_string, BookmarkModelTestUtils::ModelStringFromNode(root));

+ EXPECT_EQ(model_string, test::ModelStringFromNode(root));

// Check button spacing.

[folderController validateMenuSpacing];

@@ -1018,11 +1013,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {

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

"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "

"4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- 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);

// Pop up a folder menu and a subfolder menu.

@@ -1055,7 +1049,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {

const std::string expected_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "

"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f3b 4f2f:[ "

"4f2f1b 4f2f2b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");

- EXPECT_EQ(expected_string, BookmarkModelTestUtils::ModelStringFromNode(root));

+ EXPECT_EQ(expected_string, test::ModelStringFromNode(root));

// Check button spacing.

[folderController validateMenuSpacing];

@@ -1068,13 +1062,12 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {

TEST_F(BookmarkBarFolderControllerMenuTest, DragWindowResizing) {

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

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

- const std::string

- model_string("a b:[ b1 b2 b3 ] reallyReallyLongBookmarkName c ");

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

+ const std::string model_string(

+ "a b:[ b1 b2 b3 ] reallyReallyLongBookmarkName c ");

+ 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);

// Pop up a folder menu.

@@ -1098,9 +1091,9 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragWindowResizing) {

to:[targetButton center]

copy:NO];

// Verify the model change.

- const std::string

- expected_string("a b:[ b1 reallyReallyLongBookmarkName b2 b3 ] c ");

- EXPECT_EQ(expected_string, BookmarkModelTestUtils::ModelStringFromNode(root));

+ const std::string expected_string(

+ "a b:[ b1 reallyReallyLongBookmarkName b2 b3 ] c ");

+ EXPECT_EQ(expected_string, test::ModelStringFromNode(root));

// Verify the window grew. Just test a reasonable width gain.

CGFloat newWidth = NSWidth([toWindow frame]);

EXPECT_LT(oldWidth + 30.0, newWidth);

@@ -1110,11 +1103,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MoveRemoveAddButtons) {

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 actualModelString =

- BookmarkModelTestUtils::ModelStringFromNode(root);

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

EXPECT_EQ(model_string, actualModelString);

// Pop up a folder menu.

@@ -1174,11 +1166,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, 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.

@@ -1210,11 +1201,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {

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

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

const std::string model_string("1b 2b 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);

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

@@ -1375,16 +1365,16 @@ TEST_F(BookmarkBarFolderControllerMenuTest, 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);

// Pop open a folder.

@@ -1409,7 +1399,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {

// Verify the model.

const std::string expected("1b 2f:[ O3f:[ O3f1b O3f2f ] 2f1b 2f2f:[ 2f2f1b "

"2f2f2b 2f2f3b ] 2f3b ] 3b 4b ");

- actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ actual = test::ModelStringFromNode(root);

EXPECT_EQ(expected, actual);

// Now drag over a folder button.

@@ -1425,7 +1415,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {

const std::string expectedA("1b 2f:[ O3f:[ O3f1b O3f2f ] 2f1b 2f2f:[ "

"2f2f1b 2f2f2b 2f2f3b O4f:[ O4f1b O4f2f ] ] "

"2f3b ] 3b 4b ");

- actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ actual = test::ModelStringFromNode(root);

EXPECT_EQ(expectedA, actual);

// Check button spacing.

@@ -1437,10 +1427,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, 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);

const BookmarkNode* folderNode = root->GetChild(1);

@@ -1468,7 +1458,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkDataToTrash) {

// Verify the model.

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

"2f3b ] 3b 4b ");

- actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ actual = test::ModelStringFromNode(root);

EXPECT_EQ(expected, actual);

// Check button spacing.

@@ -1480,10 +1470,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, 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);

// Pop open a folder.

@@ -1513,7 +1503,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, AddURLs) {

// Verify the model.

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

"2f2f3b ] 2f3b ] 3b 4b ");

- actual = BookmarkModelTestUtils::ModelStringFromNode(root);

+ actual = test::ModelStringFromNode(root);

EXPECT_EQ(expected, actual);

// Check button spacing.

@@ -1525,10 +1515,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DropPositionIndicator) {

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);

// Pop open the folder.

@@ -1584,11 +1574,10 @@ TEST_F(BookmarkBarFolderControllerClosingTest, DeleteClosesFolder) {

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

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

"2f3b ] 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);

// Open the folder menu and submenu.

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »