Skip to content

Commit

Permalink
pep
Browse files Browse the repository at this point in the history
  • Loading branch information
@sambles
sambles committed Jan 28, 2025
1 parent 7a79b5f commit ec05611
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 50 deletions.
16 changes: 8 additions & 8 deletions src/server/oasisapi/analysis_models/v1_api/tests/test_analysis_model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,14 @@ def test_settings_json_is_not_valid___response_is_400(self):
)

validation_error = {
"model_settings-boolean_parameters-0-default":["1.1 is not of type 'boolean'"],
"model_settings-event_set":["'desc' is a required property"],
"model_settings-event_occurrence_id-default":["1 is not of type 'string'"],
"lookup_settings-supported_perils-0":["Additional properties are not allowed ('i' was unexpected)",
"'id' is a required property"],
"lookup_settings-supported_perils-1":["Additional properties are not allowed ('des' was unexpected)",
"'desc' is a required property"],
"lookup_settings-supported_perils-2-id":["'WW11' is too long"]
"model_settings-boolean_parameters-0-default": ["1.1 is not of type 'boolean'"],
"model_settings-event_set": ["'desc' is a required property"],
"model_settings-event_occurrence_id-default": ["1 is not of type 'string'"],
"lookup_settings-supported_perils-0": ["Additional properties are not allowed ('i' was unexpected)",
"'id' is a required property"],
"lookup_settings-supported_perils-1": ["Additional properties are not allowed ('des' was unexpected)",
"'desc' is a required property"],
"lookup_settings-supported_perils-2-id": ["'WW11' is too long"]
}

self.assertEqual(400, response.status_code)
Expand Down
17 changes: 8 additions & 9 deletions src/server/oasisapi/analysis_models/v2_api/tests/test_analysis_model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,17 +365,16 @@ def test_settings_json_is_not_valid___response_is_400(self):
)

validation_error = {
"model_settings-boolean_parameters-0-default":["1.1 is not of type 'boolean'"],
"model_settings-event_set":["'desc' is a required property"],
"model_settings-event_occurrence_id-default":["1 is not of type 'string'"],
"lookup_settings-supported_perils-0":["Additional properties are not allowed ('i' was unexpected)",
"'id' is a required property"],
"lookup_settings-supported_perils-1":["Additional properties are not allowed ('des' was unexpected)",
"'desc' is a required property"],
"lookup_settings-supported_perils-2-id":["'WW11' is too long"]
"model_settings-boolean_parameters-0-default": ["1.1 is not of type 'boolean'"],
"model_settings-event_set": ["'desc' is a required property"],
"model_settings-event_occurrence_id-default": ["1 is not of type 'string'"],
"lookup_settings-supported_perils-0": ["Additional properties are not allowed ('i' was unexpected)",
"'id' is a required property"],
"lookup_settings-supported_perils-1": ["Additional properties are not allowed ('des' was unexpected)",
"'desc' is a required property"],
"lookup_settings-supported_perils-2-id": ["'WW11' is too long"]
}


