Skip to content

fix(csv): emit columns for extensions with multiple FUNCTION_INFO fields #486

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
ArmaanjeetSandhu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(csv): emit columns for extensions with multiple FUNCTION_INFO fields #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions lizard_ext/csvoutput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ def csv_output(result, options):
extension_variables = []
extension_captions = []
for extension in options.extensions:
if extension.__class__.__name__ == 'LizardExtension':
if hasattr(extension, 'FUNCTION_INFO') and \
len(list(extension.FUNCTION_INFO)) == 1:
extension_variable = list(extension.FUNCTION_INFO)[0]
if extension.__class__.__name__ == 'LizardExtension' and \
hasattr(extension, 'FUNCTION_INFO'):
for extension_variable in extension.FUNCTION_INFO:
extension_variables.append(extension_variable)
var_extension = extension.FUNCTION_INFO[extension_variable]
extension_caption = var_extension['caption'] \
Expand Down
39 changes: 39 additions & 0 deletions test/testOutputCSV.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,45 @@ def test_csv_no_header_with_extension(self):
sys.stdout.stream.splitlines()[0]
)

def test_csv_header_with_multi_field_extension(self):
options_mock = Mock()
options_mock.verbose = True
extension_mock = Mock()
extension_mock.__class__.__name__ = 'LizardExtension'
extension_mock.FUNCTION_INFO = {
"metric_one": {"caption": " metric_one "},
"metric_two": {"caption": " metric_two "},
}
options_mock.extensions = [extension_mock]
results = AllResult([self.fileSummary])
results.result[0].function_list[0].metric_one = 12.5
results.result[0].function_list[0].metric_two = 99.0
csv_output(results, options_mock)
self.assertRegex(
sys.stdout.stream,
r"NLOC,CCN,token,PARAM,length,location,file,function,"
r"long_name,start,end, metric_one , metric_two ")

def test_csv_row_with_multi_field_extension(self):
options_mock = Mock()
options_mock.verbose = False
extension_mock = Mock()
extension_mock.__class__.__name__ = 'LizardExtension'
extension_mock.FUNCTION_INFO = {
"metric_one": {"caption": " metric_one "},
"metric_two": {"caption": " metric_two "},
}
options_mock.extensions = [extension_mock]
results = AllResult([self.fileSummary])
results.result[0].function_list[0].metric_one = 12.5
results.result[0].function_list[0].metric_two = 99.0
csv_output(results, options_mock)
self.assertEqual(
'1,1,1,0,1,"foo@100-100@FILENAME","FILENAME","foo","foo",'
'100,100,12.5,99.0',
sys.stdout.stream.splitlines()[0]
)

def test_print_fileinfo(self):
options_mock = Mock()
options_mock.verbose = True
Expand Down