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

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

Issue 201116: Reverting 26214. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/focus_tracker.mm ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/focus_tracker_unittest.mm
===================================================================
--- chrome/browser/cocoa/focus_tracker_unittest.mm (revision 26217)
+++ chrome/browser/cocoa/focus_tracker_unittest.mm (working copy)
@@ -1,90 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// 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/cocoa_test_helper.h"
-#import "chrome/browser/cocoa/focus_tracker.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/platform_test.h"
-
-namespace {
-
-class FocusTrackerTest : public PlatformTest {
- public:
- virtual void SetUp() {
- PlatformTest::SetUp();
-
- viewA_.reset([[NSView alloc] initWithFrame:NSZeroRect]);
- viewB_.reset([[NSView alloc] initWithFrame:NSZeroRect]);
- [helper_.contentView() addSubview:viewA_.get()];
- [helper_.contentView() addSubview:viewB_.get()];
- }
-
- protected:
- CocoaTestHelper helper_;
- scoped_nsobject<NSView> viewA_;
- scoped_nsobject<NSView> viewB_;
-};
-
-TEST_F(FocusTrackerTest, SaveRestore) {
- NSWindow* window = helper_.window();
- ASSERT_TRUE([window makeFirstResponder:viewA_.get()]);
- FocusTracker* tracker =
- [[[FocusTracker alloc] initWithWindow:window] autorelease];
-
- // Give focus to |viewB_|, then try and restore it to view1.
- ASSERT_TRUE([window makeFirstResponder:viewB_.get()]);
- EXPECT_TRUE([tracker restoreFocusInWindow:window]);
- EXPECT_EQ(viewA_.get(), [window firstResponder]);
-}
-
-TEST_F(FocusTrackerTest, SaveRestoreWithTextView) {
- NSWindow* window = helper_.window();
- NSTextField* text =
- [[[NSTextField alloc] initWithFrame:NSZeroRect] autorelease];
- [helper_.contentView() addSubview:text];
-
- ASSERT_TRUE([window makeFirstResponder:text]);
- FocusTracker* tracker =
- [[[FocusTracker alloc] initWithWindow:window] autorelease];
-
- // Give focus to |viewB_|, then try and restore it to the text field.
- ASSERT_TRUE([window makeFirstResponder:viewB_.get()]);
- EXPECT_TRUE([tracker restoreFocusInWindow:window]);
- EXPECT_TRUE([[window firstResponder] isKindOfClass:[NSTextView class]]);
-}
-
-TEST_F(FocusTrackerTest, DontRestoreToViewNotInWindow) {
- NSWindow* window = helper_.window();
- NSView* view3 = [[[NSView alloc] initWithFrame:NSZeroRect] autorelease];
- [helper_.contentView() addSubview:view3];
-
- ASSERT_TRUE([window makeFirstResponder:view3]);
- FocusTracker* tracker =
- [[[FocusTracker alloc] initWithWindow:window] autorelease];
-
- // Give focus to |viewB_|, then remove view3 from the hierarchy and try
- // to restore focus. The restore should fail.
- ASSERT_TRUE([window makeFirstResponder:viewB_.get()]);
- [view3 removeFromSuperview];
- EXPECT_FALSE([tracker restoreFocusInWindow:window]);
-}
-
-TEST_F(FocusTrackerTest, DontRestoreFocusToViewInDifferentWindow) {
- NSWindow* window = helper_.window();
- ASSERT_TRUE([window makeFirstResponder:viewA_.get()]);
- FocusTracker* tracker =
- [[[FocusTracker alloc] initWithWindow:window] autorelease];
-
- // Give focus to |viewB_|, then try and restore focus in a different
- // window. It is ok to pass a nil NSWindow here because we only use
- // it for direct comparison.
- ASSERT_TRUE([window makeFirstResponder:viewB_.get()]);
- EXPECT_FALSE([tracker restoreFocusInWindow:nil]);
-}
-
-
-} // namespace
« no previous file with comments | « chrome/browser/cocoa/focus_tracker.mm ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698