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

Unified Diff: chrome/browser/cocoa/background_tile_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/background_tile_view_unittest.mm
===================================================================
--- chrome/browser/cocoa/background_tile_view_unittest.mm (revision 32421)
+++ chrome/browser/cocoa/background_tile_view_unittest.mm (working copy)
@@ -8,34 +8,27 @@
#import "chrome/browser/cocoa/background_tile_view.h"
#import "chrome/browser/cocoa/cocoa_test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
namespace {
-class BackgroundTileViewTest : public testing::Test {
+class BackgroundTileViewTest : public CocoaTest {
public:
BackgroundTileViewTest() {
NSRect frame = NSMakeRect(0, 0, 100, 30);
- view_.reset([[BackgroundTileView alloc] initWithFrame:frame]);
- [cocoa_helper_.contentView() addSubview:view_.get()];
+ scoped_nsobject<BackgroundTileView> view([[BackgroundTileView alloc]
+ initWithFrame:frame]);
+ view_ = view.get();
+ [[test_window() contentView] addSubview:view_];
}
- CocoaTestHelper cocoa_helper_; // Inits Cocoa, creates window, etc...
- scoped_nsobject<BackgroundTileView> view_;
+ BackgroundTileView *view_;
};
-// Test adding/removing from the view hierarchy, mostly to ensure nothing
-// leaks or crashes.
-TEST_F(BackgroundTileViewTest, AddRemove) {
- EXPECT_EQ(cocoa_helper_.contentView(), [view_ superview]);
- [view_.get() removeFromSuperview];
- EXPECT_FALSE([view_ superview]);
-}
+TEST_VIEW(BackgroundTileViewTest, view_)
-// Test drawing, mostly to ensure nothing leaks or crashes.
-TEST_F(BackgroundTileViewTest, Display) {
- // Without image set.
- [view_ display];
- // And now with an image.
+// Test drawing with an Image
+TEST_F(BackgroundTileViewTest, DisplayImage) {
NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
[view_ setTileImage:image];
[view_ display];
« no previous file with comments | « chrome/browser/cocoa/background_gradient_view_unittest.mm ('k') | chrome/browser/cocoa/base_view_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698