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

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

Issue 206035: Support the OS X find pasteboard on OS X. (Closed)
Patch Set: foo 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/find_bar_cocoa_controller.mm ('k') | chrome/browser/cocoa/find_pasteboard.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm
diff --git a/chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm b/chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm
index 575c3f70bbf1f911b1abe7e83aa5ef6845a5ac35..5b48350ba4c185d8ec95325bdb3d201c71cd8483 100644
--- a/chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm
+++ b/chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm
@@ -12,13 +12,15 @@
#include "chrome/browser/find_notification_details.h"
#import "chrome/browser/cocoa/cocoa_test_helper.h"
#import "chrome/browser/cocoa/find_bar_cocoa_controller.h"
+#import "chrome/browser/cocoa/find_pasteboard.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
// Expose private variables to make testing easier.
@interface FindBarCocoaController(Testing)
- (NSView*)findBarView;
-- (NSTextField*)findText;
+- (NSString*)findText;
+- (NSTextField*)findTextField;
- (NSTextField*)resultsLabel;
@end
@@ -27,7 +29,11 @@
return findBarView_;
}
-- (NSTextField*)findText {
+- (NSString*)findText {
+ return [findText_ stringValue];
+}
+
+- (NSTextField*)findTextField {
return findText_;
}
@@ -70,18 +76,18 @@ TEST_F(FindBarCocoaControllerTest, ShowAndHide) {
}
TEST_F(FindBarCocoaControllerTest, SetFindText) {
- NSTextField* findText = [controller_ findText];
+ NSTextField* findTextField = [controller_ findTextField];
// Start by making the find bar visible.
[controller_ showFindBar:NO];
EXPECT_TRUE([controller_ isFindBarVisible]);
// Set the find text.
- const std::string kFindText = "Google";
- [controller_ setFindText:ASCIIToUTF16(kFindText)];
+ const NSString* kFindText = @"Google";
+ [controller_ setFindText:kFindText];
EXPECT_EQ(
NSOrderedSame,
- [[findText stringValue] compare:base::SysUTF8ToNSString(kFindText)]);
+ [[findTextField stringValue] compare:kFindText]);
// Call clearResults, which doesn't actually clear the find text but
// simply sets it back to what it was before. This is silly, but
@@ -92,7 +98,7 @@ TEST_F(FindBarCocoaControllerTest, SetFindText) {
[controller_ clearResults:details];
EXPECT_EQ(
NSOrderedSame,
- [[findText stringValue] compare:base::SysUTF8ToNSString(kFindText)]);
+ [[findTextField stringValue] compare:kFindText]);
}
TEST_F(FindBarCocoaControllerTest, ResultLabelUpdatesCorrectly) {
@@ -100,4 +106,30 @@ TEST_F(FindBarCocoaControllerTest, ResultLabelUpdatesCorrectly) {
// FindNotificationDetails objects.
}
+TEST_F(FindBarCocoaControllerTest, FindTextIsGlobal) {
+ scoped_nsobject<FindBarCocoaController> otherController(
+ [[FindBarCocoaController alloc] init]);
+ [helper_.contentView() addSubview:[otherController view]];
+
+ // Setting the text in one controller should update the other controller's
+ // text as well.
+ const NSString* kFindText = @"Respect to the man in the ice cream van";
+ [controller_ setFindText:kFindText];
+ EXPECT_EQ(
+ NSOrderedSame,
+ [[controller_ findText] compare:kFindText]);
+ EXPECT_EQ(
+ NSOrderedSame,
+ [[otherController.get() findText] compare:kFindText]);
+}
+
+TEST_F(FindBarCocoaControllerTest, SettingFindTextUpdatesFindPboard) {
+ const NSString* kFindText =
+ @"It's not a bird, it's not a plane, it must be Dave who's on the train";
+ [controller_ setFindText:kFindText];
+ EXPECT_EQ(
+ NSOrderedSame,
+ [[[FindPasteboard sharedInstance] findText] compare:kFindText]);
+}
+
} // namespace
« no previous file with comments | « chrome/browser/cocoa/find_bar_cocoa_controller.mm ('k') | chrome/browser/cocoa/find_pasteboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698