diff --git a/.idea/Model.iml b/.idea/Model.iml
index 4413bb06..b0f9c00d 100644
--- a/.idea/Model.iml
+++ b/.idea/Model.iml
@@ -7,7 +7,7 @@
-
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6f308057..1122b380 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/backend/tests/test_sap_model_prep.py b/backend/tests/test_sap_model_prep.py
index da38cabf..d1a643ee 100644
--- a/backend/tests/test_sap_model_prep.py
+++ b/backend/tests/test_sap_model_prep.py
@@ -195,7 +195,7 @@ class TestSapModelPrep:
'is_granite_or_whinstone': False, 'is_as_built': True, 'is_cob': False,
'is_sandstone_or_limestone': False, 'is_park_home': False, 'walls_insulation_thickness': 'none',
'external_insulation': False, 'internal_insulation': False, 'walls_thermal_transmittance_ENDING': 0.7,
- 'is_park_home_ENDING': False, 'walls_insulation_thickness_ENDING': 'none',
+ 'is_park_home_ENDING': False, 'walls_insulation_thickness_ENDING': 'average',
'external_insulation_ENDING': False, 'internal_insulation_ENDING': False,
'floor_thermal_transmittance': 0.64, 'is_to_unheated_space': False, 'is_to_external_air': False,
'is_suspended': True, 'is_solid': False, 'another_property_below': False,
@@ -253,7 +253,29 @@ class TestSapModelPrep:
'no_individual_heating_or_community_network': False, 'complex_fuel_type': 'Unknown',
'fuel_type_ENDING': 'oil', 'main-fuel_tariff_type_ENDING': 'Unknown', 'is_community_ENDING': False,
'no_individual_heating_or_community_network_ENDING': False, 'complex_fuel_type_ENDING': 'Unknown',
- 'estimated_perimeter_STARTING': 44.77882152472145, 'estimated_perimeter_ENDING': 44.77882152472145
+ 'estimated_perimeter_STARTING': 44.77882152472145, 'estimated_perimeter_ENDING': 44.77882152472145,
+ 'HOT_WATER_ENERGY_EFF_STARTING': "Good",
+ "FLOOR_ENERGY_EFF_STARTING": "Unknown",
+ "WINDOWS_ENERGY_EFF_STARTING": "Good",
+ "WALLS_ENERGY_EFF_STARTING": "Poor",
+ "SHEATING_ENERGY_EFF_STARTING": "Unknown",
+ "ROOF_ENERGY_EFF_STARTING": "Very Poor",
+ "MAINHEAT_ENERGY_EFF_STARTING": "Average",
+ "MAINHEATC_ENERGY_EFF_STARTING": "Good",
+ "LIGHTING_ENERGY_EFF_STARTING": "Average",
+ "POTENTIAL_ENERGY_EFFICIENCY": 64,
+ "ENVIRONMENT_IMPACT_POTENTIAL": 53,
+ "ENERGY_CONSUMPTION_POTENTIAL": 177.0,
+ "CO2_EMISSIONS_POTENTIAL": 5.7,
+ "HOT_WATER_ENERGY_EFF_ENDING": "Good",
+ "FLOOR_ENERGY_EFF_ENDING": "Unknown",
+ "WINDOWS_ENERGY_EFF_ENDING": "Good",
+ "WALLS_ENERGY_EFF_ENDING": "Good",
+ "SHEATING_ENERGY_EFF_ENDING": "Unknown",
+ "ROOF_ENERGY_EFF_ENDING": "Very Poor",
+ "MAINHEAT_ENERGY_EFF_ENDING": "Average",
+ "MAINHEATC_ENERGY_EFF_ENDING": "Good",
+ "LIGHTING_ENERGY_EFF_ENDING": "Average",
}
home = Property(
@@ -321,10 +343,9 @@ class TestSapModelPrep:
continue
if c == "walls_insulation_thickness_ENDING":
- print("Add back in the checks")
- continue
assert row[c] == "average"
- assert test_record[c] == "above average"
+ assert test_record[c].values[0] == "above average"
+ continue
assert test_record[c].values[0] == row[c]