chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm - Issue 7712008: Refactor and clean up code now that chrome::testing::NSRunLoopRunAllPending() exists.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

Issue 7712008: Refactor and clean up code now that chrome::testing::NSRunLoopRunAllPending() exists. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update gtest_exclude Created 9 years, 4 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

« chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm ('K') | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm ('k') | tools/valgrind/gtest_exclude/unit_tests.gtest_mac.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

index 34511790d67cbb7ec7eb77daf79a2879fbebdbd5..146b8748e3888ba0bdbe4346bd337b906af98493 100644

--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

@@ -7,6 +7,7 @@

#include "chrome/browser/ui/cocoa/browser_test_helper.h"

#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"

#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

+#include "chrome/browser/ui/cocoa/run_loop_testing.h"

#import "chrome/browser/ui/cocoa/view_resizer_pong.h"

#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"

#include "chrome/browser/ui/toolbar/wrench_menu_model.h"

@@ -14,14 +15,6 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "testing/platform_test.h"

-// Override to avoid dealing with run loops in the testing environment.

-@implementation WrenchMenuController (UnitTesting)

-- (void)dispatchCommandInternal:(NSInteger)tag {

- [self wrenchMenuModel]->ExecuteCommand(tag);

-@end

namespace {

class MockWrenchMenuModel : public WrenchMenuModel {

@@ -79,6 +72,7 @@ TEST_F(WrenchMenuControllerTest, DispatchSimple) {

[controller() setModel:&fake_model_];

[controller() dispatchWrenchMenuCommand:button.get()];

+ chrome::testing::NSRunLoopRunAllPending();

}

} // namespace