| Index: ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator_unittest.mm
|
| diff --git a/ios/chrome/browser/ui/context_menu/context_menu_coordinator_unittest.mm b/ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator_unittest.mm
|
| similarity index 81%
|
| copy from ios/chrome/browser/ui/context_menu/context_menu_coordinator_unittest.mm
|
| copy to ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator_unittest.mm
|
| index 412ce79c1fd21204b9c72dd69149efbbe312820d..3fd09892f7c5482ff86edfc41ffefc9029563ce4 100644
|
| --- a/ios/chrome/browser/ui/context_menu/context_menu_coordinator_unittest.mm
|
| +++ b/ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator_unittest.mm
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#import "ios/chrome/browser/ui/context_menu/context_menu_coordinator.h"
|
| +#import "ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h"
|
|
|
| #import <UIKit/UIKit.h>
|
|
|
| @@ -12,10 +12,10 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "testing/platform_test.h"
|
|
|
| -// Fixture to test ContextMenuCoordinator.
|
| -class ContextMenuCoordinatorTest : public PlatformTest {
|
| +// Fixture to test ActionSheetCoordinator.
|
| +class ActionSheetCoordinatorTest : public PlatformTest {
|
| public:
|
| - ContextMenuCoordinatorTest() {
|
| + ActionSheetCoordinatorTest() {
|
| window_.reset(
|
| [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]);
|
| [window_ makeKeyAndVisible];
|
| @@ -24,17 +24,17 @@ class ContextMenuCoordinatorTest : public PlatformTest {
|
| }
|
|
|
| protected:
|
| - base::scoped_nsobject<ContextMenuCoordinator> menu_coordinator_;
|
| + base::scoped_nsobject<ActionSheetCoordinator> menu_coordinator_;
|
| base::scoped_nsobject<UIWindow> window_;
|
| base::scoped_nsobject<UIViewController> view_controller_;
|
| };
|
|
|
| // Tests the context menu reports as visible after presenting.
|
| -TEST_F(ContextMenuCoordinatorTest, ValidateIsVisible) {
|
| +TEST_F(ActionSheetCoordinatorTest, ValidateIsVisible) {
|
| web::ContextMenuParams params;
|
| params.location = CGPointZero;
|
| params.view.reset([[view_controller_ view] retain]);
|
| - menu_coordinator_.reset([[ContextMenuCoordinator alloc]
|
| + menu_coordinator_.reset([[ActionSheetCoordinator alloc]
|
| initWithViewController:view_controller_
|
| params:params]);
|
| [menu_coordinator_ start];
|
| @@ -43,11 +43,11 @@ TEST_F(ContextMenuCoordinatorTest, ValidateIsVisible) {
|
| }
|
|
|
| // Tests the context menu dismissal.
|
| -TEST_F(ContextMenuCoordinatorTest, ValidateDismissalOnStop) {
|
| +TEST_F(ActionSheetCoordinatorTest, ValidateDismissalOnStop) {
|
| web::ContextMenuParams params;
|
| params.location = CGPointZero;
|
| params.view.reset([[view_controller_ view] retain]);
|
| - menu_coordinator_.reset([[ContextMenuCoordinator alloc]
|
| + menu_coordinator_.reset([[ActionSheetCoordinator alloc]
|
| initWithViewController:view_controller_
|
| params:params]);
|
| [menu_coordinator_ start];
|
| @@ -58,11 +58,11 @@ TEST_F(ContextMenuCoordinatorTest, ValidateDismissalOnStop) {
|
| }
|
|
|
| // Tests the context menu dismissal.
|
| -TEST_F(ContextMenuCoordinatorTest, ValidateDismissalOnDestroy) {
|
| +TEST_F(ActionSheetCoordinatorTest, ValidateDismissalOnDestroy) {
|
| web::ContextMenuParams params;
|
| params.location = CGPointZero;
|
| params.view.reset([[view_controller_ view] retain]);
|
| - menu_coordinator_.reset([[ContextMenuCoordinator alloc]
|
| + menu_coordinator_.reset([[ActionSheetCoordinator alloc]
|
| initWithViewController:view_controller_
|
| params:params]);
|
| [menu_coordinator_ start];
|
| @@ -73,11 +73,11 @@ TEST_F(ContextMenuCoordinatorTest, ValidateDismissalOnDestroy) {
|
| }
|
|
|
| // Tests that only the expected actions are present on the context menu.
|
| -TEST_F(ContextMenuCoordinatorTest, ValidateActions) {
|
| +TEST_F(ActionSheetCoordinatorTest, ValidateActions) {
|
| web::ContextMenuParams params;
|
| params.location = CGPointZero;
|
| params.view.reset([[view_controller_ view] retain]);
|
| - menu_coordinator_.reset([[ContextMenuCoordinator alloc]
|
| + menu_coordinator_.reset([[ActionSheetCoordinator alloc]
|
| initWithViewController:view_controller_
|
| params:params]);
|
|
|
| @@ -85,7 +85,8 @@ TEST_F(ContextMenuCoordinatorTest, ValidateActions) {
|
| for (NSString* title in menu_titles) {
|
| [menu_coordinator_ addItemWithTitle:title
|
| action:^{
|
| - }];
|
| + }
|
| + destructive:NO];
|
| }
|
|
|
| [menu_coordinator_ start];
|
| @@ -109,11 +110,11 @@ TEST_F(ContextMenuCoordinatorTest, ValidateActions) {
|
| }
|
|
|
| // Validates that the cancel action is present on the context menu.
|
| -TEST_F(ContextMenuCoordinatorTest, CancelButtonExists) {
|
| +TEST_F(ActionSheetCoordinatorTest, CancelButtonExists) {
|
| web::ContextMenuParams params;
|
| params.location = CGPointZero;
|
| params.view.reset([[view_controller_ view] retain]);
|
| - menu_coordinator_.reset([[ContextMenuCoordinator alloc]
|
| + menu_coordinator_.reset([[ActionSheetCoordinator alloc]
|
| initWithViewController:view_controller_
|
| params:params]);
|
|
|
| @@ -131,7 +132,7 @@ TEST_F(ContextMenuCoordinatorTest, CancelButtonExists) {
|
| }
|
|
|
| // Tests that the ContextMenuParams are used to display context menu.
|
| -TEST_F(ContextMenuCoordinatorTest, ValidateContextMenuParams) {
|
| +TEST_F(ActionSheetCoordinatorTest, ValidateContextMenuParams) {
|
| CGPoint location = CGPointMake(100.0, 125.0);
|
| NSString* title = @"Context Menu Title";
|
|
|
| @@ -139,7 +140,7 @@ TEST_F(ContextMenuCoordinatorTest, ValidateContextMenuParams) {
|
| params.location = location;
|
| params.menu_title.reset(title);
|
| params.view.reset([[view_controller_ view] retain]);
|
| - menu_coordinator_.reset([[ContextMenuCoordinator alloc]
|
| + menu_coordinator_.reset([[ActionSheetCoordinator alloc]
|
| initWithViewController:view_controller_
|
| params:params]);
|
| [menu_coordinator_ start];
|
|
|