From 445c394a995ac229f90ea92f60fd2ff8e8e2cd09 Mon Sep 17 00:00:00 2001
From: sambles <sambles@users.noreply.github.com>
Date: Tue, 28 Jan 2025 13:18:34 +0000
Subject: [PATCH] Fix/testing oed4 update (#1160)
* update test_analysis_model
* fix test_portfolio
* pep
---
.../v1_api/tests/test_analysis_model.py | 15 ++++++++-------
.../v2_api/tests/test_analysis_model.py | 15 ++++++++-------
.../portfolios/v1_api/tests/test_portfolio.py | 3 ---
.../portfolios/v2_api/tests/test_portfolio.py | 3 ---
4 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/server/oasisapi/analysis_models/v1_api/tests/test_analysis_model.py b/src/server/oasisapi/analysis_models/v1_api/tests/test_analysis_model.py
index 84ef13422..41777a748 100644
--- a/src/server/oasisapi/analysis_models/v1_api/tests/test_analysis_model.py
+++ b/src/server/oasisapi/analysis_models/v1_api/tests/test_analysis_model.py
@@ -193,13 +193,14 @@ def test_settings_json_is_not_valid___response_is_400(self):
)
validation_error = {
- 'model_settings': ["Additional properties are not allowed ('float_parameter' was unexpected)"],
- 'model_settings-event_set': ["'desc' is a required property"],
- 'model_settings-event_occurrence_id-default': ["1 is not of type 'string'"],
- 'model_settings-boolean_parameters-0-default': ["1.1 is not of type 'boolean'"],
- '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)
diff --git a/src/server/oasisapi/analysis_models/v2_api/tests/test_analysis_model.py b/src/server/oasisapi/analysis_models/v2_api/tests/test_analysis_model.py
index 6eb190fc1..e548a473e 100644
--- a/src/server/oasisapi/analysis_models/v2_api/tests/test_analysis_model.py
+++ b/src/server/oasisapi/analysis_models/v2_api/tests/test_analysis_model.py
@@ -365,13 +365,14 @@ def test_settings_json_is_not_valid___response_is_400(self):
)
validation_error = {
- 'model_settings': ["Additional properties are not allowed ('float_parameter' was unexpected)"],
- 'model_settings-event_set': ["'desc' is a required property"],
- 'model_settings-event_occurrence_id-default': ["1 is not of type 'string'"],
- 'model_settings-boolean_parameters-0-default': ["1.1 is not of type 'boolean'"],
- '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)
diff --git a/src/server/oasisapi/portfolios/v1_api/tests/test_portfolio.py b/src/server/oasisapi/portfolios/v1_api/tests/test_portfolio.py
index 3aa7aa844..7bf6535b4 100644
--- a/src/server/oasisapi/portfolios/v1_api/tests/test_portfolio.py
+++ b/src/server/oasisapi/portfolios/v1_api/tests/test_portfolio.py
@@ -1190,11 +1190,8 @@ def test_account_file__is_invalid__response_is_400(self):
['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 'CountryCode' 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 'StreetAddress' is not a valid oed field"],
- ['account', "column 'PostalCode' 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"],
diff --git a/src/server/oasisapi/portfolios/v2_api/tests/test_portfolio.py b/src/server/oasisapi/portfolios/v2_api/tests/test_portfolio.py
index e841e275e..7fdc89692 100644
--- a/src/server/oasisapi/portfolios/v2_api/tests/test_portfolio.py
+++ b/src/server/oasisapi/portfolios/v2_api/tests/test_portfolio.py
@@ -1434,11 +1434,8 @@ def test_account_file__is_invalid__response_is_400(self):
['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 'CountryCode' 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 'StreetAddress' is not a valid oed field"],
- ['account', "column 'PostalCode' 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"],