From 763b88cd1edc46c7201cf5ea334dfef8c4b256c0 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Fri, 17 Nov 2023 13:55:46 +0000 Subject: [PATCH] fix tests for convert thickness to numeric --- .../tests/test_recommendation_utils.py | 19 ++++++++++++------- .../tests/test_roof_recommendations.py | 9 ++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/recommendations/tests/test_recommendation_utils.py b/recommendations/tests/test_recommendation_utils.py index b0c8a26b..22280ed5 100644 --- a/recommendations/tests/test_recommendation_utils.py +++ b/recommendations/tests/test_recommendation_utils.py @@ -280,14 +280,19 @@ class TestRecommendationUtils: def test_convert_thickness_to_numeric(self): - assert recommendation_utils.convert_thickness_to_numeric("none") == 0 - assert recommendation_utils.convert_thickness_to_numeric("below average") == 50 - assert recommendation_utils.convert_thickness_to_numeric("average") == 100 - assert recommendation_utils.convert_thickness_to_numeric("above average") == 270 + assert recommendation_utils.convert_thickness_to_numeric("none", True) == 0 + assert recommendation_utils.convert_thickness_to_numeric("below average", True) == 50 + assert recommendation_utils.convert_thickness_to_numeric("average", True) == 100 + assert recommendation_utils.convert_thickness_to_numeric("above average", True) == 270 - assert recommendation_utils.convert_thickness_to_numeric("300+") == 300 - assert recommendation_utils.convert_thickness_to_numeric("400+") == 400 - assert recommendation_utils.convert_thickness_to_numeric("270") == 270 + assert recommendation_utils.convert_thickness_to_numeric("300+", True) == 300 + assert recommendation_utils.convert_thickness_to_numeric("400+", True) == 400 + assert recommendation_utils.convert_thickness_to_numeric("270", True) == 270 + + assert recommendation_utils.convert_thickness_to_numeric("none", False) == 0 + assert recommendation_utils.convert_thickness_to_numeric("below average", False) == 100 + assert recommendation_utils.convert_thickness_to_numeric("average", False) == 270 + assert recommendation_utils.convert_thickness_to_numeric("above average", False) == 270 def test_estimate_perimeter_regular_inputs(): diff --git a/recommendations/tests/test_roof_recommendations.py b/recommendations/tests/test_roof_recommendations.py index a3cc9266..37cc2daf 100644 --- a/recommendations/tests/test_roof_recommendations.py +++ b/recommendations/tests/test_roof_recommendations.py @@ -362,21 +362,16 @@ class TestRoofRecommendations: roof_recommender11.recommend() - assert len(roof_recommender11.recommendations) == 2 + assert len(roof_recommender11.recommendations) == 1 assert roof_recommender11.recommendations[0]["parts"][0]["depths"] == [270] - assert roof_recommender11.recommendations[1]["parts"][0]["depths"] == [300] - assert roof_recommender11.recommendations[0]["new_u_value"] == 0.16 - assert roof_recommender11.recommendations[1]["new_u_value"] == 0.14 + assert roof_recommender11.recommendations[0]["new_u_value"] == 0.11 assert roof_recommender11.recommendations[0]["starting_u_value"] == 2.3 - assert roof_recommender11.recommendations[1]["starting_u_value"] == 2.3 assert roof_recommender11.recommendations[0]["description"] == \ "Insulate the home's flat roof with 270mm of Example flat roof insulation" - assert roof_recommender11.recommendations[1]["description"] == \ - "Insulate the home's flat roof with 300mm of Example flat roof insulation" def test_flat_insulated(self): property_instance12 = Property(id=12, address1="fake", postcode="fake", epc_client=Mock())