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

Side by Side Diff: chrome/browser/cocoa/bookmark_editor_controller_unittest.mm

Issue 178037: Make all of our unit tests be PlatformTests to get an autorelease pool.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #import "chrome/browser/cocoa/bookmark_editor_controller.h" 8 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
9 #include "chrome/browser/cocoa/browser_test_helper.h" 9 #include "chrome/browser/cocoa/browser_test_helper.h"
10 #import "chrome/browser/cocoa/cocoa_test_helper.h" 10 #import "chrome/browser/cocoa/cocoa_test_helper.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "testing/platform_test.h"
12 13
13 class BookmarkEditorControllerTest : public testing::Test { 14 class BookmarkEditorControllerTest : public PlatformTest {
14 public: 15 public:
15 CocoaTestHelper cocoa_helper_; // Inits Cocoa, creates window, etc... 16 CocoaTestHelper cocoa_helper_; // Inits Cocoa, creates window, etc...
16 BrowserTestHelper helper_; 17 BrowserTestHelper helper_;
17 scoped_nsobject<BookmarkEditorController> bar_; 18 scoped_nsobject<BookmarkEditorController> bar_;
18 }; 19 };
19 20
20 TEST_F(BookmarkEditorControllerTest, NoNodeNoTree) { 21 TEST_F(BookmarkEditorControllerTest, NoNodeNoTree) {
21 BookmarkModel* model = helper_.profile()->GetBookmarkModel(); 22 BookmarkModel* model = helper_.profile()->GetBookmarkModel();
22 const BookmarkNode* parent = model->GetBookmarkBarNode(); 23 const BookmarkNode* parent = model->GetBookmarkBarNode();
23 const BookmarkNode* node = NULL; 24 const BookmarkNode* node = NULL;
(...skipping 28 matching lines...) Expand all
52 configuration:BookmarkEditor::SHOW_TREE 53 configuration:BookmarkEditor::SHOW_TREE
53 handler:nil]); 54 handler:nil]);
54 55
55 EXPECT_NE((NSWindow*)nil, [controller window]); // Forces a nib load 56 EXPECT_NE((NSWindow*)nil, [controller window]); // Forces a nib load
56 EXPECT_TRUE([@"ooh title" isEqual:[controller displayName]]); 57 EXPECT_TRUE([@"ooh title" isEqual:[controller displayName]]);
57 EXPECT_TRUE([[NSString stringWithCString:url_name 58 EXPECT_TRUE([[NSString stringWithCString:url_name
58 encoding:NSUTF8StringEncoding] 59 encoding:NSUTF8StringEncoding]
59 isEqual:[controller displayURL]]); 60 isEqual:[controller displayURL]]);
60 } 61 }
61 62
62 TEST_F(BookmarkEditorControllerTest, UserEditsStuff) { 63 TEST_F(BookmarkEditorControllerTest, DISABLED_UserEditsStuff) {
Mark Mentovai 2009/08/31 19:03:24 Intentionally disabling this?
pink (ping after 24hrs) 2009/08/31 19:06:04 Done.
63 BookmarkModel* model = helper_.profile()->GetBookmarkModel(); 64 BookmarkModel* model = helper_.profile()->GetBookmarkModel();
64 const BookmarkNode* parent = model->GetBookmarkBarNode(); 65 const BookmarkNode* parent = model->GetBookmarkBarNode();
65 const char* url_name = "http://www.zim-bop-a-dee.com/"; 66 const char* url_name = "http://www.zim-bop-a-dee.com/";
66 const BookmarkNode* node = model->AddURL(parent, 0, L"ooh title", 67 const BookmarkNode* node = model->AddURL(parent, 0, L"ooh title",
67 GURL(url_name)); 68 GURL(url_name));
68 69
69 scoped_nsobject<BookmarkEditorController> 70 scoped_nsobject<BookmarkEditorController>
70 controller([[BookmarkEditorController alloc] 71 controller([[BookmarkEditorController alloc]
71 initWithParentWindow:cocoa_helper_.window() 72 initWithParentWindow:cocoa_helper_.window()
72 profile:helper_.profile() 73 profile:helper_.profile()
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 child = parent->GetChild(0); 107 child = parent->GetChild(0);
107 EXPECT_TRUE(child->GetURL().is_valid()); 108 EXPECT_TRUE(child->GetURL().is_valid());
108 109
109 // Confirm OK button enabled/disabled as appropriate. 110 // Confirm OK button enabled/disabled as appropriate.
110 EXPECT_TRUE([controller okButtonEnabled]); 111 EXPECT_TRUE([controller okButtonEnabled]);
111 [controller setDisplayURL:@""]; 112 [controller setDisplayURL:@""];
112 EXPECT_FALSE([controller okButtonEnabled]); 113 EXPECT_FALSE([controller okButtonEnabled]);
113 [controller setDisplayURL:@"http://www.cnn.com"]; 114 [controller setDisplayURL:@"http://www.cnn.com"];
114 EXPECT_TRUE([controller okButtonEnabled]); 115 EXPECT_TRUE([controller okButtonEnabled]);
115 } 116 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698