chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm - Issue 7031014: Support for better integration between OCMock and gtest.

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/location_bar/autocomplete_text_field_editor_unittest.mm

Issue 7031014: Support for better integration between OCMock and gtest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 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:

Index: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm

===================================================================

--- chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm (revision 85510)

+++ chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm (working copy)

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

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

#import "testing/gtest_mac.h"

#include "testing/platform_test.h"

+#include "third_party/ocmock/gtest_support.h"

#import "third_party/ocmock/OCMock/OCMock.h"

using ::testing::Return;

@@ -124,7 +125,7 @@

[[[delegate expect] andReturn:menu.get()] decorationMenuForEvent:event];

[editor_ setDelegate:delegate];

NSMenu* contextMenu = [editor_ menuForEvent:event];

- [delegate verify];

+ ASSERT_TRUE(testing::mac::VerifyOCMock(delegate));

[editor_ setDelegate:nil];

EXPECT_EQ(contextMenu, menu.get());

@@ -139,7 +140,7 @@

[[[delegate expect] andReturn:nil] decorationMenuForEvent:event];

[editor_ setDelegate:delegate];

NSMenu* contextMenu = [editor_ menuForEvent:event];

- [delegate verify];

+ ASSERT_TRUE(testing::mac::VerifyOCMock(delegate));

[editor_ setDelegate:nil];

EXPECT_NE(contextMenu, menu.get());