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

Unified Diff: chrome/browser/cocoa/base_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/base_view_unittest.mm
===================================================================
--- chrome/browser/cocoa/base_view_unittest.mm (revision 32421)
+++ chrome/browser/cocoa/base_view_unittest.mm (working copy)
@@ -12,31 +12,20 @@
namespace {
-class BaseViewTest : public PlatformTest {
+class BaseViewTest : public CocoaTest {
public:
BaseViewTest() {
NSRect frame = NSMakeRect(0, 0, 100, 100);
- view_.reset([[BaseView alloc] initWithFrame:frame]);
- [cocoa_helper_.contentView() addSubview:view_.get()];
+ scoped_nsobject<BaseView> view([[BaseView alloc] initWithFrame:frame]);
+ view_ = view.get();
+ [[test_window() contentView] addSubview:view_];
}
- scoped_nsobject<BaseView> view_;
- CocoaTestHelper cocoa_helper_; // Inits Cocoa, creates window, etc...
+ BaseView* view_; // weak
};
-// Test adding/removing from the view hierarchy, mostly to ensure nothing
-// leaks or crashes.
-TEST_F(BaseViewTest, AddRemove) {
- EXPECT_EQ(cocoa_helper_.contentView(), [view_ superview]);
- [view_.get() removeFromSuperview];
- EXPECT_FALSE([view_ superview]);
-}
+TEST_VIEW(BaseViewTest, view_)
-// Test drawing, mostly to ensure nothing leaks or crashes.
-TEST_F(BaseViewTest, Display) {
- [view_ display];
-}
-
// Convert a rect in |view_|'s Cocoa coordinate system to gfx::Rect's top-left
// coordinate system. Repeat the process in reverse and make sure we come out
// with the original rect.

Powered by Google App Engine
This is Rietveld 408576698