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

Side by Side Diff: chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm

Issue 332283002: Mac: Fix hidden find bar preventing context menu from appearing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/strings/string_util.h" 5 #include "base/strings/string_util.h"
6 #include "base/strings/sys_string_conversions.h" 6 #include "base/strings/sys_string_conversions.h"
7 #include "chrome/browser/ui/browser_window.h" 7 #include "chrome/browser/ui/browser_window.h"
8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
9 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" 9 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
10 #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h" 10 #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 TEST_F(FindBarCocoaControllerTest, ImagesLoadedProperly) { 56 TEST_F(FindBarCocoaControllerTest, ImagesLoadedProperly) {
57 EXPECT_TRUE([[[controller_ nextButton] image] isValid]); 57 EXPECT_TRUE([[[controller_ nextButton] image] isValid]);
58 EXPECT_TRUE([[[controller_ previousButton] image] isValid]); 58 EXPECT_TRUE([[[controller_ previousButton] image] isValid]);
59 } 59 }
60 60
61 TEST_F(FindBarCocoaControllerTest, ShowAndHide) { 61 TEST_F(FindBarCocoaControllerTest, ShowAndHide) {
62 NSView* findBarView = [controller_ findBarView]; 62 NSView* findBarView = [controller_ findBarView];
63 63
64 ASSERT_GT([findBarView frame].origin.y, 0); 64 ASSERT_GT([findBarView frame].origin.y, 0);
65 ASSERT_FALSE([controller_ isFindBarVisible]); 65 ASSERT_FALSE([controller_ isFindBarVisible]);
66 ASSERT_TRUE([[controller_ view] isHidden]);
66 67
67 [controller_ showFindBar:NO]; 68 [controller_ showFindBar:NO];
68 EXPECT_EQ([findBarView frame].origin.y, 0); 69 EXPECT_EQ([findBarView frame].origin.y, 0);
69 EXPECT_TRUE([controller_ isFindBarVisible]); 70 EXPECT_TRUE([controller_ isFindBarVisible]);
71 ASSERT_FALSE([[controller_ view] isHidden]);
70 72
71 [controller_ hideFindBar:NO]; 73 [controller_ hideFindBar:NO];
72 EXPECT_GT([findBarView frame].origin.y, 0); 74 EXPECT_GT([findBarView frame].origin.y, 0);
73 EXPECT_FALSE([controller_ isFindBarVisible]); 75 EXPECT_FALSE([controller_ isFindBarVisible]);
76 ASSERT_TRUE([[controller_ view] isHidden]);
74 } 77 }
75 78
76 TEST_F(FindBarCocoaControllerTest, SetFindText) { 79 TEST_F(FindBarCocoaControllerTest, SetFindText) {
77 NSTextField* findTextField = [controller_ findTextField]; 80 NSTextField* findTextField = [controller_ findTextField];
78 81
79 // Start by making the find bar visible. 82 // Start by making the find bar visible.
80 [controller_ showFindBar:NO]; 83 [controller_ showFindBar:NO];
81 EXPECT_TRUE([controller_ isFindBarVisible]); 84 EXPECT_TRUE([controller_ isFindBarVisible]);
82 85
83 // Set the find text. 86 // Set the find text.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 TEST_F(FindBarCocoaControllerTest, SettingFindTextUpdatesFindPboard) { 127 TEST_F(FindBarCocoaControllerTest, SettingFindTextUpdatesFindPboard) {
125 NSString* const kFindText = 128 NSString* const kFindText =
126 @"It's not a bird, it's not a plane, it must be Dave who's on the train"; 129 @"It's not a bird, it's not a plane, it must be Dave who's on the train";
127 [controller_ setFindText:kFindText selectedRange:NSMakeRange(NSNotFound, 0)]; 130 [controller_ setFindText:kFindText selectedRange:NSMakeRange(NSNotFound, 0)];
128 EXPECT_EQ( 131 EXPECT_EQ(
129 NSOrderedSame, 132 NSOrderedSame,
130 [[[FindPasteboard sharedInstance] findText] compare:kFindText]); 133 [[[FindPasteboard sharedInstance] findText] compare:kFindText]);
131 } 134 }
132 135
133 } // namespace 136 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698