From 0b70c127f4aa78f4459b6729788f584e9e9c8bfc Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Thu, 21 Dec 2023 16:04:05 +0000 Subject: [PATCH] Added is_secondary_glazing to unit tests --- .idea/Model.iml | 2 +- .idea/misc.xml | 2 +- recommendations/tests/test_window_recommendations.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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/recommendations/tests/test_window_recommendations.py b/recommendations/tests/test_window_recommendations.py index 359dd962..ac461594 100644 --- a/recommendations/tests/test_window_recommendations.py +++ b/recommendations/tests/test_window_recommendations.py @@ -40,7 +40,7 @@ class TestWindowRecommendations: 'starting_u_value': None, 'new_u_value': None, 'sap_points': None, 'total': 5721.943248, 'subtotal': 4768.28604, 'vat': 953.6572080000001, 'contingency': 340.59186, 'preliminaries': 340.59186, 'material': 1275.75, 'profit': 681.18372, 'labour_hours': 45.5, 'labour_cost': 994.8624, - 'labour_days': 2.84375}] + 'labour_days': 2.84375, 'is_secondary_glazing': False}] def test_partial_double_glazed(self): """ @@ -75,7 +75,7 @@ class TestWindowRecommendations: 'starting_u_value': None, 'new_u_value': None, 'sap_points': None, 'total': 4087.10232, 'subtotal': 3405.9186, 'vat': 681.18372, 'contingency': 243.2799, 'preliminaries': 243.2799, 'material': 911.25, 'profit': 486.5598, 'labour_hours': 32.5, 'labour_cost': 710.6160000000001, - 'labour_days': 2.03125}] + 'labour_days': 2.03125, 'is_secondary_glazing': False}] def test_fully_double_glazed(self): """ @@ -158,7 +158,7 @@ class TestWindowRecommendations: 'starting_u_value': None, 'new_u_value': None, 'sap_points': None, 'total': 1089.893952, 'subtotal': 908.24496, 'vat': 181.64899200000002, 'contingency': 64.87464, 'preliminaries': 64.87464, 'material': 729.0, 'profit': 129.74928, 'labour_hours': 13.0, 'labour_cost': 568.4928, - 'labour_days': 0.8125}] + 'labour_days': 0.8125, 'is_secondary_glazing': True}] def test_single_glazed_restricted_measures(self): property_6 = Property( @@ -192,7 +192,7 @@ class TestWindowRecommendations: 'total': 1907.314416, 'subtotal': 1589.42868, 'vat': 317.885736, 'contingency': 113.53062, 'preliminaries': 113.53062, 'material': 1275.75, 'profit': 227.06124, 'labour_hours': 22.75, - 'labour_cost': 994.8624, 'labour_days': 1.421875} + 'labour_cost': 994.8624, 'labour_days': 1.421875, 'is_secondary_glazing': True} ] def test_full_triple_glazed(self): @@ -250,4 +250,4 @@ class TestWindowRecommendations: 'starting_u_value': None, 'new_u_value': None, 'sap_points': None, 'total': 1634.840928, 'subtotal': 1362.36744, 'vat': 272.47348800000003, 'contingency': 97.31196, 'preliminaries': 97.31196, 'material': 364.5, 'profit': 194.62392, 'labour_hours': 13.0, 'labour_cost': 284.2464, - 'labour_days': 0.8125}] + 'labour_days': 0.8125, 'is_secondary_glazing': False}]