diff --git a/unittests/test_db_factory.py b/unittests/test_db_factory.py index c1f52cb..1618fd3 100644 --- a/unittests/test_db_factory.py +++ b/unittests/test_db_factory.py @@ -5,7 +5,6 @@ Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ import glob -import json import os import unittest from unittest import TestCase @@ -16,6 +15,7 @@ from unittests.control import Control control = Control() + class TestDBFactory(TestCase): """ TestDBFactory @@ -59,6 +59,9 @@ TestDBFactory control.application_id, control.user_id) city_objects_id = [] + request_values = { + 'scenarios': [{'current status': ['1']}] + } for building in control.city.buildings: _building = control.database.building_info(building.name, city_id) if cte.MONTH not in building.cooling_demand: @@ -96,36 +99,36 @@ TestDBFactory for x in building.onsite_electrical_production[cte.MONTH]] yearly_on_site_electrical_production = [x * cte.WATTS_HOUR_TO_JULES for x in building.onsite_electrical_production[cte.YEAR]] - results = json.dumps({cte.INSEL_MEB: [ - {'monthly_cooling_peak_load': monthly_cooling_peak_load}, - {'yearly_cooling_peak_load': yearly_cooling_peak_load}, - {'monthly_heating_peak_load': monthly_heating_peak_load}, - {'yearly_heating_peak_load': yearly_heating_peak_load}, - {'monthly_lighting_peak_load': monthly_lighting_peak_load}, - {'yearly_lighting_peak_load': yearly_lighting_peak_load}, - {'monthly_appliances_peak_load': monthly_appliances_peak_load}, - {'yearly_appliances_peak_load': yearly_appliances_peak_load}, - {'monthly_cooling_demand': monthly_cooling_demand}, - {'yearly_cooling_demand': yearly_cooling_demand}, - {'monthly_heating_demand': monthly_heating_demand}, - {'yearly_heating_demand': yearly_heating_demand}, - {'monthly_lighting_electrical_demand': monthly_lighting_electrical_demand}, - {'yearly_lighting_electrical_demand': yearly_lighting_electrical_demand}, - {'monthly_appliances_electrical_demand': monthly_appliances_electrical_demand}, - {'yearly_appliances_electrical_demand': yearly_appliances_electrical_demand}, - {'monthly_domestic_hot_water_heat_demand': monthly_domestic_hot_water_heat_demand}, - {'yearly_domestic_hot_water_heat_demand': yearly_domestic_hot_water_heat_demand}, - {'monthly_heating_consumption': monthly_heating_consumption}, - {'yearly_heating_consumption': yearly_heating_consumption}, - {'monthly_cooling_consumption': monthly_cooling_consumption}, - {'yearly_cooling_consumption': yearly_cooling_consumption}, - {'monthly_domestic_hot_water_consumption': monthly_domestic_hot_water_consumption}, - {'yearly_domestic_hot_water_consumption': yearly_domestic_hot_water_consumption}, - {'monthly_distribution_systems_electrical_consumption': monthly_distribution_systems_electrical_consumption}, - {'yearly_distribution_systems_electrical_consumption': yearly_distribution_systems_electrical_consumption}, - {'monthly_on_site_electrical_production': monthly_on_site_electrical_production}, - {'yearly_on_site_electrical_production': yearly_on_site_electrical_production} - ]}) + results = {cte.INSEL_MEB: { + 'monthly_cooling_peak_load': monthly_cooling_peak_load, + 'yearly_cooling_peak_load': yearly_cooling_peak_load, + 'monthly_heating_peak_load': monthly_heating_peak_load, + 'yearly_heating_peak_load': yearly_heating_peak_load, + 'monthly_lighting_peak_load': monthly_lighting_peak_load, + 'yearly_lighting_peak_load': yearly_lighting_peak_load, + 'monthly_appliances_peak_load': monthly_appliances_peak_load, + 'yearly_appliances_peak_load': yearly_appliances_peak_load, + 'monthly_cooling_demand': monthly_cooling_demand, + 'yearly_cooling_demand': yearly_cooling_demand, + 'monthly_heating_demand': monthly_heating_demand, + 'yearly_heating_demand': yearly_heating_demand, + 'monthly_lighting_electrical_demand': monthly_lighting_electrical_demand, + 'yearly_lighting_electrical_demand': yearly_lighting_electrical_demand, + 'monthly_appliances_electrical_demand': monthly_appliances_electrical_demand, + 'yearly_appliances_electrical_demand': yearly_appliances_electrical_demand, + 'monthly_domestic_hot_water_heat_demand': monthly_domestic_hot_water_heat_demand, + 'yearly_domestic_hot_water_heat_demand': yearly_domestic_hot_water_heat_demand, + 'monthly_heating_consumption': monthly_heating_consumption, + 'yearly_heating_consumption': yearly_heating_consumption, + 'monthly_cooling_consumption': monthly_cooling_consumption, + 'yearly_cooling_consumption': yearly_cooling_consumption, + 'monthly_domestic_hot_water_consumption': monthly_domestic_hot_water_consumption, + 'yearly_domestic_hot_water_consumption': yearly_domestic_hot_water_consumption, + 'monthly_distribution_systems_electrical_consumption': monthly_distribution_systems_electrical_consumption, + 'yearly_distribution_systems_electrical_consumption': yearly_distribution_systems_electrical_consumption, + 'monthly_on_site_electrical_production': monthly_on_site_electrical_production, + 'yearly_on_site_electrical_production': yearly_on_site_electrical_production + }} db_building_id = _building.id city_objects_id.append(db_building_id) @@ -134,6 +137,13 @@ TestDBFactory results, city_object_id=db_building_id) self.assertEqual(17, len(city_objects_id), 'wrong number of results') self.assertIsNotNone(city_objects_id[0], 'city_object_id is None') + results = control.database.results(control.user_id, control.application_id, request_values) + self.assertEqual( + 28, + len(results['current status'][0]['insel meb'].keys()), + 'wrong number of results after retrieve' + ) + for _id in city_objects_id: control.database.delete_results_by_name('insel meb', city_object_id=_id) control.database.delete_city(city_id)