Skip to content

Fixes FN with #55

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

Open
ahcorde wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes FN with #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
488c133
Fixes
ahcorde Apr 26, 2024
be6070e
Added tests
ahcorde May 8, 2024
d913de6
Fixed test
ahcorde May 13, 2024
05d6f37
Merge remote-tracking branch 'erwin/master'
ahcorde Jun 28, 2024
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
8 changes: 7 additions & 1 deletion lcov_cobertura/lcov_cobertura.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,13 @@ def parse(self, **kwargs):
file_branches_covered = int(line_parts[1])
elif input_type == 'FN':
# FN:5,(anonymous_1)
function_line, function_name = line_parts[-1].strip().split(',', 1)
tokens = line_parts[-1].strip().split(',')
# support functions with commas
fname = ','.join(ch for ch in tokens if not ch.isdigit())
if (len(tokens) == 3):
function_line, function_line_ends, function_name = tokens[:2] + [fname]
else:
function_line, function_name = tokens[:1] + [fname]
file_methods[function_name] = [function_line, '0']
elif input_type == 'FNDA':
# FNDA:0,(anonymous_1)
Expand Down
5 changes: 3 additions & 2 deletions test/test_lcov_cobertura.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ def test_parse(self):

def test_parse_with_functions(self):
converter = LcovCobertura(
'TN:\nSF:foo/file.ext\nDA:1,1\nDA:2,0\nFN:1,(anonymous_1)\nFN:2,namedFn\nFNDA:1,(anonymous_1)\nend_of_record\n')
'TN:\nSF:foo/file.ext\nDA:1,1\nDA:2,0\nFN:1,(anonymous_1)\nFN:1,2,(anonymous_2)\nFN:2,namedFn\nFNDA:1,(anonymous_1)\nend_of_record\n')
result = converter.parse()
self.assertEqual(result['packages']['foo']['line-rate'], '0.5')
self.assertEqual(result['packages']['foo']['lines-covered'], 1)
self.assertEqual(result['packages']['foo']['lines-total'], 2)
self.assertEqual(result['packages']['foo']['classes']['foo/file.ext']['methods']['(anonymous_1)'], ['1', '1'])
self.assertEqual(result['packages']['foo']['classes']['foo/file.ext']['methods']['(anonymous_2)'], ['1', '0'])
self.assertEqual(result['packages']['foo']['classes']['foo/file.ext']['methods']['namedFn'], ['2', '0'])

def test_parse_with_checksum(self):
Expand Down Expand Up @@ -138,7 +139,7 @@ def test_treat_non_integer_line_execution_count_as_zero(self):

def test_support_function_names_with_commas(self):
converter = LcovCobertura(
'TN:\nSF:foo/file.ext\nDA:1,1\nDA:2,0\nFN:1,(anonymous_1<foo, bar>)\nFN:2,namedFn\nFNDA:1,(anonymous_1<foo, bar>)\nend_of_record\n')
'TN:\nSF:foo/file.ext\nDA:1,1\nDA:2,0\nFN:1,2,(anonymous_1<foo, bar>)\nFN:2,namedFn\nFNDA:1,(anonymous_1<foo, bar>)\nend_of_record\n')
result = converter.parse()
self.assertEqual(result['packages']['foo']['classes']['foo/file.ext']['methods']['(anonymous_1<foo, bar>)'], ['1', '1'])
self.assertEqual(result['packages']['foo']['classes']['foo/file.ext']['methods']['namedFn'], ['2', '0'])
Expand Down