Index: ios/chrome/browser/ui/context_menu/cru_context_menu_controller_unittest.mm |
diff --git a/ui/base/ios/cru_context_menu_controller_unittest.mm b/ios/chrome/browser/ui/context_menu/cru_context_menu_controller_unittest.mm |
similarity index 54% |
copy from ui/base/ios/cru_context_menu_controller_unittest.mm |
copy to ios/chrome/browser/ui/context_menu/cru_context_menu_controller_unittest.mm |
index 31863d78648d010ef36bc05b6d90cbeb051cf2c7..210b5d586eaecd19d44660773ec1445f798e6b4c 100644 |
--- a/ui/base/ios/cru_context_menu_controller_unittest.mm |
+++ b/ios/chrome/browser/ui/context_menu/cru_context_menu_controller_unittest.mm |
@@ -7,35 +7,39 @@ |
#import <UIKit/UIKit.h> |
#include "base/mac/scoped_nsobject.h" |
+#import "ios/chrome/browser/ui/context_menu/cru_context_menu_controller.h" |
+#import "ios/chrome/browser/ui/context_menu/cru_context_menu_holder.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "testing/platform_test.h" |
-#import "ui/base/ios/cru_context_menu_holder.h" |
namespace { |
class ContextMenuControllerTest : public PlatformTest { |
public: |
- ContextMenuControllerTest() { } |
+ ContextMenuControllerTest() {} |
void SetUp() override { |
- _menuController.reset([[CRUContextMenuController alloc] init]); |
+ _menuController.reset([[ContextMenuController alloc] init]); |
_window.reset( |
[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]); |
[_window makeKeyAndVisible]; |
} |
protected: |
- base::scoped_nsobject<CRUContextMenuController> _menuController; |
+ base::scoped_nsobject<ContextMenuController> _menuController; |
base::scoped_nsobject<UIWindow> _window; |
}; |
TEST_F(ContextMenuControllerTest, OneEntry) { |
- base::scoped_nsobject<CRUContextMenuHolder> holder( |
- [[CRUContextMenuHolder alloc] init]); |
+ base::scoped_nsobject<ContextMenuHolder> holder( |
+ [[ContextMenuHolder alloc] init]); |
BOOL clicked = NO; |
BOOL* clickedPtr = &clicked; |
- [holder appendItemWithTitle:@"foo" action:^{ *clickedPtr = YES; }]; |
+ [holder appendItemWithTitle:@"foo" |
Eugene But (OOO till 7-30)
2016/04/15 19:57:17
Optional NIT: This looks like a bug in clang forma
Jackie Quinn
2016/04/15 20:38:07
Done.
|
+ action:^{ |
+ *clickedPtr = YES; |
+ }]; |
[holder setMenuTitle:@"FooTitle"]; |
[_menuController showWithHolder:holder atPoint:CGPointZero inView:_window]; |
@@ -44,11 +48,19 @@ TEST_F(ContextMenuControllerTest, OneEntry) { |
} |
TEST_F(ContextMenuControllerTest, ShouldDismissImmediately) { |
- base::scoped_nsobject<CRUContextMenuHolder> holder( |
- [[CRUContextMenuHolder alloc] init]); |
- [holder appendItemWithTitle:@"foo" action:^{}]; |
- [holder appendItemWithTitle:@"bar" action:^{} dismissImmediately:YES]; |
- [holder appendItemWithTitle:@"baz" action:^{} dismissImmediately:NO]; |
+ base::scoped_nsobject<ContextMenuHolder> holder( |
+ [[ContextMenuHolder alloc] init]); |
+ [holder appendItemWithTitle:@"foo" |
Eugene But (OOO till 7-30)
2016/04/15 19:57:18
Optional NIT: Ditto. Old format is perfectly fine
Jackie Quinn
2016/04/15 20:38:07
Done.
|
+ action:^{ |
+ }]; |
+ [holder appendItemWithTitle:@"bar" |
+ action:^{ |
+ } |
+ dismissImmediately:YES]; |
+ [holder appendItemWithTitle:@"baz" |
+ action:^{ |
+ } |
+ dismissImmediately:NO]; |
EXPECT_FALSE([holder shouldDismissImmediatelyOnClickedAtIndex:0]); |
EXPECT_TRUE([holder shouldDismissImmediatelyOnClickedAtIndex:1]); |