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

Unified Diff: chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm

Issue 402066: Moved a whole pile of unittests over to CocoaTest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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/cocoa/bookmark_bar_toolbar_view_unittest.mm
===================================================================
--- chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm (revision 32421)
+++ chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm (working copy)
@@ -69,28 +69,23 @@
@synthesize isShownAsDetachedBar = isShownAsDetachedBar_;
@end
-class BookmarkBarToolbarViewTest : public PlatformTest {
+class BookmarkBarToolbarViewTest : public CocoaTest {
public:
BookmarkBarToolbarViewTest() {
controller_.reset([[DrawDetachedBarFakeController alloc] init]);
NSRect frame = NSMakeRect(0, 0, 400, 40);
- view_.reset([[BookmarkBarToolbarView alloc] initWithFrame:frame]);
- [cocoa_helper_.contentView() addSubview:view_.get()];
- [view_.get() setController:controller_.get()];
+ scoped_nsobject<BookmarkBarToolbarView> view(
+ [[BookmarkBarToolbarView alloc] initWithFrame:frame]);
+ view_ = view.get();
+ [[test_window() contentView] addSubview:view_];
+ [view_ setController:controller_.get()];
}
- CocoaTestHelper cocoa_helper_; // Inits Cocoa, creates window, etc...
scoped_nsobject<DrawDetachedBarFakeController> controller_;
- scoped_nsobject<BookmarkBarToolbarView> view_;
+ BookmarkBarToolbarView* view_;
};
-// Test adding/removing from the view hierarchy, mostly to ensure nothing
-// leaks or crashes.
-TEST_F(BookmarkBarToolbarViewTest, AddRemove) {
- EXPECT_EQ(cocoa_helper_.contentView(), [view_ superview]);
- [view_.get() removeFromSuperview];
- EXPECT_FALSE([view_ superview]);
-}
+TEST_VIEW(BookmarkBarToolbarViewTest, view_)
// Test drawing (part 1), mostly to ensure nothing leaks or crashes.
TEST_F(BookmarkBarToolbarViewTest, DisplayAsNormalBar) {
« no previous file with comments | « chrome/browser/cocoa/bookmark_bar_controller_unittest.mm ('k') | chrome/browser/cocoa/bookmark_bar_view_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698