chore: move tests outside src directory

Use importlib import-mode for pytest. This requires shared code to be installed, which we solve by having a testing module in libecalc here.
equinor · Nov 8, 2024 · 1fca841 · 1fca841
1 parent 1980b11
commit 1fca841
Show file tree

Hide file tree

Showing 161 changed files with 57 additions and 89 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -74,6 +74,10 @@ build-backend = "poetry.core.masonry.api"
 
 # plugins, plugin config etc
 [tool.pytest.ini_options]
+testpaths = [
+    "tests",
+]
+addopts = "--import-mode=importlib"
 filterwarnings = [
     "error::DeprecationWarning", # Treat all DeprecationWarnings as errors and ignore explicitly below if needed
     "ignore:Avoid using the dto.*:DeprecationWarning", # Ignore internal deprecation warnings

diff --git a/src/tests/ecalc_cli/test_cache.py → src/libecalc/testing/__init__.py b/src/tests/ecalc_cli/test_cache.py → src/libecalc/testing/__init__.py
diff --git a/src/tests/libecalc/yaml_builder.py → src/libecalc/testing/yaml_builder.py b/src/tests/libecalc/yaml_builder.py → src/libecalc/testing/yaml_builder.py
@@ -1,9 +1,7 @@
 import abc
 from enum import Enum
-from inspect import isclass
-from typing import List, Self, TypeVar, Generic, Any, get_origin, get_args, Type, cast
+from typing import List, Self, TypeVar, Generic, get_args, cast
 
-from pydantic import TypeAdapter, BaseModel
 from typing_extensions import get_original_bases
 
 from libecalc.dto.types import ConsumerUserDefinedCategoryType
@@ -35,7 +33,7 @@
 
 
 class Builder(abc.ABC, Generic[T]):
-    __model__: type[YamlBase]
+    __model__: type[T]
 
     def __init_subclass__(cls, **kwargs):
         # When this class is subclassed we parse the type to be able to use the pydantic model for build and validate
@@ -46,11 +44,9 @@ def __init_subclass__(cls, **kwargs):
         original_base = original_bases[0]
 
         # Get the type of T in Builder[T], assuming a single class, i.e. no unions
-        model_type = [arg for arg in get_args(original_base)][0]
+        model_type: type[T] = [arg for arg in get_args(original_base)][0]
 
-        # Type should be a YamlBase
-        assert isinstance(model_type, type(YamlBase))
-        cls.__model__ = cast(type(YamlBase), model_type)
+        cls.__model__ = model_type
 
     @classmethod
     def get_model_fields(cls) -> list[str]:
@@ -115,32 +111,6 @@ def with_consumption_rate_type(self, consumption_rate_type: ConsumptionRateType)
 TYamlClass = TypeVar("TYamlClass", bound=YamlBase)
 
 
-class YamlModelContainer(Generic[TYamlClass]):
-    """
-    Consumer, Installation wrapper that can be used to bundle the component with its dependencies.
-
-    A fuel consumer that uses a model reference can then use this class to keep the referenced model in a single class.
-    """
-
-    def __init__(self, component: TYamlClass):
-        self.component = component
-        self.models = None
-        self.time_series = None
-        self.facility_inputs = None
-
-    def with_models(self, models) -> Self:
-        self.models = models
-        return self
-
-    def with_time_series(self, time_series):
-        self.time_series = time_series
-        return self
-
-    def with_facility_inputs(self, facility_inputs) -> Self:
-        self.facility_inputs = facility_inputs
-        return self
-
-
 class YamlFuelConsumerBuilder(Builder[YamlFuelConsumer]):
     def __init__(self):
         self.name = None
@@ -192,42 +162,24 @@ def with_name(self, name: str) -> Self:
         self.name = name
         return self
 
-    def with_fuel_consumers(
-        self, fuel_consumers: list[YamlFuelConsumer | YamlModelContainer[YamlFuelConsumer]]
-    ) -> Self:
+    def with_fuel_consumers(self, fuel_consumers: list[YamlFuelConsumer]) -> Self:
         new_fuel_consumers = []
         for fuel_consumer in fuel_consumers:
-            if isinstance(fuel_consumer, YamlModelContainer):
-                self._yaml_model_containers.append(fuel_consumer)
-                new_fuel_consumers.append(fuel_consumer.component)
-            else:
-                new_fuel_consumers.append(fuel_consumer)
+            new_fuel_consumers.append(fuel_consumer)
         self.fuel_consumers = new_fuel_consumers
         return self
 
-    def with_venting_emitters(
-        self, venting_emitters: list[YamlVentingEmitter | YamlModelContainer[YamlVentingEmitter]]
-    ) -> Self:
+    def with_venting_emitters(self, venting_emitters: list[YamlVentingEmitter]) -> Self:
         new_venting_emitters = []
         for venting_emitter in venting_emitters:
-            if isinstance(venting_emitter, YamlModelContainer):
-                self._yaml_model_containers.append(venting_emitter)
-                new_venting_emitters.append(venting_emitter.component)
-            else:
-                new_venting_emitters.append(venting_emitter)
+            new_venting_emitters.append(venting_emitter)
         self.venting_emitters = new_venting_emitters
         return self
 
-    def with_generator_sets(
-        self, generator_sets: list[YamlGeneratorSet | YamlModelContainer[YamlGeneratorSet]]
-    ) -> Self:
+    def with_generator_sets(self, generator_sets: list[YamlGeneratorSet]) -> Self:
         new_generator_sets = []
         for generator_set in generator_sets:
-            if isinstance(generator_set, YamlModelContainer):
-                self._yaml_model_containers.append(generator_set)
-                new_generator_sets.append(generator_set.component)
-            else:
-                new_generator_sets.append(generator_set)
+            new_generator_sets.append(generator_set)
         self.generator_sets = new_generator_sets
         return self
 
@@ -313,20 +265,14 @@ def with_variables(self, variables: YamlVariables):
         self.variables = variables
         return self
 
-    def with_installations(self, installations: List[YamlInstallation | YamlModelContainer[YamlInstallation]]):
+    def with_installations(self, installations: List[YamlInstallation]):
         if len(installations) == 0:
             self.installations = []
             return self
 
         new_installations = []
         for installation in installations:
-            if isinstance(installation, YamlModelContainer):
-                self.models.extend(installation.models)
-                self.facility_inputs.extend(installation.facility_inputs)
-                self.time_series.extend(installation.time_series)
-                new_installations.append(installation.component)
-            else:
-                new_installations.append(installation)
+            new_installations.append(installation)
 
         self.installations = new_installations
         return self

diff --git a/src/tests/conftest.py → tests/conftest.py b/src/tests/conftest.py → tests/conftest.py
@@ -21,7 +21,7 @@
 from libecalc.presentation.yaml.yaml_entities import MemoryResource, ResourceStream
 from libecalc.presentation.yaml.yaml_models.yaml_model import ReaderType, YamlConfiguration, YamlValidator
 from libecalc.presentation.yaml.yaml_types.components.yaml_asset import YamlAsset
-from tests.libecalc.yaml_builder import (
+from libecalc.testing.yaml_builder import (
     YamlAssetBuilder,
     YamlEnergyUsageModelDirectBuilder,
     YamlFuelConsumerBuilder,

diff --git a/src/tests/ecalc_cli/conftest.py → tests/ecalc_cli/conftest.py b/src/tests/ecalc_cli/conftest.py → tests/ecalc_cli/conftest.py
diff --git a/..._app/test_component_name_csv/waterinj.csv → ..._app/test_component_name_csv/waterinj.csv b/..._app/test_component_name_csv/waterinj.csv → ..._app/test_component_name_csv/waterinj.csv
diff --git a/...pp/test_component_name_json/waterinj.json → ...pp/test_component_name_json/waterinj.json b/...pp/test_component_name_json/waterinj.json → ...pp/test_component_name_json/waterinj.json
diff --git a/..._component_name_json_stdout/waterinj.json → ..._component_name_json_stdout/waterinj.json b/..._component_name_json_stdout/waterinj.json → ..._component_name_json_stdout/waterinj.json
diff --git a/...pshots/test_app/test_csv_default/test.csv → ...pshots/test_app/test_csv_default/test.csv b/...pshots/test_app/test_csv_default/test.csv → ...pshots/test_app/test_csv_default/test.csv
diff --git a/.../test_csv_resampled/results_resampled.csv → .../test_csv_resampled/results_resampled.csv b/.../test_csv_resampled/results_resampled.csv → .../test_csv_resampled/results_resampled.csv
diff --git a/...st_app/test_csv_temporal_default/test.csv → ...st_app/test_csv_temporal_default/test.csv b/...st_app/test_csv_temporal_default/test.csv → ...st_app/test_csv_temporal_default/test.csv
diff --git a/...st_csv_temporal_default/test_temporal.csv → ...st_csv_temporal_default/test_temporal.csv b/...st_csv_temporal_default/test_temporal.csv → ...st_csv_temporal_default/test_temporal.csv
diff --git a/...pshots/test_app/test_full_csv/results.csv → ...pshots/test_app/test_full_csv/results.csv b/...pshots/test_app/test_full_csv/results.csv → ...pshots/test_app/test_full_csv/results.csv
diff --git a/...pp/test_full_simplified_json/results.json → ...pp/test_full_simplified_json/results.json b/...pp/test_full_simplified_json/results.json → ...pp/test_full_simplified_json/results.json
diff --git a/...ed_model/test_json_advanced_model_v3.json → ...ed_model/test_json_advanced_model_v3.json b/...ed_model/test_json_advanced_model_v3.json → ...ed_model/test_json_advanced_model_v3.json
diff --git a/...est_json_resampled/results_resampled.json → ...est_json_resampled/results_resampled.json b/...est_json_resampled/results_resampled.json → ...est_json_resampled/results_resampled.json
diff --git a/...hots/test_app/test_json_true/test_v3.json → ...hots/test_app/test_json_true/test_v3.json b/...hots/test_app/test_json_true/test_v3.json → ...hots/test_app/test_json_true/test_v3.json
diff --git a/...ue_detailed_output/test_full_json_v3.json → ...ue_detailed_output/test_full_json_v3.json b/...ue_detailed_output/test_full_json_v3.json → ...ue_detailed_output/test_full_json_v3.json
diff --git a/...w_ltp_export_properly/test.INST_A.ltp.tsv → ...w_ltp_export_properly/test.INST_A.ltp.tsv b/...w_ltp_export_properly/test.INST_A.ltp.tsv → ...w_ltp_export_properly/test.INST_A.ltp.tsv
diff --git a/..._export_properly/test.INST_A.ltp.tsv.json → ..._export_properly/test.INST_A.ltp.tsv.json b/..._export_properly/test.INST_A.ltp.tsv.json → ..._export_properly/test.INST_A.ltp.tsv.json
diff --git a/...t_properly/test.MOBILE_HOST_FIELD.ltp.tsv → ...t_properly/test.MOBILE_HOST_FIELD.ltp.tsv b/...t_properly/test.MOBILE_HOST_FIELD.ltp.tsv → ...t_properly/test.MOBILE_HOST_FIELD.ltp.tsv
diff --git a/...perly/test.MOBILE_HOST_FIELD.ltp.tsv.json → ...perly/test.MOBILE_HOST_FIELD.ltp.tsv.json b/...perly/test.MOBILE_HOST_FIELD.ltp.tsv.json → ...perly/test.MOBILE_HOST_FIELD.ltp.tsv.json
diff --git a/..._properly/test.MOBILE_SATELLITE_A.ltp.tsv → ..._properly/test.MOBILE_SATELLITE_A.ltp.tsv b/..._properly/test.MOBILE_SATELLITE_A.ltp.tsv → ..._properly/test.MOBILE_SATELLITE_A.ltp.tsv
diff --git a/...erly/test.MOBILE_SATELLITE_A.ltp.tsv.json → ...erly/test.MOBILE_SATELLITE_A.ltp.tsv.json b/...erly/test.MOBILE_SATELLITE_A.ltp.tsv.json → ...erly/test.MOBILE_SATELLITE_A.ltp.tsv.json
diff --git a/..._properly/test.MOBILE_SATELLITE_B.ltp.tsv → ..._properly/test.MOBILE_SATELLITE_B.ltp.tsv b/..._properly/test.MOBILE_SATELLITE_B.ltp.tsv → ..._properly/test.MOBILE_SATELLITE_B.ltp.tsv
diff --git a/...erly/test.MOBILE_SATELLITE_B.ltp.tsv.json → ...erly/test.MOBILE_SATELLITE_B.ltp.tsv.json b/...erly/test.MOBILE_SATELLITE_B.ltp.tsv.json → ...erly/test.MOBILE_SATELLITE_B.ltp.tsv.json
diff --git a/...perly/test.POWER_FROM_SHORE_EVENT.ltp.tsv → ...perly/test.POWER_FROM_SHORE_EVENT.ltp.tsv b/...perly/test.POWER_FROM_SHORE_EVENT.ltp.tsv → ...perly/test.POWER_FROM_SHORE_EVENT.ltp.tsv
diff --git a/.../test.POWER_FROM_SHORE_EVENT.ltp.tsv.json → .../test.POWER_FROM_SHORE_EVENT.ltp.tsv.json b/.../test.POWER_FROM_SHORE_EVENT.ltp.tsv.json → .../test.POWER_FROM_SHORE_EVENT.ltp.tsv.json
diff --git a/...w_stp_export_properly/test.INST_A.stp.tsv → ...w_stp_export_properly/test.INST_A.stp.tsv b/...w_stp_export_properly/test.INST_A.stp.tsv → ...w_stp_export_properly/test.INST_A.stp.tsv
diff --git a/..._export_properly/test.INST_A.stp.tsv.json → ..._export_properly/test.INST_A.stp.tsv.json b/..._export_properly/test.INST_A.stp.tsv.json → ..._export_properly/test.INST_A.stp.tsv.json
diff --git a/...t_properly/test.MOBILE_HOST_FIELD.stp.tsv → ...t_properly/test.MOBILE_HOST_FIELD.stp.tsv b/...t_properly/test.MOBILE_HOST_FIELD.stp.tsv → ...t_properly/test.MOBILE_HOST_FIELD.stp.tsv
diff --git a/...perly/test.MOBILE_HOST_FIELD.stp.tsv.json → ...perly/test.MOBILE_HOST_FIELD.stp.tsv.json b/...perly/test.MOBILE_HOST_FIELD.stp.tsv.json → ...perly/test.MOBILE_HOST_FIELD.stp.tsv.json
diff --git a/..._properly/test.MOBILE_SATELLITE_A.stp.tsv → ..._properly/test.MOBILE_SATELLITE_A.stp.tsv b/..._properly/test.MOBILE_SATELLITE_A.stp.tsv → ..._properly/test.MOBILE_SATELLITE_A.stp.tsv
diff --git a/...erly/test.MOBILE_SATELLITE_A.stp.tsv.json → ...erly/test.MOBILE_SATELLITE_A.stp.tsv.json b/...erly/test.MOBILE_SATELLITE_A.stp.tsv.json → ...erly/test.MOBILE_SATELLITE_A.stp.tsv.json
diff --git a/..._properly/test.MOBILE_SATELLITE_B.stp.tsv → ..._properly/test.MOBILE_SATELLITE_B.stp.tsv b/..._properly/test.MOBILE_SATELLITE_B.stp.tsv → ..._properly/test.MOBILE_SATELLITE_B.stp.tsv
diff --git a/...erly/test.MOBILE_SATELLITE_B.stp.tsv.json → ...erly/test.MOBILE_SATELLITE_B.stp.tsv.json b/...erly/test.MOBILE_SATELLITE_B.stp.tsv.json → ...erly/test.MOBILE_SATELLITE_B.stp.tsv.json
diff --git a/...perly/test.POWER_FROM_SHORE_EVENT.stp.tsv → ...perly/test.POWER_FROM_SHORE_EVENT.stp.tsv b/...perly/test.POWER_FROM_SHORE_EVENT.stp.tsv → ...perly/test.POWER_FROM_SHORE_EVENT.stp.tsv
diff --git a/.../test.POWER_FROM_SHORE_EVENT.stp.tsv.json → .../test.POWER_FROM_SHORE_EVENT.stp.tsv.json b/.../test.POWER_FROM_SHORE_EVENT.stp.tsv.json → .../test.POWER_FROM_SHORE_EVENT.stp.tsv.json
diff --git a/...ots/test_app/test_valid/flow-diagram.json → ...ots/test_app/test_valid/flow-diagram.json b/...ots/test_app/test_valid/flow-diagram.json → ...ots/test_app/test_valid/flow-diagram.json
diff --git a/src/tests/ecalc_cli/test_app.py → tests/ecalc_cli/test_app.py b/src/tests/ecalc_cli/test_app.py → tests/ecalc_cli/test_app.py
diff --git a/...test_compute_emission_intensity_yearly.py → tests/ecalc_cli/test_cache.py b/...test_compute_emission_intensity_yearly.py → tests/ecalc_cli/test_cache.py
diff --git a/src/tests/ecalc_neqsim_wrapper/conftest.py → tests/ecalc_neqsim_wrapper/conftest.py b/src/tests/ecalc_neqsim_wrapper/conftest.py → tests/ecalc_neqsim_wrapper/conftest.py
diff --git a/...pper/integration_tests/test_gerg_fluid.py → ...pper/integration_tests/test_gerg_fluid.py b/...pper/integration_tests/test_gerg_fluid.py → ...pper/integration_tests/test_gerg_fluid.py
diff --git a/...r/integration_tests/test_remove_liquid.py → ...r/integration_tests/test_remove_liquid.py b/...r/integration_tests/test_remove_liquid.py → ...r/integration_tests/test_remove_liquid.py
diff --git a/...m_wrapper/unit_tests/test_java_service.py → ...m_wrapper/unit_tests/test_java_service.py b/...m_wrapper/unit_tests/test_java_service.py → ...m_wrapper/unit_tests/test_java_service.py
diff --git a/...m_wrapper/unit_tests/test_neqsim_fluid.py → ...m_wrapper/unit_tests/test_neqsim_fluid.py b/...m_wrapper/unit_tests/test_neqsim_fluid.py → ...m_wrapper/unit_tests/test_neqsim_fluid.py
diff --git a/src/tests/libecalc/common/test_constants.py → tests/libecalc/common/test_constants.py b/src/tests/libecalc/common/test_constants.py → tests/libecalc/common/test_constants.py
diff --git a/src/tests/libecalc/common/test_dangerous.py → tests/libecalc/common/test_dangerous.py b/src/tests/libecalc/common/test_dangerous.py → tests/libecalc/common/test_dangerous.py
diff --git a/src/tests/libecalc/common/test_graph.py → tests/libecalc/common/test_graph.py b/src/tests/libecalc/common/test_graph.py → tests/libecalc/common/test_graph.py
diff --git a/src/tests/libecalc/common/test_list_utils.py → tests/libecalc/common/test_list_utils.py b/src/tests/libecalc/common/test_list_utils.py → tests/libecalc/common/test_list_utils.py
diff --git a/src/tests/libecalc/common/test_numbers.py → tests/libecalc/common/test_numbers.py b/src/tests/libecalc/common/test_numbers.py → tests/libecalc/common/test_numbers.py
diff --git a/...ests/libecalc/common/test_string_utils.py → tests/libecalc/common/test_string_utils.py b/...ests/libecalc/common/test_string_utils.py → tests/libecalc/common/test_string_utils.py
diff --git a/...becalc/common/test_tabular_time_series.py → ...becalc/common/test_tabular_time_series.py b/...becalc/common/test_tabular_time_series.py → ...becalc/common/test_tabular_time_series.py
diff --git a/...ts/libecalc/common/test_temporal_model.py → tests/libecalc/common/test_temporal_model.py b/...ts/libecalc/common/test_temporal_model.py → tests/libecalc/common/test_temporal_model.py
diff --git a/src/tests/libecalc/common/test_time_utils.py → tests/libecalc/common/test_time_utils.py b/src/tests/libecalc/common/test_time_utils.py → tests/libecalc/common/test_time_utils.py
diff --git a/src/tests/libecalc/common/test_unit.py → tests/libecalc/common/test_unit.py b/src/tests/libecalc/common/test_unit.py → tests/libecalc/common/test_unit.py
diff --git a/src/tests/libecalc/common/test_version.py → tests/libecalc/common/test_version.py b/src/tests/libecalc/common/test_version.py → tests/libecalc/common/test_version.py
diff --git a/.../libecalc/common/utils/test_adjustment.py → .../libecalc/common/utils/test_adjustment.py b/.../libecalc/common/utils/test_adjustment.py → .../libecalc/common/utils/test_adjustment.py
diff --git a/tests/libecalc/common/utils/test_compute_emission_intensity_yearly.py b/tests/libecalc/common/utils/test_compute_emission_intensity_yearly.py
diff --git a/.../libecalc/common/utils/test_math_utils.py → .../libecalc/common/utils/test_math_utils.py b/.../libecalc/common/utils/test_math_utils.py → .../libecalc/common/utils/test_math_utils.py
diff --git a/...tests/libecalc/common/utils/test_rates.py → tests/libecalc/common/utils/test_rates.py b/...tests/libecalc/common/utils/test_rates.py → tests/libecalc/common/utils/test_rates.py
diff --git a/src/tests/libecalc/core/conftest.py → tests/libecalc/core/conftest.py b/src/tests/libecalc/core/conftest.py → tests/libecalc/core/conftest.py
diff --git a/...tests/libecalc/core/consumers/conftest.py → tests/libecalc/core/consumers/conftest.py b/...tests/libecalc/core/consumers/conftest.py → tests/libecalc/core/consumers/conftest.py
diff --git a/...nsumer_function/test_consumer_function.py → ...nsumer_function/test_consumer_function.py b/...nsumer_function/test_consumer_function.py → ...nsumer_function/test_consumer_function.py
diff --git a/...st_direct_expression_consumer_function.py → ...st_direct_expression_consumer_function.py b/...st_direct_expression_consumer_function.py → ...st_direct_expression_consumer_function.py
diff --git a/...ibecalc/core/consumers/system/conftest.py → ...ibecalc/core/consumers/system/conftest.py b/...ibecalc/core/consumers/system/conftest.py → ...ibecalc/core/consumers/system/conftest.py
diff --git a/.../consumers/system/test_consumer_system.py → .../consumers/system/test_consumer_system.py b/.../consumers/system/test_consumer_system.py → .../consumers/system/test_consumer_system.py
diff --git a/...sumers/system/test_operational_setting.py → ...sumers/system/test_operational_setting.py b/...sumers/system/test_operational_setting.py → ...sumers/system/test_operational_setting.py
diff --git a/...e/consumers/system/test_system_results.py → ...e/consumers/system/test_system_results.py b/...e/consumers/system/test_system_results.py → ...e/consumers/system/test_system_results.py
diff --git a/...ore/consumers/system/test_system_utils.py → ...ore/consumers/system/test_system_utils.py b/...ore/consumers/system/test_system_utils.py → ...ore/consumers/system/test_system_utils.py
diff --git a/...alc/core/consumers/test_consumer_utils.py → ...alc/core/consumers/test_consumer_utils.py b/...alc/core/consumers/test_consumer_utils.py → ...alc/core/consumers/test_consumer_utils.py
diff --git a/...libecalc/core/consumers/test_crossover.py → ...libecalc/core/consumers/test_crossover.py b/...libecalc/core/consumers/test_crossover.py → ...libecalc/core/consumers/test_crossover.py
diff --git a/...ts/libecalc/core/consumers/test_genset.py → tests/libecalc/core/consumers/test_genset.py b/...ts/libecalc/core/consumers/test_genset.py → tests/libecalc/core/consumers/test_genset.py
diff --git a/...lc/core/consumers/test_legacy_consumer.py → ...lc/core/consumers/test_legacy_consumer.py b/...lc/core/consumers/test_legacy_consumer.py → ...lc/core/consumers/test_legacy_consumer.py
diff --git a/...alc/core/models/chart/test_chart_curve.py → ...alc/core/models/chart/test_chart_curve.py b/...alc/core/models/chart/test_chart_curve.py → ...alc/core/models/chart/test_chart_curve.py
diff --git a/...e/models/chart/test_single_speed_chart.py → ...e/models/chart/test_single_speed_chart.py b/...e/models/chart/test_single_speed_chart.py → ...e/models/chart/test_single_speed_chart.py
diff --git a/...models/chart/test_variable_speed_chart.py → ...models/chart/test_variable_speed_chart.py b/...models/chart/test_variable_speed_chart.py → ...models/chart/test_variable_speed_chart.py
diff --git a/...e/models/compressor_modelling/conftest.py → ...e/models/compressor_modelling/conftest.py b/...e/models/compressor_modelling/conftest.py → ...e/models/compressor_modelling/conftest.py
diff --git a/...input/compressor_sampled_3d_testdata3.csv → ...input/compressor_sampled_3d_testdata3.csv b/...input/compressor_sampled_3d_testdata3.csv → ...input/compressor_sampled_3d_testdata3.csv
diff --git a/...ut/compressor_sampled_3d_vsd_testdata.csv → ...ut/compressor_sampled_3d_vsd_testdata.csv b/...ut/compressor_sampled_3d_vsd_testdata.csv → ...ut/compressor_sampled_3d_vsd_testdata.csv
diff --git a/...t/compressor_sampled_3d_vsd_testdata2.csv → ...t/compressor_sampled_3d_vsd_testdata2.csv b/...t/compressor_sampled_3d_vsd_testdata2.csv → ...t/compressor_sampled_3d_vsd_testdata2.csv
diff --git a/...elling/sampled/test_compressor_sampled.py → ...elling/sampled/test_compressor_sampled.py b/...elling/sampled/test_compressor_sampled.py → ...elling/sampled/test_compressor_sampled.py
diff --git a/...ing/sampled/test_compressor_sampled_1d.py → ...ing/sampled/test_compressor_sampled_1d.py b/...ing/sampled/test_compressor_sampled_1d.py → ...ing/sampled/test_compressor_sampled_1d.py
diff --git a/...ing/sampled/test_compressor_sampled_2d.py → ...ing/sampled/test_compressor_sampled_2d.py b/...ing/sampled/test_compressor_sampled_2d.py → ...ing/sampled/test_compressor_sampled_2d.py
diff --git a/...ing/sampled/test_compressor_sampled_3d.py → ...ing/sampled/test_compressor_sampled_3d.py b/...ing/sampled/test_compressor_sampled_3d.py → ...ing/sampled/test_compressor_sampled_3d.py
diff --git a/...elling/sampled/test_convex_hull_common.py → ...elling/sampled/test_convex_hull_common.py b/...elling/sampled/test_convex_hull_common.py → ...elling/sampled/test_convex_hull_common.py
diff --git a/...ressor_modelling/test_compressor_chart.py → ...ressor_modelling/test_compressor_chart.py b/...ressor_modelling/test_compressor_chart.py → ...ressor_modelling/test_compressor_chart.py
diff --git a/...elling/test_compressor_chart_generator.py → ...elling/test_compressor_chart_generator.py b/...elling/test_compressor_chart_generator.py → ...elling/test_compressor_chart_generator.py
diff --git a/...elling/test_compressor_model_vs_unisim.py → ...elling/test_compressor_model_vs_unisim.py b/...elling/test_compressor_model_vs_unisim.py → ...elling/test_compressor_model_vs_unisim.py
diff --git a/...r_modelling/test_compressor_train_base.py → ...r_modelling/test_compressor_train_base.py b/...r_modelling/test_compressor_train_base.py → ...r_modelling/test_compressor_train_base.py
diff --git a/...st_compressor_train_common_shaft_utils.py → ...st_compressor_train_common_shaft_utils.py b/...st_compressor_train_common_shaft_utils.py → ...st_compressor_train_common_shaft_utils.py
diff --git a/...modelling/test_compressor_with_turbine.py → ...modelling/test_compressor_with_turbine.py b/...modelling/test_compressor_with_turbine.py → ...modelling/test_compressor_with_turbine.py
diff --git a/...models/compressor_modelling/test_fluid.py → ...models/compressor_modelling/test_fluid.py b/...models/compressor_modelling/test_fluid.py → ...models/compressor_modelling/test_fluid.py
diff --git a/...pressor_modelling/test_numeric_methods.py → ...pressor_modelling/test_numeric_methods.py b/...pressor_modelling/test_numeric_methods.py → ...pressor_modelling/test_numeric_methods.py
diff --git a/...lling/test_simplified_compressor_train.py → ...lling/test_simplified_compressor_train.py b/...lling/test_simplified_compressor_train.py → ...lling/test_simplified_compressor_train.py
diff --git a/...le_speed_compressor_train_common_shaft.py → ...le_speed_compressor_train_common_shaft.py b/...le_speed_compressor_train_common_shaft.py → ...le_speed_compressor_train_common_shaft.py
diff --git a/...le_speed_compressor_train_common_shaft.py → ...le_speed_compressor_train_common_shaft.py b/...le_speed_compressor_train_common_shaft.py → ...le_speed_compressor_train_common_shaft.py
diff --git a/...peed_compressor_train_multiple_streams.py → ...peed_compressor_train_multiple_streams.py b/...peed_compressor_train_multiple_streams.py → ...peed_compressor_train_multiple_streams.py
diff --git a/.../test_consumer_tabular_energy_function.py → .../test_consumer_tabular_energy_function.py b/.../test_consumer_tabular_energy_function.py → .../test_consumer_tabular_energy_function.py
diff --git a/...re/models/test_energy_function_results.py → ...re/models/test_energy_function_results.py b/...re/models/test_energy_function_results.py → ...re/models/test_energy_function_results.py
diff --git a/...s/libecalc/core/models/test_fuel_model.py → ...s/libecalc/core/models/test_fuel_model.py b/...s/libecalc/core/models/test_fuel_model.py → ...s/libecalc/core/models/test_fuel_model.py
diff --git a/...ecalc/core/models/test_generator_model.py → ...ecalc/core/models/test_generator_model.py b/...ecalc/core/models/test_generator_model.py → ...ecalc/core/models/test_generator_model.py
diff --git a/src/tests/libecalc/core/models/test_pump.py → tests/libecalc/core/models/test_pump.py b/src/tests/libecalc/core/models/test_pump.py → tests/libecalc/core/models/test_pump.py
diff --git a/...ests/libecalc/core/models/test_turbine.py → tests/libecalc/core/models/test_turbine.py b/...ests/libecalc/core/models/test_turbine.py → tests/libecalc/core/models/test_turbine.py
diff --git a/.../core/models/test_validate_model_input.py → .../core/models/test_validate_model_input.py b/.../core/models/test_validate_model_input.py → .../core/models/test_validate_model_input.py
diff --git a/...ests/libecalc/core/result/test_results.py → tests/libecalc/core/result/test_results.py b/...ests/libecalc/core/result/test_results.py → tests/libecalc/core/result/test_results.py
diff --git a/...libecalc/dto/results/model/test_extend.py → ...libecalc/dto/results/model/test_extend.py b/...libecalc/dto/results/model/test_extend.py → ...libecalc/dto/results/model/test_extend.py
diff --git a/...l/test_requested_pressures_compressors.py → ...l/test_requested_pressures_compressors.py b/...l/test_requested_pressures_compressors.py → ...l/test_requested_pressures_compressors.py
diff --git a/src/tests/libecalc/dto/test_composition.py → tests/libecalc/dto/test_composition.py b/src/tests/libecalc/dto/test_composition.py → tests/libecalc/dto/test_composition.py
diff --git a/...libecalc/dto/test_electricity_consumer.py → ...libecalc/dto/test_electricity_consumer.py b/...libecalc/dto/test_electricity_consumer.py → ...libecalc/dto/test_electricity_consumer.py
diff --git a/src/tests/libecalc/dto/test_energy_model.py → tests/libecalc/dto/test_energy_model.py b/src/tests/libecalc/dto/test_energy_model.py → tests/libecalc/dto/test_energy_model.py
diff --git a/src/tests/libecalc/dto/test_fuel_consumer.py → tests/libecalc/dto/test_fuel_consumer.py b/src/tests/libecalc/dto/test_fuel_consumer.py → tests/libecalc/dto/test_fuel_consumer.py
diff --git a/src/tests/libecalc/dto/test_generator_set.py → tests/libecalc/dto/test_generator_set.py b/src/tests/libecalc/dto/test_generator_set.py → tests/libecalc/dto/test_generator_set.py
diff --git a/...sts/libecalc/dto/utils/test_validators.py → tests/libecalc/dto/utils/test_validators.py b/...sts/libecalc/dto/utils/test_validators.py → tests/libecalc/dto/utils/test_validators.py
diff --git a/...ts/libecalc/expression/test_expression.py → tests/libecalc/expression/test_expression.py b/...ts/libecalc/expression/test_expression.py → tests/libecalc/expression/test_expression.py
diff --git a/...c/expression/test_expression_evaluator.py → ...c/expression/test_expression_evaluator.py b/...c/expression/test_expression_evaluator.py → ...c/expression/test_expression_evaluator.py
diff --git a/...calc/input/mappers/test_consumer_chart.py → ...calc/input/mappers/test_consumer_chart.py b/...calc/input/mappers/test_consumer_chart.py → ...calc/input/mappers/test_consumer_chart.py
diff --git a/.../input/mappers/test_energy_usage_model.py → .../input/mappers/test_energy_usage_model.py b/.../input/mappers/test_energy_usage_model.py → .../input/mappers/test_energy_usage_model.py
diff --git a/...calc/input/mappers/test_facility_input.py → ...calc/input/mappers/test_facility_input.py b/...calc/input/mappers/test_facility_input.py → ...calc/input/mappers/test_facility_input.py
diff --git a/...becalc/input/mappers/test_model_mapper.py → ...becalc/input/mappers/test_model_mapper.py b/...becalc/input/mappers/test_model_mapper.py → ...becalc/input/mappers/test_model_mapper.py
diff --git a/...becalc/input/mappers/test_resolve_fuel.py → ...becalc/input/mappers/test_resolve_fuel.py b/...becalc/input/mappers/test_resolve_fuel.py → ...becalc/input/mappers/test_resolve_fuel.py
diff --git a/...ests/libecalc/input/mappers/test_utils.py → tests/libecalc/input/mappers/test_utils.py b/...ests/libecalc/input/mappers/test_utils.py → tests/libecalc/input/mappers/test_utils.py
diff --git a/...ppers/variables_mapper/test_timeseries.py → ...ppers/variables_mapper/test_timeseries.py b/...ppers/variables_mapper/test_timeseries.py → ...ppers/variables_mapper/test_timeseries.py
diff --git a/...variables_mapper/test_timeseries_utils.py → ...variables_mapper/test_timeseries_utils.py b/...variables_mapper/test_timeseries_utils.py → ...variables_mapper/test_timeseries_utils.py
diff --git a/...variables_mapper/test_variables_mapper.py → ...variables_mapper/test_variables_mapper.py b/...variables_mapper/test_variables_mapper.py → ...variables_mapper/test_variables_mapper.py
diff --git a/.../libecalc/input/test_create_references.py → .../libecalc/input/test_create_references.py b/.../libecalc/input/test_create_references.py → .../libecalc/input/test_create_references.py
diff --git a/src/tests/libecalc/input/test_file_io.py → tests/libecalc/input/test_file_io.py b/src/tests/libecalc/input/test_file_io.py → tests/libecalc/input/test_file_io.py
diff --git a/.../libecalc/input/test_validation_errors.py → .../libecalc/input/test_validation_errors.py b/.../libecalc/input/test_validation_errors.py → .../libecalc/input/test_validation_errors.py
diff --git a/...libecalc/input/test_yaml_configuration.py → ...libecalc/input/test_yaml_configuration.py b/...libecalc/input/test_yaml_configuration.py → ...libecalc/input/test_yaml_configuration.py
diff --git a/...ystem/test_system_component_conditions.py → ...ystem/test_system_component_conditions.py b/...ystem/test_system_component_conditions.py → ...ystem/test_system_component_conditions.py
diff --git a/...lc/input/yaml_types/test_yaml_variable.py → ...lc/input/yaml_types/test_yaml_variable.py b/...lc/input/yaml_types/test_yaml_variable.py → ...lc/input/yaml_types/test_yaml_variable.py
diff --git a/...l_consumer_with_time_slots_models_v3.json → ...l_consumer_with_time_slots_models_v3.json b/...l_consumer_with_time_slots_models_v3.json → ...l_consumer_with_time_slots_models_v3.json
diff --git a/...l_results/all_energy_usage_models_v3.json → ...l_results/all_energy_usage_models_v3.json b/...l_results/all_energy_usage_models_v3.json → ...l_results/all_energy_usage_models_v3.json
diff --git a/...er_system_v2_yaml/consumer_system_v2.json → ...er_system_v2_yaml/consumer_system_v2.json b/...er_system_v2_yaml/consumer_system_v2.json → ...er_system_v2_yaml/consumer_system_v2.json
diff --git a/...st_all_consumer_with_time_slots_models.py → ...st_all_consumer_with_time_slots_models.py b/...st_all_consumer_with_time_slots_models.py → ...st_all_consumer_with_time_slots_models.py
diff --git a/...tegration/test_all_energy_usage_models.py → ...tegration/test_all_energy_usage_models.py b/...tegration/test_all_energy_usage_models.py → ...tegration/test_all_energy_usage_models.py
diff --git a/...lc/integration/test_consumer_system_v2.py → ...lc/integration/test_consumer_system_v2.py b/...lc/integration/test_consumer_system_v2.py → ...lc/integration/test_consumer_system_v2.py
diff --git a/...calc/integration/test_minimal_is_valid.py → ...calc/integration/test_minimal_is_valid.py b/...calc/integration/test_minimal_is_valid.py → ...calc/integration/test_minimal_is_valid.py
diff --git a/...ntegration/test_multiple_installations.py → ...ntegration/test_multiple_installations.py b/...ntegration/test_multiple_installations.py → ...ntegration/test_multiple_installations.py
diff --git a/.../libecalc/output/flow_diagram/conftest.py → .../libecalc/output/flow_diagram/conftest.py b/.../libecalc/output/flow_diagram/conftest.py → .../libecalc/output/flow_diagram/conftest.py
diff --git a/...e_models/all_energy_usage_models_fde.json → ...e_models/all_energy_usage_models_fde.json b/...e_models/all_energy_usage_models_fde.json → ...e_models/all_energy_usage_models_fde.json
diff --git a/...pper/test_case_with_dates/actual_fde.json → ...pper/test_case_with_dates/actual_fde.json b/...pper/test_case_with_dates/actual_fde.json → ...pper/test_case_with_dates/actual_fde.json
diff --git a/...t/flow_diagram/test_ecalc_model_mapper.py → ...t/flow_diagram/test_ecalc_model_mapper.py b/...t/flow_diagram/test_ecalc_model_mapper.py → ...t/flow_diagram/test_ecalc_model_mapper.py
diff --git a/...tests/libecalc/output/test_frequencies.py → tests/libecalc/output/test_frequencies.py b/...tests/libecalc/output/test_frequencies.py → tests/libecalc/output/test_frequencies.py
diff --git a/...exporter/formatters/test_csv_formatter.py → ...exporter/formatters/test_csv_formatter.py b/...exporter/formatters/test_csv_formatter.py → ...exporter/formatters/test_csv_formatter.py
diff --git a/...tation/exporter/handlers/test_handlers.py → ...tation/exporter/handlers/test_handlers.py b/...tation/exporter/handlers/test_handlers.py → ...tation/exporter/handlers/test_handlers.py
diff --git a/...ibecalc/presentation/exporter/test_ltp.py → ...ibecalc/presentation/exporter/test_ltp.py b/...ibecalc/presentation/exporter/test_ltp.py → ...ibecalc/presentation/exporter/test_ltp.py
diff --git a/...sentation/json_result/test_aggregators.py → ...sentation/json_result/test_aggregators.py b/...sentation/json_result/test_aggregators.py → ...sentation/json_result/test_aggregators.py
diff --git a/...presentation/simple_result/test_simple.py → ...presentation/simple_result/test_simple.py b/...presentation/simple_result/test_simple.py → ...presentation/simple_result/test_simple.py
diff --git a/...becalc/presentation/yaml/test_location.py → ...becalc/presentation/yaml/test_location.py b/...becalc/presentation/yaml/test_location.py → ...becalc/presentation/yaml/test_location.py
diff --git a/...presentation/yaml/test_venting_emitter.py → ...presentation/yaml/test_venting_emitter.py b/...presentation/yaml/test_venting_emitter.py → ...presentation/yaml/test_venting_emitter.py
diff --git a/...test_venting_emitter_validation_errors.py → ...test_venting_emitter_validation_errors.py b/...test_venting_emitter_validation_errors.py → ...test_venting_emitter_validation_errors.py
diff --git a/...calc/presentation/yaml/test_yaml_model.py → ...calc/presentation/yaml/test_yaml_model.py b/...calc/presentation/yaml/test_yaml_model.py → ...calc/presentation/yaml/test_yaml_model.py
diff --git a/...aml/yaml_models/test_yaml_model_errors.py → ...aml/yaml_models/test_yaml_model_errors.py b/...aml/yaml_models/test_yaml_model_errors.py → ...aml/yaml_models/test_yaml_model_errors.py
diff --git a/...tation/yaml/yaml_types/models/conftest.py → ...tation/yaml/yaml_types/models/conftest.py b/...tation/yaml/yaml_types/models/conftest.py → ...tation/yaml/yaml_types/models/conftest.py
@@ -1,12 +1,20 @@
-yaml_fluid_model = """
+import pytest
+
+
+@pytest.fixture
+def yaml_fluid_model():
+    return """
   - NAME: fluid_model
     TYPE: FLUID
     FLUID_MODEL_TYPE: PREDEFINED
     EOS_MODEL: SRK
     GAS_TYPE: MEDIUM
 """
 
-yaml_chart_single_speed = """
+
+@pytest.fixture
+def yaml_chart_single_speed():
+    return """
   - NAME: single_speed_compressor_chart
     TYPE: COMPRESSOR_CHART
     CHART_TYPE: SINGLE_SPEED
@@ -21,7 +29,10 @@
         EFFICIENCY: [0.72, 0.75, 0.74, 0.70]
 """
 
-yaml_chart_variable_speed = """
+
+@pytest.fixture
+def yaml_chart_variable_speed():
+    return """
   - NAME: variable_speed_compressor_chart
     TYPE: COMPRESSOR_CHART
     CHART_TYPE: VARIABLE_SPEED
@@ -44,7 +55,10 @@
         EFFICIENCY: [0.72, 0.73, 0.74, 0.74, 0.72, 0.70]
 """
 
-yaml_chart_generic_from_input = """
+
+@pytest.fixture
+def yaml_chart_generic_from_input():
+    return """
   - NAME: generic_from_input_compressor_chart
     TYPE: COMPRESSOR_CHART
     CHART_TYPE: GENERIC_FROM_INPUT
@@ -53,7 +67,10 @@
       EFFICIENCY: FRACTION
 """
 
-yaml_simplified_train_wrong_chart = f"""
+
+@pytest.fixture
+def yaml_simplified_train_wrong_chart(yaml_fluid_model, yaml_chart_single_speed):
+    return f"""
 MODELS:
   {yaml_fluid_model}
   {yaml_chart_single_speed}
@@ -66,7 +83,10 @@
           COMPRESSOR_CHART: single_speed_compressor_chart
 """
 
-yaml_simplified_train_with_control_margin_and_pressure_drop = f"""
+
+@pytest.fixture
+def yaml_simplified_train_with_control_margin_and_pressure_drop(yaml_fluid_model, yaml_chart_generic_from_input):
+    return f"""
 MODELS:
   {yaml_fluid_model}
   {yaml_chart_generic_from_input}
@@ -82,7 +102,10 @@
           COMPRESSOR_CHART: generic_from_input_compressor_chart
     """
 
-yaml_single_speed_train_without_control_margin = f"""
+
+@pytest.fixture
+def yaml_single_speed_train_without_control_margin(yaml_fluid_model, yaml_chart_single_speed):
+    return f"""
 MODELS:
   {yaml_fluid_model}
   {yaml_chart_single_speed}
@@ -96,7 +119,10 @@
           PRESSURE_DROP_AHEAD_OF_STAGE: 2
 """
 
-yaml_variable_speed_train_without_control_margin = f"""
+
+@pytest.fixture
+def yaml_variable_speed_train_without_control_margin(yaml_fluid_model, yaml_chart_variable_speed):
+    return f"""
 MODELS:
   {yaml_fluid_model}
   {yaml_chart_variable_speed}

diff --git a/...models/test_model_reference_validation.py → ...models/test_model_reference_validation.py b/...models/test_model_reference_validation.py → ...models/test_model_reference_validation.py
diff --git a/.../test_yaml_simplified_compressor_train.py → .../test_yaml_simplified_compressor_train.py b/.../test_yaml_simplified_compressor_train.py → .../test_yaml_simplified_compressor_train.py
@@ -3,10 +3,6 @@
 
 import pytest
 
-from conftest import (
-    yaml_simplified_train_with_control_margin_and_pressure_drop,
-    yaml_simplified_train_wrong_chart,
-)
 from ecalc_cli.infrastructure.file_resource_service import FileResourceService
 from libecalc.common.time_utils import Frequency
 from libecalc.presentation.yaml.model import YamlModel
@@ -15,7 +11,9 @@
 from libecalc.presentation.yaml.yaml_keywords import EcalcYamlKeywords
 
 
-def test_control_margin_and_pressure_drop_not_allowed(configuration_service_factory):
+def test_control_margin_and_pressure_drop_not_allowed(
+    configuration_service_factory, yaml_simplified_train_with_control_margin_and_pressure_drop
+):
     configuration_service = configuration_service_factory(
         ResourceStream(name="", stream=StringIO(yaml_simplified_train_with_control_margin_and_pressure_drop))
     )
@@ -55,7 +53,7 @@ def test_control_margin_and_pressure_drop_not_allowed(configuration_service_fact
     )
 
 
-def test_single_speed_chart_not_allowed(configuration_service_factory):
+def test_single_speed_chart_not_allowed(configuration_service_factory, yaml_simplified_train_wrong_chart):
     configuration_service = configuration_service_factory(
         ResourceStream(name="", stream=StringIO(yaml_simplified_train_wrong_chart))
     )

diff --git a/...est_yaml_single_speed_compressor_train.py → ...est_yaml_single_speed_compressor_train.py b/...est_yaml_single_speed_compressor_train.py → ...est_yaml_single_speed_compressor_train.py
@@ -3,9 +3,6 @@
 
 import pytest
 
-from conftest import (
-    yaml_single_speed_train_without_control_margin,
-)
 from ecalc_cli.infrastructure.file_resource_service import FileResourceService
 from libecalc.common.time_utils import Frequency
 from libecalc.presentation.yaml.model import YamlModel
@@ -14,7 +11,7 @@
 from libecalc.presentation.yaml.yaml_keywords import EcalcYamlKeywords
 
 
-def test_control_margin_required(configuration_service_factory):
+def test_control_margin_required(configuration_service_factory, yaml_single_speed_train_without_control_margin):
     configuration_service = configuration_service_factory(
         ResourceStream(name="", stream=StringIO(yaml_single_speed_train_without_control_margin))
     )

diff --git a/...t_yaml_variable_speed_compressor_train.py → ...t_yaml_variable_speed_compressor_train.py b/...t_yaml_variable_speed_compressor_train.py → ...t_yaml_variable_speed_compressor_train.py
@@ -3,9 +3,6 @@
 
 import pytest
 
-from conftest import (
-    yaml_variable_speed_train_without_control_margin,
-)
 from ecalc_cli.infrastructure.file_resource_service import FileResourceService
 from libecalc.common.time_utils import Frequency
 from libecalc.presentation.yaml.model import YamlModel
@@ -14,7 +11,7 @@
 from libecalc.presentation.yaml.yaml_keywords import EcalcYamlKeywords
 
 
-def test_control_margin_required(configuration_service_factory):
+def test_control_margin_required(configuration_service_factory, yaml_variable_speed_train_without_control_margin):
     configuration_service = configuration_service_factory(
         ResourceStream(name="", stream=StringIO(yaml_variable_speed_train_without_control_margin))
     )

diff --git a/...tation/yaml/yaml_types/test_categories.py → ...tation/yaml/yaml_types/test_categories.py b/...tation/yaml/yaml_types/test_categories.py → ...tation/yaml/yaml_types/test_categories.py
diff --git a/...ion/yaml/yaml_types/test_missing_files.py → ...ion/yaml/yaml_types/test_missing_files.py b/...ion/yaml/yaml_types/test_missing_files.py → ...ion/yaml/yaml_types/test_missing_files.py