Skip to content

Improve regex for test parameterization to support function pointers #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvandervoord merged 2 commits into from
Feb 6, 2023
Merged

Improve regex for test parameterization to support function pointers #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b51303a
Improve regex for test parameterization to support function pointers
Apr 1, 2021
77bd4f9
Add test for function pointers in parameterized tests
Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions auto/generate_test_runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ def find_tests(source)
lines.each_with_index do |line, _index|
# find tests
next unless line =~ /^((?:\s*(?:TEST_CASE|TEST_RANGE)\s*\(.*?\)\s*)*)\s*void\s+((?:#{@options[:test_prefix]}).*)\s*\(\s*(.*)\s*\)/m
next unless line =~ /^((?:\s*(?:TEST_CASE|TEST_RANGE)\s*\(.*?\)\s*)*)\s*void\s+((?:#{@options[:test_prefix]})\w*)\s*\(\s*(.*)\s*\)/m

arguments = Regexp.last_match(1)
name = Regexp.last_match(2)
Expand Down
1 change: 1 addition & 0 deletions test/testdata/Defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
#define EXTERN_DECL

extern int CounterSuiteSetup;
extern int isArgumentOne(int i);

#endif
11 changes: 11 additions & 0 deletions test/testdata/testRunnerGenerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,17 @@ void paratest_ShouldHandleParameterizedTestsThatFail(int Num)
TEST_ASSERT_EQUAL_MESSAGE(3, Num, "This call should fail");
}

int isArgumentOne(int i)
{
return i == 1;
}

TEST_CASE(isArgumentOne)
void paratest_WorksWithFunctionPointers(int function(int))
{
TEST_ASSERT_TRUE_MESSAGE(function(1), "Function should return True");
}

#ifdef USE_CEXCEPTION
void extest_ShouldHandleCExceptionInTest(void)
{
Expand Down
6 changes: 5 additions & 1 deletion test/tests/test_generate_test_runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
'paratest_ShouldHandleParameterizedTests\(5\)',
'paratest_ShouldHandleParameterizedTests2\(7\)',
'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid',
'paratest_WorksWithFunctionPointers\(isArgumentOne\)',
],
:to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
:to_ignore => [ ],
Expand All @@ -168,6 +169,7 @@
'paratest_ShouldHandleParameterizedTests\(5\)',
'paratest_ShouldHandleParameterizedTests2\(7\)',
'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid',
'paratest_WorksWithFunctionPointers\(isArgumentOne\)',
],
:to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
:to_ignore => [ ],
Expand All @@ -188,6 +190,7 @@
'paratest_ShouldHandleParameterizedTests\(5\)',
'paratest_ShouldHandleParameterizedTests2\(7\)',
'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid',
'paratest_WorksWithFunctionPointers\(isArgumentOne\)',
],
:to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
:to_ignore => [ ],
Expand Down Expand Up @@ -1108,7 +1111,8 @@
'paratest_ShouldHandleParameterizedTests\(5\)',
'paratest_ShouldHandleParameterizedTests2\(7\)',
'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid',
'paratest_ShouldHandleParameterizedTestsThatFail\(17\)'
'paratest_ShouldHandleParameterizedTestsThatFail\(17\)',
'paratest_WorksWithFunctionPointers\(isArgumentOne\)',
],
}
},
Expand Down