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

Unified Diff: chrome/browser/cocoa/page_info_window_controller_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/page_info_window_controller_unittest.mm
===================================================================
--- chrome/browser/cocoa/page_info_window_controller_unittest.mm (revision 32421)
+++ chrome/browser/cocoa/page_info_window_controller_unittest.mm (working copy)
@@ -2,37 +2,36 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import <Cocoa/Cocoa.h>
-
#include "base/scoped_nsobject.h"
#import "chrome/browser/cocoa/page_info_window_controller.h"
#include "chrome/browser/cocoa/browser_test_helper.h"
#import "chrome/browser/cocoa/cocoa_test_helper.h"
-#include "chrome/common/pref_names.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/platform_test.h"
-class PageInfoWindowControllerTest : public PlatformTest {
+class PageInfoWindowControllerTest : public CocoaTest {
virtual void SetUp() {
- controller_.reset([[PageInfoWindowController alloc] init]);
+ CocoaTest::SetUp();
+ controller_ = [[PageInfoWindowController alloc] init];
+ EXPECT_TRUE([controller_ window]);
}
+ virtual void TearDown() {
+ [controller_ close];
+ CocoaTest::TearDown();
+ }
+
public:
- CocoaTestHelper cocoa_helper_; // Inits Cocoa, creates window, etc...
BrowserTestHelper helper_;
- scoped_nsobject<PageInfoWindowController> controller_;
+ PageInfoWindowController* controller_;
};
TEST_F(PageInfoWindowControllerTest, TestImages) {
- [controller_ window]; // Force nib load.
EXPECT_TRUE([controller_ goodImg]);
EXPECT_TRUE([controller_ badImg]);
}
TEST_F(PageInfoWindowControllerTest, TestGrow) {
- [controller_ window]; // Force nib load.
NSRect frame = [[controller_ window] frame];
[controller_ setShowHistoryBox:YES];
NSRect newFrame = [[controller_ window] frame];
@@ -42,7 +41,6 @@
TEST_F(PageInfoWindowControllerTest, TestShrink) {
- [controller_ window]; // Force nib to load.
[controller_ setShowHistoryBox:YES];
NSRect frame = [[controller_ window] frame];
[controller_ setShowHistoryBox:NO];
« no previous file with comments | « chrome/browser/cocoa/nswindow_local_state_unittest.mm ('k') | chrome/browser/cocoa/preferences_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698