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

Unified Diff: ios/chrome/browser/ui/history/history_search_view_controller_unittest.mm

Issue 2650423002: [ObjC ARC] Converts ios/chrome/browser/ui/history:unit_tests to ARC. (Closed)
Patch Set: comments Created 3 years, 7 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
Index: ios/chrome/browser/ui/history/history_search_view_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/history/history_search_view_controller_unittest.mm b/ios/chrome/browser/ui/history/history_search_view_controller_unittest.mm
index db0f24e32c9cc6f894c7e4380bf63492838ed808..480434a17a0eacdd2dc2c57584cd4a63a4caf2aa 100644
--- a/ios/chrome/browser/ui/history/history_search_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/history/history_search_view_controller_unittest.mm
@@ -5,12 +5,15 @@
#import "ios/chrome/browser/ui/history/history_search_view_controller.h"
#include "base/mac/foundation_util.h"
-#import "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/ui/history/history_search_view.h"
#include "testing/platform_test.h"
#import "third_party/ocmock/OCMock/OCMock.h"
#import "third_party/ocmock/gtest_support.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
// HistorySearchView category to expose the text field and cancel button.
@interface HistorySearchView (Testing)
@property(nonatomic, strong) UITextField* textField;
@@ -21,27 +24,25 @@
class HistorySearchViewControllerTest : public PlatformTest {
public:
HistorySearchViewControllerTest() {
- search_view_controller_.reset([[HistorySearchViewController alloc] init]);
+ search_view_controller_ = [[HistorySearchViewController alloc] init];
[search_view_controller_ loadView];
- mock_delegate_.reset([[OCMockObject
- mockForProtocol:@protocol(HistorySearchViewControllerDelegate)]
- retain]);
+ mock_delegate_ = [OCMockObject
+ mockForProtocol:@protocol(HistorySearchViewControllerDelegate)];
[search_view_controller_ setDelegate:mock_delegate_];
}
protected:
- base::scoped_nsobject<HistorySearchViewController> search_view_controller_;
- base::scoped_nsprotocol<id<HistorySearchViewControllerDelegate>>
- mock_delegate_;
+ __strong HistorySearchViewController* search_view_controller_;
+ __strong id<HistorySearchViewControllerDelegate> mock_delegate_;
};
// Test that pressing the cancel button invokes delegate callback to cancel
// search.
TEST_F(HistorySearchViewControllerTest, CancelButtonPressed) {
- UIButton* cancel_button = base::mac::ObjCCastStrict<HistorySearchView>(
- search_view_controller_.get().view)
- .cancelButton;
- OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_.get();
+ UIButton* cancel_button =
+ base::mac::ObjCCastStrict<HistorySearchView>(search_view_controller_.view)
+ .cancelButton;
+ OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_;
[[mock_delegate expect]
historySearchViewControllerDidCancel:search_view_controller_];
[cancel_button sendActionsForControlEvents:UIControlEventTouchUpInside];
@@ -52,10 +53,10 @@ TEST_F(HistorySearchViewControllerTest, CancelButtonPressed) {
// textField:shouldChangeCharactersInRange:replacementString: on the text field
// delegate results invokes delegate callback to request search.
TEST_F(HistorySearchViewControllerTest, SearchButtonPressed) {
- UITextField* text_field = base::mac::ObjCCastStrict<HistorySearchView>(
- search_view_controller_.get().view)
- .textField;
- OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_.get();
+ UITextField* text_field =
+ base::mac::ObjCCastStrict<HistorySearchView>(search_view_controller_.view)
+ .textField;
+ OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_;
[[mock_delegate expect] historySearchViewController:search_view_controller_
didRequestSearchForTerm:@"a"];
[text_field.delegate textField:text_field
@@ -67,15 +68,15 @@ TEST_F(HistorySearchViewControllerTest, SearchButtonPressed) {
// Test that disabling HistorySearchViewController disables the search view text
// field.
TEST_F(HistorySearchViewControllerTest, DisableSearchBar) {
- UITextField* text_field = base::mac::ObjCCastStrict<HistorySearchView>(
- search_view_controller_.get().view)
- .textField;
+ UITextField* text_field =
+ base::mac::ObjCCastStrict<HistorySearchView>(search_view_controller_.view)
+ .textField;
DCHECK(text_field);
EXPECT_TRUE(text_field.enabled);
- search_view_controller_.get().enabled = NO;
+ search_view_controller_.enabled = NO;
EXPECT_FALSE(text_field.enabled);
- search_view_controller_.get().enabled = YES;
+ search_view_controller_.enabled = YES;
EXPECT_TRUE(text_field.enabled);
}
« no previous file with comments | « ios/chrome/browser/ui/history/history_entry_item_unittest.mm ('k') | ios/chrome/browser/ui/history/history_util_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698