diff --git a/tests/fixtures/0.4/additional_fields_2.json b/tests/fixtures/0.4/additional_fields_2.json new file mode 100644 index 0000000..c2dec31 --- /dev/null +++ b/tests/fixtures/0.4/additional_fields_2.json @@ -0,0 +1,34 @@ +[ + { + "statementId": "GB-COH-00844529-noBeneficialOwners-20240918", + "statementDate": "2024-09-18", + "publicationDetails": { + "publicationDate": "2024-09-18", + "bodsVersion": "0.4", + "license": "https://creativecommons.org/publicdomain/zero/1.0/", + "publisher": { + "name": "Open Ownership", + "url": "https://www.openownership.org/" + } + }, + "recordId": "00844529", + "recordType": "relationship", + "recordStatus": "new", + "source": { + "type": [ + "officialRegister" + ], + "url": "https://link-to-source.org/", + "retrievedAt": "2024-09-18" + }, + "declarationSubject": "00844529", + "recordDetails": { + "isComponent": false, + "subject": "00844529", + "interestedParty": { + "reason": "noBeneficialOwners", + "description": "no-individual-or-entity-with-signficant-control" + } + } + } +] diff --git a/tests/test_additional_checks_0_4_0.py b/tests/test_additional_checks_0_4_0.py index 7e5b5b4..3d7dcc4 100644 --- a/tests/test_additional_checks_0_4_0.py +++ b/tests/test_additional_checks_0_4_0.py @@ -586,8 +586,6 @@ def test_statement_person_birth_date_sensible_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -609,8 +607,6 @@ def test_statement_person_birth_date_sensible_valid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -863,8 +859,6 @@ def test_statement_relationship_interests_share_values_invalid_6(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -949,8 +943,6 @@ def test_statement_entity_is_component_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -972,8 +964,6 @@ def test_statement_entity_is_component_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -995,8 +985,6 @@ def test_statement_entity_is_component_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1018,8 +1006,6 @@ def test_statement_person_is_component_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1041,8 +1027,6 @@ def test_statement_person_is_component_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1064,8 +1048,6 @@ def test_statement_person_is_component_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1087,8 +1069,6 @@ def test_statement_relationship_is_component_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1110,8 +1090,6 @@ def test_statement_relationship_is_component_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1133,8 +1111,6 @@ def test_statement_relationship_is_component_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1151,14 +1127,11 @@ def test_statement_duplicate_statement_id_invalid_1(): "fixtures", "0.4", "additional-checks", - # "statement_duplicate_statement_id-invalid-1.json", "statement_must_have_unique_statement_identifier-invalid-1.json", ) results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1175,14 +1148,11 @@ def test_statement_duplicate_statement_id_invalid_2(): "fixtures", "0.4", "additional-checks", - # "statement_duplicate_statement_id-invalid-2.json", "statement_must_have_unique_statement_identifier-invalid-1.json", ) results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1204,8 +1174,6 @@ def test_statement_duplicate_statement_id_invalid_3(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1222,14 +1190,11 @@ def test_statement_duplicate_statement_id_valid_1(): "fixtures", "0.4", "additional-checks", - # "statement_duplicate_statement_id-valid-1.json", "statement_must_have_unique_statement_identifier-valid-1.json", ) results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1251,8 +1216,6 @@ def test_statement_series_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1274,8 +1237,6 @@ def test_statement_series_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1297,8 +1258,6 @@ def test_statement_series_invalid_3(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1320,8 +1279,6 @@ def test_statement_series_invalid_4(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1343,8 +1300,6 @@ def test_statement_series_invalid_5(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1366,8 +1321,6 @@ def test_statement_series_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1389,8 +1342,6 @@ def test_statement_series_valid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1412,8 +1363,6 @@ def test_statement_relationship_component_records_are_record_ids_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1435,8 +1384,6 @@ def test_statement_relationship_component_records_are_record_ids_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1458,8 +1405,6 @@ def test_statement_relationship_component_records_are_record_ids_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1481,8 +1426,6 @@ def test_relationship_subject_refers_to_entity_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1504,8 +1447,6 @@ def test_relationship_subject_refers_to_entity_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1527,8 +1468,6 @@ def test_relationship_subject_refers_to_entity_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1550,8 +1489,6 @@ def test_relationship_interested_party_entity_or_person_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1573,8 +1510,6 @@ def test_statement_annotiation_statement_pointer_target_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1596,8 +1531,6 @@ def test_statement_annotiation_statement_pointer_target_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1619,8 +1552,6 @@ def test_statement_annotiation_statement_pointer_target_invalid_3(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1642,8 +1573,6 @@ def test_statement_annotiation_statement_pointer_target_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1665,8 +1594,6 @@ def test_statement_annotiation_statement_pointer_target_valid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1688,8 +1615,6 @@ def test_interested_party_person_with_beneficial_ownership_or_control_invalid_1( results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1711,8 +1636,6 @@ def test_interested_party_person_with_beneficial_ownership_or_control_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1734,8 +1657,6 @@ def test_interested_party_person_with_beneficial_ownership_or_control_valid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1757,8 +1678,6 @@ def test_relationship_interest_nominee_or_nominator_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1780,8 +1699,6 @@ def test_relationship_interest_nominee_or_nominator_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1803,8 +1720,6 @@ def test_relationship_interest_nominee_or_nominator_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1826,8 +1741,6 @@ def test_relationship_interest_for_trusts_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1849,8 +1762,6 @@ def test_relationship_interest_for_trusts_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1872,8 +1783,6 @@ def test_relationship_interest_for_trusts_invalid_3(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1895,8 +1804,6 @@ def test_relationship_interest_for_trusts_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1918,8 +1825,6 @@ def test_relationship_interest_for_trusts_valid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1941,8 +1846,6 @@ def test_relationship_interest_for_trusts_valid_3(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1964,8 +1867,6 @@ def test_statement_serialisation_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -1987,8 +1888,6 @@ def test_statement_serialisation_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2010,8 +1909,6 @@ def test_statement_serialisation_invalid_3(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2033,8 +1930,6 @@ def test_statement_serialisation_invalid_4(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2056,8 +1951,6 @@ def test_statement_serialisation_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2079,8 +1972,6 @@ def test_statement_person_identifiers_have_correct_scheme_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2102,8 +1993,6 @@ def test_statement_person_identifiers_have_correct_scheme_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2125,8 +2014,6 @@ def test_statement_person_identifiers_have_correct_scheme_invalid_3(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2148,8 +2035,6 @@ def test_statement_person_identifiers_have_correct_scheme_invalid_4(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2171,8 +2056,6 @@ def test_statement_person_identifiers_have_correct_scheme_invalid_5(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2194,8 +2077,6 @@ def test_statement_person_identifiers_have_correct_scheme_invalid_6(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2217,8 +2098,6 @@ def test_statement_person_identifiers_have_correct_scheme_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2240,8 +2119,6 @@ def test_statement_person_identifiers_have_correct_scheme_valid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2264,8 +2141,6 @@ def test_statement_entity_identifier_scheme_known_invalid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2288,8 +2163,6 @@ def test_statement_entity_identifier_scheme_known_invalid_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 @@ -2312,8 +2185,6 @@ def test_statement_entity_identifier_scheme_known_valid_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 diff --git a/tests/test_additional_fields_0_4_0.py b/tests/test_additional_fields_0_4_0.py index d760be4..116924e 100644 --- a/tests/test_additional_fields_0_4_0.py +++ b/tests/test_additional_fields_0_4_0.py @@ -19,14 +19,11 @@ def test_additional_fields_1(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 2 assert results["additional_checks_count"] == 0 - assert False def test_additional_fields_2(): @@ -39,39 +36,9 @@ def test_additional_fields_2(): results = bods_json_output(cove_temp_folder, json_filename) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 - assert results["additional_checks_count"] == 0 - - assert False - -def test_additional_fields_3(): - - json_filename = os.path.join( - os.path.dirname(os.path.realpath(__file__)), "fixtures", "0.4", "additional_fields_2.json" - ) - - process_data = {} - - process_data['sample_mode'] = False - process_data["json_data_filename"] = json_filename - process_data['config'] = process_data['config'] = LibCoveBODSConfig() - - process_data['data_reader'] = libcovebods.data_reader.DataReader( - process_data["json_data_filename"], sample_mode=process_data['sample_mode'] - ) - - process_data['schema'] = SchemaBODS(process_data['data_reader'], process_data['config']) - - worker = AdditionalFields(process_data['schema']) - - output = worker.process(process_data['data_reader']) - - print("Schema:", process_data['schema']) + assert results["additional_checks_count"] == 2 # Some checks fail because isolated statement - print(output) - assert False diff --git a/tests/test_api_0_1.py b/tests/test_api_0_1.py index f23adad..3fc5d69 100644 --- a/tests/test_api_0_1.py +++ b/tests/test_api_0_1.py @@ -587,7 +587,6 @@ def test_basic_statement_id_and_type_errors(): assert validation_error["path"] == [3] validation_error = results["validation_errors"][4] - print(validation_error) assert "Invalid code found in statementType" == validation_error["message"] assert validation_error["path"] == [4, "statementType"] diff --git a/tests/test_sample_mode.py b/tests/test_sample_mode.py index cbbdac4..01ee25e 100644 --- a/tests/test_sample_mode.py +++ b/tests/test_sample_mode.py @@ -18,8 +18,6 @@ def test_sample_mode_valid_1(): results = bods_json_output(cove_temp_folder, json_filename, sample_mode=True) - print(results) - assert results["schema_version"] == "0.4" assert results["validation_errors_count"] == 0 assert results["additional_fields_count"] == 0 diff --git a/tests/test_schema_validation_0_4.py b/tests/test_schema_validation_0_4.py index 54f690e..ff377e8 100644 --- a/tests/test_schema_validation_0_4.py +++ b/tests/test_schema_validation_0_4.py @@ -86,8 +86,7 @@ def test_all_schema_validation_invalid(expected_errors): ): pass else: - print(expected) - print(results["validation_errors"][0]) + pass def test_all_schema_validation_valid(valid_statements): diff --git a/tests/test_stat_counts_0_4.py b/tests/test_stat_counts_0_4.py index 3dc0776..b221b8b 100644 --- a/tests/test_stat_counts_0_4.py +++ b/tests/test_stat_counts_0_4.py @@ -18,8 +18,6 @@ def test_sample_mode_valid_1(): results = bods_json_output(cove_temp_folder, json_filename, sample_mode=True) - #print(results) - assert results["schema_version"] == "0.4" assert results['statistics']['count_entity_statements'] == 50 @@ -37,6 +35,3 @@ def test_sample_mode_valid_1(): assert results['statistics']['count_ownership_or_control_statement_by_year'][2020] == 50 assert results['statistics']['count_ownership_or_control_statement_subject_by_year'][2020] == 50 assert results['statistics']['count_ownership_or_control_statement_interested_party_by_year'][2020] == 50 - - -#'count_declaration_subjects': 50, 'count_records_current': 150, 'count_new_records_missing': 0