gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3262 from platisd:master

Browse Source 
PiperOrigin-RevId: 356568444
This commit is contained in:
Andy Soffer 2021-02-11 12:49:08 -05:00
commit e165773418
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
googlemock/scripts/generator/cpp/gmock_class.py
View File

@ -132,6 +132,7 @@ def _GenerateMethods(output_lines, source, class_node):
args = [] args = []
for p in node.parameters: for p in node.parameters:
arg = _GenerateArg(source[p.start:p.end]) arg = _GenerateArg(source[p.start:p.end])
if arg != 'void':
args.append(_EscapeForMacro(arg)) args.append(_EscapeForMacro(arg))
# Create the mock method definition. # Create the mock method definition.

2
googlemock/scripts/generator/cpp/gmock_class_test.py
View File

@ -156,7 +156,7 @@ class Foo {
}; };
""" """
self.assertEqualIgnoreLeadingWhitespace( self.assertEqualIgnoreLeadingWhitespace(
'MOCK_METHOD(int, Bar, (void), (override));', 'MOCK_METHOD(int, Bar, (), (override));',
self.GenerateMethodSource(source)) self.GenerateMethodSource(source))
def testStrangeNewlineInParameter(self): def testStrangeNewlineInParameter(self):