organicmaps/googletest
13
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-04-15 00:58:13 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Do not include void into mocked method arguments

Browse source 
If a function that takes no arguments explicitly states (void)
then do not include it in the mocked method argument list
since it triggers static assertions that expect no arguments
to be present.

Fixes (?) #3261
This commit is contained in:
platisd 2021-02-05 19:35:02 +01:00
parent f3ef7e173f
commit 46b188577b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
googlemock/scripts/generator/cpp/gmock_class.py
View file

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

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

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