| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "base/scoped_nsobject.h" | 7 #include "base/scoped_nsobject.h" |
| 8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
| 9 #import "chrome/browser/cocoa/bookmark_editor_controller.h" | 9 #import "chrome/browser/cocoa/bookmark_editor_controller.h" |
| 10 #include "chrome/browser/cocoa/browser_test_helper.h" | 10 #include "chrome/browser/cocoa/browser_test_helper.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 model.AddURL(group_a_, 1, L"a-1", GURL("http://a-1.com")); | 176 model.AddURL(group_a_, 1, L"a-1", GURL("http://a-1.com")); |
| 177 model.AddURL(group_a_, 2, L"a-2", GURL("http://a-2.com")); | 177 model.AddURL(group_a_, 2, L"a-2", GURL("http://a-2.com")); |
| 178 | 178 |
| 179 group_b_ = model.AddGroup(root, 1, L"b"); | 179 group_b_ = model.AddGroup(root, 1, L"b"); |
| 180 model.AddURL(group_b_, 0, L"b-0", GURL("http://b-0.com")); | 180 model.AddURL(group_b_, 0, L"b-0", GURL("http://b-0.com")); |
| 181 group_bb_ = model.AddGroup(group_b_, 1, L"bb"); | 181 group_bb_ = model.AddGroup(group_b_, 1, L"bb"); |
| 182 model.AddURL(group_bb_, 0, L"bb-0", GURL("http://bb-0.com")); | 182 model.AddURL(group_bb_, 0, L"bb-0", GURL("http://bb-0.com")); |
| 183 model.AddURL(group_bb_, 1, L"bb-1", GURL("http://bb-1.com")); | 183 model.AddURL(group_bb_, 1, L"bb-1", GURL("http://bb-1.com")); |
| 184 model.AddURL(group_bb_, 2, L"bb-2", GURL("http://bb-2.com")); | 184 model.AddURL(group_bb_, 2, L"bb-2", GURL("http://bb-2.com")); |
| 185 bookmark_bb_3_ = | 185 bookmark_bb_3_ = |
| 186 model.AddURL(group_bb_, 3, L"bb-3", GURL("http://bb-3.com")); | 186 model.AddURL(group_bb_, 3, L"bb-3", GURL("http://bb-3.com")); |
| 187 model.AddURL(group_bb_, 4, L"bb-4", GURL("http://bb-4.com")); | 187 model.AddURL(group_bb_, 4, L"bb-4", GURL("http://bb-4.com")); |
| 188 model.AddURL(group_b_, 2, L"b-2", GURL("http://b-2.com")); | 188 model.AddURL(group_b_, 2, L"b-1", GURL("http://b-2.com")); |
| 189 model.AddURL(group_b_, 3, L"b-2", GURL("http://b-3.com")); | 189 model.AddURL(group_b_, 3, L"b-2", GURL("http://b-3.com")); |
| 190 | 190 |
| 191 group_c_ = model.AddGroup(root, 2, L"c"); | 191 group_c_ = model.AddGroup(root, 2, L"c"); |
| 192 model.AddURL(group_c_, 0, L"c-0", GURL("http://c-0.com")); | 192 model.AddURL(group_c_, 0, L"c-0", GURL("http://c-0.com")); |
| 193 model.AddURL(group_c_, 1, L"c-1", GURL("http://c-1.com")); | 193 model.AddURL(group_c_, 1, L"c-1", GURL("http://c-1.com")); |
| 194 model.AddURL(group_c_, 2, L"c-2", GURL("http://c-2.com")); | 194 model.AddURL(group_c_, 2, L"c-2", GURL("http://c-2.com")); |
| 195 model.AddURL(group_c_, 3, L"c-3", GURL("http://c-3.com")); | 195 model.AddURL(group_c_, 3, L"c-3", GURL("http://c-3.com")); |
| 196 | 196 |
| 197 model.AddURL(root, 3, L"d", GURL("http://d-0.com")); | 197 model.AddURL(root, 3, L"d", GURL("http://d-0.com")); |
| 198 } | 198 } |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 | 358 |
| 359 TEST_F(BookmarkEditorControllerTreeNoParentTest, AddFolderWithNoGroupSelected) { | 359 TEST_F(BookmarkEditorControllerTreeNoParentTest, AddFolderWithNoGroupSelected) { |
| 360 [default_controller_ newFolder:nil]; | 360 [default_controller_ newFolder:nil]; |
| 361 [default_controller_ cancel:nil]; | 361 [default_controller_ cancel:nil]; |
| 362 BookmarkModel* model = helper_.profile()->GetBookmarkModel(); | 362 BookmarkModel* model = helper_.profile()->GetBookmarkModel(); |
| 363 const BookmarkNode* bookmarkBar = model->GetBookmarkBarNode(); | 363 const BookmarkNode* bookmarkBar = model->GetBookmarkBarNode(); |
| 364 EXPECT_EQ(5, bookmarkBar->GetChildCount()); | 364 EXPECT_EQ(5, bookmarkBar->GetChildCount()); |
| 365 const BookmarkNode* folderChild = bookmarkBar->GetChild(4); | 365 const BookmarkNode* folderChild = bookmarkBar->GetChild(4); |
| 366 EXPECT_EQ(folderChild->GetTitle(), L"New folder"); | 366 EXPECT_EQ(folderChild->GetTitle(), L"New folder"); |
| 367 } | 367 } |
| 368 | |
| OLD | NEW |