chore: passed ForecastParameters to tenure tests

theopensystemslab · Aug 16, 2024 · 946f669 · 946f669
1 parent b452722
commit 946f669
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 30 deletions.
diff --git a/app/models/tenure/FairholdLandPurchase.test.ts b/app/models/tenure/FairholdLandPurchase.test.ts
@@ -1,22 +1,26 @@
 import { Fairhold } from "../Fairhold";
-import { DEFAULT_FORECAST_PARAMETERS } from "../ForecastParameters";
+import { DEFAULT_FORECAST_PARAMETERS, ForecastParameters } from "../ForecastParameters";
 import { FairholdLandPurchase } from "./FairholdLandPurchase";
 
 let tenureFairholdLandPurchase: FairholdLandPurchase;
 
 beforeEach(() => {
+  const forecastParameters: ForecastParameters = {
+    ...DEFAULT_FORECAST_PARAMETERS,
+  };
+
   tenureFairholdLandPurchase = new FairholdLandPurchase({
     //incomeYearly: 45816,
     //averagePrice: 218091.58,
     newBuildPrice: 186560,
     depreciatedBuildPrice: 110717.45,
     //landPrice: 31531.579,
-    ...DEFAULT_FORECAST_PARAMETERS,
     affordability: 0.2,
     fairhold: new Fairhold({
       affordability: 0.2,
       landPriceOrRent: 31531.579,
     }),
+    forecastParameters: forecastParameters,
   });
 });
 

diff --git a/app/models/tenure/FairholdLandRent.test.ts b/app/models/tenure/FairholdLandRent.test.ts
@@ -1,10 +1,14 @@
 import { Fairhold } from "../Fairhold";
-import { DEFAULT_FORECAST_PARAMETERS } from "../ForecastParameters";
+import { DEFAULT_FORECAST_PARAMETERS, ForecastParameters } from "../ForecastParameters";
 import { FairholdLandRent } from "./FairholdLandRent";
 
 let tenureFairholdLandRent: FairholdLandRent;
 
 beforeEach(() => {
+  const forecastParameters: ForecastParameters = {
+    ...DEFAULT_FORECAST_PARAMETERS,
+  };
+
   tenureFairholdLandRent = new FairholdLandRent({
     averageRentYearly: 20000,
     incomeYearly: 45816,
@@ -17,6 +21,7 @@ beforeEach(() => {
       affordability: 0.2,
       landPriceOrRent: 20000,
     }),
+    forecastParameters: forecastParameters,
   });
 });
 

diff --git a/app/models/tenure/MarketPurchase.test.ts b/app/models/tenure/MarketPurchase.test.ts
@@ -1,16 +1,11 @@
 import { MarketPurchase } from "./MarketPurchase";
+import { DEFAULT_FORECAST_PARAMETERS, ForecastParameters } from "../ForecastParameters";
 
 let tenureMarketPurchase: MarketPurchase;
 
 beforeEach(() => {
-  const forecastParameters = {
-    maintenanceCostPercentage: 0.0125, // percentage maintenance cost
-    incomeGrowthPerYear: 0.04, // 4% income growth per year
-    constructionPriceGrowthPerYear: 0.025, // 2.5%
-    rentGrowthPerYear: 0.03, // 3%
-    propertyPriceGrowthPerYear: 0.05, // 5%
-    yearsForecast: 40, // 40 years
-    affordabilityThresholdIncomePercentage: 0.35, // percentage of imcome to afford rent or purchase
+  const forecastParameters: ForecastParameters = {
+    ...DEFAULT_FORECAST_PARAMETERS,
   };
 
   tenureMarketPurchase = new MarketPurchase({
@@ -19,11 +14,7 @@ beforeEach(() => {
     newBuildPrice: 186560,
     depreciatedBuildPrice: 110717.45,
     landPrice: 31531.579,
-    propertyPriceGrowthPerYear: forecastParameters.propertyPriceGrowthPerYear,
-    constructionPriceGrowthPerYear:
-      forecastParameters.constructionPriceGrowthPerYear,
-    yearsForecast: forecastParameters.yearsForecast,
-    maintenanceCostPercentage: forecastParameters.maintenanceCostPercentage,
+    forecastParameters: forecastParameters,
   });
 });
 

diff --git a/app/models/tenure/MarketRent.test.ts b/app/models/tenure/MarketRent.test.ts
@@ -1,16 +1,11 @@
 import { MarketRent } from "./MarketRent";
+import { DEFAULT_FORECAST_PARAMETERS, ForecastParameters } from "../ForecastParameters";
 
 let tenureMarketRent: MarketRent;
 
 beforeEach(() => {
-  const forecastParameters = {
-    maintenanceCostPercentage: 0.0125, // percentage maintenance cost
-    incomeGrowthPerYear: 0.04, // 4% income growth per year
-    constructionPriceGrowthPerYear: 0.025, // 2.5%
-    rentGrowthPerYear: 0.03, // 3%
-    propertyPriceGrowthPerYear: 0.05, // 5%
-    yearsForecast: 40, // 40 years
-    affordabilityThresholdIncomePercentage: 0.35, // percentage of imcome to afford rent or purchase
+  const forecastParameters: ForecastParameters = {
+    ...DEFAULT_FORECAST_PARAMETERS,
   };
 
   tenureMarketRent = new MarketRent({
@@ -20,12 +15,7 @@ beforeEach(() => {
     newBuildPrice: 186560,
     depreciatedBuildPrice: 110717.45,
     landPrice: 31531.579,
-    propertyPriceGrowthPerYear: forecastParameters.propertyPriceGrowthPerYear,
-    constructionPriceGrowthPerYear:
-      forecastParameters.constructionPriceGrowthPerYear,
-    yearsForecast: forecastParameters.yearsForecast,
-    maintenanceCostPercentage: forecastParameters.maintenanceCostPercentage,
-    rentGrowthPerYear: forecastParameters.rentGrowthPerYear,
+    forecastParameters: forecastParameters,
   });
 });