| 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 TEST_F(BookmarkEditorControllerTest, EditAndConfirmOKButton) { | 131 TEST_F(BookmarkEditorControllerTest, EditAndConfirmOKButton) { |
| 132 // Confirm OK button enabled/disabled as appropriate: | 132 // Confirm OK button enabled/disabled as appropriate: |
| 133 // First test the URL. | 133 // First test the URL. |
| 134 EXPECT_TRUE([default_controller_ okButtonEnabled]); | 134 EXPECT_TRUE([default_controller_ okButtonEnabled]); |
| 135 [default_controller_ setDisplayURL:@""]; | 135 [default_controller_ setDisplayURL:@""]; |
| 136 EXPECT_FALSE([default_controller_ okButtonEnabled]); | 136 EXPECT_FALSE([default_controller_ okButtonEnabled]); |
| 137 [default_controller_ setDisplayURL:@"http://www.cnn.com"]; | 137 [default_controller_ setDisplayURL:@"http://www.cnn.com"]; |
| 138 EXPECT_TRUE([default_controller_ okButtonEnabled]); | 138 EXPECT_TRUE([default_controller_ okButtonEnabled]); |
| 139 // Then test the name. | 139 // Then test the name. |
| 140 [default_controller_ setDisplayName:@""]; | 140 [default_controller_ setDisplayName:@""]; |
| 141 EXPECT_FALSE([default_controller_ okButtonEnabled]); | 141 EXPECT_TRUE([default_controller_ okButtonEnabled]); |
| 142 [default_controller_ setDisplayName:@" "]; | 142 [default_controller_ setDisplayName:@" "]; |
| 143 EXPECT_TRUE([default_controller_ okButtonEnabled]); | 143 EXPECT_TRUE([default_controller_ okButtonEnabled]); |
| 144 // Then little mix of both. | 144 // Then little mix of both. |
| 145 [default_controller_ setDisplayName:@"name"]; | 145 [default_controller_ setDisplayName:@"name"]; |
| 146 EXPECT_TRUE([default_controller_ okButtonEnabled]); | 146 EXPECT_TRUE([default_controller_ okButtonEnabled]); |
| 147 [default_controller_ setDisplayURL:@""]; | 147 [default_controller_ setDisplayURL:@""]; |
| 148 EXPECT_FALSE([default_controller_ okButtonEnabled]); | 148 EXPECT_FALSE([default_controller_ okButtonEnabled]); |
| 149 } | 149 } |
| 150 | 150 |
| 151 class BookmarkEditorControllerTreeTest : public CocoaTest { | 151 class BookmarkEditorControllerTreeTest : public CocoaTest { |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 | 368 |
| OLD | NEW |