gpu/command_buffer/build_gles2_cmd_buffer.py - Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee.

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: gpu/command_buffer/build_gles2_cmd_buffer.py

Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 2017 Created 3 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 | « components/sync_bookmarks/bookmark_data_type_controller_unittest.cc ('k') | gpu/command_buffer/service/command_buffer_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/build_gles2_cmd_buffer.py

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py

index bd66f464c4cbd485649e56a7ddc6075d64b18c60..d5189ccc6f95b59de216bfaba94c19a0d40d6309 100755

--- a/gpu/command_buffer/build_gles2_cmd_buffer.py

+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py

@@ -5824,7 +5824,7 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {

TEST_P(%(test_name)s, %(name)sValidArgsNewId) {

EXPECT_CALL(*gl_, %(gl_func_name)s(kNewServiceId));

EXPECT_CALL(*gl_, %(gl_gen_func_name)s(1, _))

- .WillOnce(SetArgumentPointee<1>(kNewServiceId));

+ .WillOnce(SetArgPointee<1>(kNewServiceId));

SpecializedSetup<cmds::%(name)s, 0>(true);

cmds::%(name)s cmd;

cmd.Init(kNewClientId);

@@ -5854,7 +5854,7 @@ TEST_P(%(test_name)s, %(name)sValidArgsNewId) {

EXPECT_CALL(*gl_,

%(gl_func_name)s(%(gl_args_with_new_id)s));

EXPECT_CALL(*gl_, %(gl_gen_func_name)s(1, _))

- .WillOnce(SetArgumentPointee<1>(kNewServiceId));

+ .WillOnce(SetArgPointee<1>(kNewServiceId));

SpecializedSetup<cmds::%(name)s, 0>(true);

cmds::%(name)s cmd;

cmd.Init(%(args_with_new_id)s);

@@ -6073,7 +6073,7 @@ TEST_F(GLES2ImplementationTest, %(name)s) {

valid_test = """

TEST_P(%(test_name)s, %(name)sValidArgs) {

EXPECT_CALL(*gl_, %(gl_func_name)s(1, _))

- .WillOnce(SetArgumentPointee<1>(kNewServiceId));

+ .WillOnce(SetArgPointee<1>(kNewServiceId));

cmds::%(name)s* cmd = GetImmediateAs<cmds::%(name)s>();

GLuint temp = kNewClientId;

SpecializedSetup<cmds::%(name)s, 0>(true);

@@ -8354,7 +8354,7 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {

SpecializedSetup<cmds::%(name)s, 0>(true);

%(expect_len_code)s

EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s))

- .WillOnce(DoAll(SetArgumentPointee<2>(strlen(kInfo)),

+ .WillOnce(DoAll(SetArgPointee<2>(strlen(kInfo)),

SetArrayArgument<3>(kInfo, kInfo + strlen(kInfo) + 1)));

cmds::%(name)s cmd;

cmd.Init(%(args)s);

@@ -8383,7 +8383,7 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {

if get_len_func and get_len_func[0:2] == 'gl':

sub['expect_len_code'] = (

" EXPECT_CALL(*gl_, %s(%s, %s, _))\n"

- " .WillOnce(SetArgumentPointee<2>(strlen(kInfo) + 1));") % (

+ " .WillOnce(SetArgPointee<2>(strlen(kInfo) + 1));") % (

get_len_func[2:], id_name, get_len_enum)

self.WriteValidUnitTest(func, f, valid_test, sub, *extras)