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

Unified Diff: chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm

Issue 1250533003: [Mac] Remove BrowserCommandExecutor protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 5 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: chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm
diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm b/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm
deleted file mode 100644
index 00b4df1415956848c3988bcbdf75591870b3512f..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <Carbon/Carbon.h>
-
-#include "base/debug/debugger.h"
-#include "chrome/app/chrome_command_ids.h"
-#import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "third_party/ocmock/OCMock/OCMock.h"
-#include "third_party/ocmock/gtest_support.h"
-#import "third_party/ocmock/ocmock_extensions.h"
-
-namespace {
-
-NSEvent* KeyEvent(const NSUInteger flags, const NSUInteger keyCode) {
- return [NSEvent keyEventWithType:NSKeyDown
- location:NSZeroPoint
- modifierFlags:flags
- timestamp:0.0
- windowNumber:0
- context:nil
- characters:@""
- charactersIgnoringModifiers:@""
- isARepeat:NO
- keyCode:keyCode];
-}
-
-class ChromeEventProcessingWindowTest : public CocoaTest {
- public:
- void SetUp() override {
- CocoaTest::SetUp();
- // Create a window.
- const NSUInteger mask = NSTitledWindowMask | NSClosableWindowMask |
- NSMiniaturizableWindowMask | NSResizableWindowMask;
- window_ = [[ChromeEventProcessingWindow alloc]
- initWithContentRect:NSMakeRect(0, 0, 800, 600)
- styleMask:mask
- backing:NSBackingStoreBuffered
- defer:NO];
- if (base::debug::BeingDebugged()) {
- [window_ orderFront:nil];
- } else {
- [window_ orderBack:nil];
- }
- }
-
- void TearDown() override {
- [window_ close];
- CocoaTest::TearDown();
- }
-
- ChromeEventProcessingWindow* window_;
-};
-
-id CreateBrowserWindowControllerMock() {
- id delegate = [OCMockObject mockForClass:[BrowserWindowController class]];
- // Make conformsToProtocol return YES for @protocol(BrowserCommandExecutor)
- // to satisfy the DCHECK() in handleExtraKeyboardShortcut.
- [[[delegate stub] andReturnBool:YES]
- conformsToProtocol:[OCMArg conformsToProtocol:
- @protocol(BrowserCommandExecutor)]];
- return delegate;
-}
-
-// Verify that the window intercepts a particular key event and
-// forwards it to [delegate executeCommand:]. Assume that other
-// CommandForKeyboardShortcut() will work the same for the rest.
-TEST_F(ChromeEventProcessingWindowTest,
- PerformKeyEquivalentForwardToExecuteCommand) {
- NSEvent* event = KeyEvent(NSCommandKeyMask, kVK_ANSI_1);
-
- id delegate = CreateBrowserWindowControllerMock();
- [[delegate expect] executeCommand:IDC_SELECT_TAB_0];
-
- [window_ setDelegate:delegate];
- [window_ performKeyEquivalent:event];
-
- // Don't wish to mock all the way down...
- [window_ setDelegate:nil];
- EXPECT_OCMOCK_VERIFY(delegate);
-}
-
-// Verify that an unhandled shortcut does not get forwarded via
-// -executeCommand:.
-// TODO(shess) Think of a way to test that it is sent to the
-// superclass.
-TEST_F(ChromeEventProcessingWindowTest, PerformKeyEquivalentNoForward) {
- NSEvent* event = KeyEvent(0, 0);
-
- id delegate = CreateBrowserWindowControllerMock();
-
- [window_ setDelegate:delegate];
- [window_ performKeyEquivalent:event];
-
- // Don't wish to mock all the way down...
- [window_ setDelegate:nil];
- EXPECT_OCMOCK_VERIFY(delegate);
-}
-
-} // namespace

Powered by Google App Engine
This is Rietveld 408576698