Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion hed/schema/schema_compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ def compare_differences(schema1, schema2, output='raw', attribute_filter=None, s
final_string = ""
if include_summary:
final_string += _pretty_print_header(header_summary)
if not final_string:
return final_string
final_string = ("Overall summary:\n================\n" + final_string + \
"\n\n\nSummary details:\n================\n\n")
for section_key in sections:
val1, val2, val3 = unequal_entries[section_key], not_in_1[section_key], not_in_2[section_key]
type_name = SectionEntryNames[section_key]
Expand Down Expand Up @@ -250,6 +254,7 @@ def _get_tag_name_summary(tag_dicts):


def _pretty_print_header(summary_dict):

output_string = ""
first_entry = True
for section_key, tag_names in summary_dict.items():
Expand All @@ -264,7 +269,6 @@ def _pretty_print_header(summary_dict):

output_string += "\n"
first_entry = False
output_string += "\n"
return output_string


Expand Down
8 changes: 7 additions & 1 deletion tests/schema/test_schema_compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,20 @@ def test_compare_score_lib_versions(self):
schema2 = load_schema_version("score_1.1.0")
not_in_schema1, not_in_schema2, unequal_entries = compare_differences(schema1, schema2,
attribute_filter=HedKey.InLibrary)


self.assertEqual(len(not_in_schema1[HedSectionKey.Tags]), 21)
self.assertEqual(len(not_in_schema2[HedSectionKey.Tags]), 10)
self.assertEqual(len(unequal_entries[HedSectionKey.Tags]), 61)

diff_string = compare_differences(schema1, schema1, attribute_filter=HedKey.InLibrary, output='string',
sections=None)
self.assertFalse(diff_string)
diff_string = compare_differences(schema1, schema2, attribute_filter=HedKey.InLibrary, output='string',
sections=None)

self.assertIsInstance(diff_string, str)
# print(diff_string)
print(diff_string)

json_style_dict = compare_differences(schema1, schema2, attribute_filter=HedKey.InLibrary, output='dict',
sections=None)
Expand Down