Skip to content

Adding test matrix feature #599

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

Closed
AJIOB wants to merge 6 commits into from
Closed

Adding test matrix feature #599

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c7c418
TEST_MATRIX was added:
Dec 2, 2020
c8b56ac
TEST_MATRIX will match arguments with spaces and string concatenation…
Dec 7, 2020
32d4923
TEST_MATRIX regex optimizations
Dec 7, 2020
e14bd3c
TEST_MATRIX generator:
Dec 8, 2020
b56a7f7
Multiline TEST_* matches support was added
Dec 8, 2020
0e39ff7
Multiline generation for multiple entries was fixed
Dec 8, 2020
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
38 changes: 34 additions & 4 deletions auto/generate_test_runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ def find_tests(source)
.map { |line| line.gsub(substring_unre, substring_unsubs) } # unhide the problematic characters previously removed

lines.each_with_index do |line, _index|
tests_regex_string = /\s*(?:TEST_CASE|TEST_RANGE|TEST_MATRIX)\s*\(.*?\)\s*/.source

# 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 =~ /^((?:#{tests_regex_string})*)\s*void\s+((?:#{@options[:test_prefix]}).*)\s*\(\s*(.*)\s*\)/m

arguments = Regexp.last_match(1)
name = Regexp.last_match(2)
Expand All @@ -140,10 +142,10 @@ def find_tests(source)

if @options[:use_param_tests] && !arguments.empty?
args = []
arguments.scan(/\s*TEST_CASE\s*\((.*)\)\s*$/) { |a| args << a[0] }
arguments.scan(/\s*TEST_CASE\s*\(((?:(?!#{tests_regex_string}).)*)\)\s*$/m) { |a| args << a[0] }

arguments.scan(/\s*TEST_RANGE\s*\((.*)\)\s*$/).flatten.each do |range_str|
args += range_str.scan(/\[\s*(-?\d+.?\d*),\s*(-?\d+.?\d*),\s*(-?\d+.?\d*)\s*\]/).map do |arg_values_str|
arguments.scan(/\s*TEST_RANGE\s*\(((?:(?!#{tests_regex_string}).)*)\)\s*$/m).flatten.each do |range_str|
args += range_str.scan(/\[\s*(-?\d+.?\d*),\s*(-?\d+.?\d*),\s*(-?\d+.?\d*)\s*\]/m).map do |arg_values_str|
arg_values_str.map do |arg_value_str|
arg_value_str.include?('.') ? arg_value_str.to_f : arg_value_str.to_i
end
Expand All @@ -155,6 +157,34 @@ def find_tests(source)
arg_combinations.flatten.join(', ')
end
end

# Based on:
## https://en.cppreference.com/w/cpp/language/integer_literal
## https://en.cppreference.com/w/cpp/language/character_literal
## https://en.cppreference.com/w/cpp/language/string_literal
## https://en.cppreference.com/w/cpp/language/floating_literal
## https://en.cppreference.com/w/cpp/language/escape
## Strings & chars with '[', ']', '(', ')'
## Empty args
## Args with spaces (not strings or char sequences)
## String concatenations: "Hello" "World"
# Not supported: array addressing (with [])

one_number_or_text_regex_string = /[^"',\s\]](?:['\s]*[^"',\s\]])*/.source
one_string_regex_string = /"(?:[^"\\]|\\.)*"/.source
one_char_regex_string = /'(?:[^'\\]|\\.)*'/.source
one_arg_regex_string = /(?:(?:(?:#{one_number_or_text_regex_string}\s*)?#{one_string_regex_string})+|(?:#{one_number_or_text_regex_string}\s*)?#{one_char_regex_string}|(?:#{one_number_or_text_regex_string}))/.source

arguments.scan(/\s*TEST_MATRIX\s*\(((?:(?!#{tests_regex_string}).)*)\)\s*$/m).flatten.each do |values|
args += values.scan(/\[\s*((?:#{one_arg_regex_string}\s*,\s*)*#{one_arg_regex_string})\s*\]/m).flatten.map do |one_arg_values|
# Force appending comma for usual regular matching
(one_arg_values + ',').scan(/(#{one_arg_regex_string})\s*,/m)
end.reduce do |result, arg_range_expanded|
result.product(arg_range_expanded)
end.map do |arg_combinations|
arg_combinations.flatten.join(', ')
end
end
end

tests_and_line_numbers << { test: name, args: args, call: call, params: params, line_number: 0 }
Expand Down