self.assertEqual(400, response.status_code)
self.assertDictEqual.__self__.maxDiff = None
self.assertDictEqual(json.loads(response.body), validation_error)
Expand Down
31 changes: 15 additions & 16 deletions src/server/oasisapi/portfolios/v1_api/tests/test_portfolio.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1184,25 +1184,24 @@ def test_account_file__is_invalid__response_is_400(self):
)
self.assertEqual(400, validate_response.status_code)
self.assertEqual(validate_response.json, [
['account', 'missing required column AccCurrency'],
['account', 'missing required column PolNumber'],
['account', 'missing required column PolPerilsCovered'],
['account', "column 'LocNumber' is not a valid oed field"],
['account', "column 'IsTenant' is not a valid oed field"],
['account', "column 'BuildingID' is not a valid oed field"],
['account', "column 'Latitude' is not a valid oed field"],
['account', "column 'Longitude' is not a valid oed field"],
['account', "column 'OccupancyCode' is not a valid oed field"],
['account', "column 'ConstructionCode' is not a valid oed field"],
['account', "column 'LocPerilsCovered' is not a valid oed field"],
['account', "column 'BuildingTIV' is not a valid oed field"],
['account', "column 'OtherTIV' is not a valid oed field"],
['account', "column 'ContentsTIV' is not a valid oed field"],
['account', "column 'BITIV' is not a valid oed field"],
['account', 'missing required column AccCurrency'],
['account', 'missing required column PolNumber'],
['account', 'missing required column PolPerilsCovered'],
['account', "column 'LocNumber' is not a valid oed field"],
['account', "column 'IsTenant' is not a valid oed field"],
['account', "column 'BuildingID' is not a valid oed field"],
['account', "column 'Latitude' is not a valid oed field"],
['account', "column 'Longitude' is not a valid oed field"],
['account', "column 'OccupancyCode' is not a valid oed field"],
['account', "column 'ConstructionCode' is not a valid oed field"],
['account', "column 'LocPerilsCovered' is not a valid oed field"],
['account', "column 'BuildingTIV' is not a valid oed field"],
['account', "column 'OtherTIV' is not a valid oed field"],
['account', "column 'ContentsTIV' is not a valid oed field"],
['account', "column 'BITIV' is not a valid oed field"],
['account', "column 'LocCurrency' is not a valid oed field"]
])


def test_reinsurance_info_file__is_invalid__response_is_400(self):
content_type = 'text/csv'
test_data = pd.read_csv(io.StringIO(LOCATION_DATA_VALID))
Expand Down
32 changes: 15 additions & 17 deletions src/server/oasisapi/portfolios/v2_api/tests/test_portfolio.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1428,26 +1428,24 @@ def test_account_file__is_invalid__response_is_400(self):
)
self.assertEqual(400, validate_response.status_code)
self.assertEqual(validate_response.json, [
['account', 'missing required column AccCurrency'],
['account', 'missing required column PolNumber'],
['account', 'missing required column PolPerilsCovered'],
['account', "column 'LocNumber' is not a valid oed field"],
['account', "column 'IsTenant' is not a valid oed field"],
['account', "column 'BuildingID' is not a valid oed field"],
['account', "column 'Latitude' is not a valid oed field"],
['account', "column 'Longitude' is not a valid oed field"],
['account', "column 'OccupancyCode' is not a valid oed field"],
['account', "column 'ConstructionCode' is not a valid oed field"],
['account', "column 'LocPerilsCovered' is not a valid oed field"],
['account', "column 'BuildingTIV' is not a valid oed field"],
['account', "column 'OtherTIV' is not a valid oed field"],
['account', "column 'ContentsTIV' is not a valid oed field"],
['account', "column 'BITIV' is not a valid oed field"],
['account', 'missing required column AccCurrency'],
['account', 'missing required column PolNumber'],
['account', 'missing required column PolPerilsCovered'],
['account', "column 'LocNumber' is not a valid oed field"],
['account', "column 'IsTenant' is not a valid oed field"],
['account', "column 'BuildingID' is not a valid oed field"],
['account', "column 'Latitude' is not a valid oed field"],
['account', "column 'Longitude' is not a valid oed field"],
['account', "column 'OccupancyCode' is not a valid oed field"],
['account', "column 'ConstructionCode' is not a valid oed field"],
['account', "column 'LocPerilsCovered' is not a valid oed field"],
['account', "column 'BuildingTIV' is not a valid oed field"],
['account', "column 'OtherTIV' is not a valid oed field"],
['account', "column 'ContentsTIV' is not a valid oed field"],
['account', "column 'BITIV' is not a valid oed field"],
['account', "column 'LocCurrency' is not a valid oed field"]
])



def test_reinsurance_info_file__is_invalid__response_is_400(self):
content_type = 'text/csv'
test_data = pd.read_csv(io.StringIO(LOCATION_DATA_VALID))
Expand Down

0 comments on commit ec05611

Please sign in to comment.