chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm - Issue 7004036: Added some enhancements to OCMock.

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/bookmarks/bookmark_folder_target_unittest.mm

Issue 7004036: Added some enhancements to OCMock. (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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm » ('j') | chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm

index 70db47bd2d14bbcd99a85d2072dee15e640a12ea..915cf964d250d09d4bb9b7b80cc0e112ca6f5e58 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm

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

#include "testing/platform_test.h"

#include "third_party/ocmock/gtest_support.h"

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

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

@interface OCMockObject(PreventRetainCycle)

- (void)clearRecordersAndExpectations;

@@ -50,7 +51,7 @@ class BookmarkFolderTargetTest : public CocoaTest {

TEST_F(BookmarkFolderTargetTest, StartWithNothing) {

// Need a fake "button" which has a bookmark node.

id sender = [OCMockObject mockForClass:[BookmarkButton class]];

- [[[sender stub] andReturnValue:OCMOCK_VALUE(bmbNode_)] bookmarkNode];

+ [[[sender stub] andReturnPointer:bmbNode_] bookmarkNode];

// Fake controller

id controller = [OCMockObject mockForClass:[BookmarkBarFolderController

@@ -71,7 +72,7 @@ TEST_F(BookmarkFolderTargetTest, StartWithNothing) {

TEST_F(BookmarkFolderTargetTest, ReopenSameFolder) {

// Need a fake "button" which has a bookmark node.

id sender = [OCMockObject mockForClass:[BookmarkButton class]];

- [[[sender stub] andReturnValue:OCMOCK_VALUE(bmbNode_)] bookmarkNode];

+ [[[sender stub] andReturnPointer:bmbNode_] bookmarkNode];

// Fake controller

id controller = [OCMockObject mockForClass:[BookmarkBarFolderController

@@ -102,7 +103,7 @@ TEST_F(BookmarkFolderTargetTest, ReopenSameFolder) {

TEST_F(BookmarkFolderTargetTest, ReopenNotSame) {

// Need a fake "button" which has a bookmark node.

id sender = [OCMockObject mockForClass:[BookmarkButton class]];

- [[[sender stub] andReturnValue:OCMOCK_VALUE(bmbNode_)] bookmarkNode];

+ [[[sender stub] andReturnPointer:bmbNode_] bookmarkNode];

// Fake controller

id controller = [OCMockObject mockForClass:[BookmarkBarFolderController