Reorganize test folder

Author: phumthep

src/pownet/optim_model/rounding_algo.py

@@ -1,9 +1,7 @@
-""" rounding_algo.py: Functions to perform iterative rounding.
-"""
+"""rounding_algo.py: Functions to perform iterative rounding."""
 
 import gurobipy as gp
 import numpy as np
-import pandas as pd
 
 
 def get_variables(model: gp.Model, target_varnames: list[str] = None) -> dict:

src/test_pownet/test_builder/__init__.py

@@ -1,10 +1,15 @@
-""" Unit tests for the ModelBuilder class.
-"""
+"""Tests for the ModelBuilder class."""
 
 import os
 import unittest
-from pownet.core import ModelBuilder, SystemInput
-from pownet.folder_utils import get_model_dir
+from pownet import ModelBuilder, SystemInput
+from pownet.folder_utils import get_pownet_dir
+
+from pownet.builder.thermal import ThermalUnitBuilder
+from pownet.builder.hydro import HydroUnitBuilder
+from pownet.builder.nondispatch import NonDispatchUnitBuilder
+from pownet.builder.energy_storage import EnergyStorageUnitBuilder
+from pownet.builder.system import SystemBuilder
 
 
 class TestModelBuilder(unittest.TestCase):
@@ -13,7 +18,7 @@ class TestModelBuilder(unittest.TestCase):
     def setUp(self) -> None:
         # Load the test data
         test_model_library_path = os.path.abspath(
-            os.path.join(os.path.dirname(__file__), "..", "test_model_library")
+            os.path.join(get_pownet_dir(), "model_library")
         )
 
         self.inputs = SystemInput(
@@ -28,9 +33,18 @@ def setUp(self) -> None:
         self.model_builder = ModelBuilder(self.inputs)
 
     def test_init(self):
-        self.assertEqual(
-            self.model_builder.timesteps, range(1, self.inputs.sim_horizon + 1)
+        self.assertIsInstance(self.model_builder.thermal_builder, ThermalUnitBuilder)
+        self.assertIsInstance(self.model_builder.hydro_builder, HydroUnitBuilder)
+        self.assertIsInstance(
+            self.model_builder.nondispatch_builder, NonDispatchUnitBuilder
+        )
+        self.assertIsInstance(
+            self.model_builder.storage_builder, EnergyStorageUnitBuilder
         )
+        self.assertIsInstance(self.model_builder.system_builder, SystemBuilder)
+
+    def test_build(self):
+        pass
 
 
 if __name__ == "__main__":

src/test_pownet/test_core/test_builder.py

@@ -1,20 +1,19 @@
-""" This is test_data_processor.py
-"""
+"""test_data_processor.py"""
 
 import os
 import unittest
 from pownet.core.data_processor import (
     DataProcessor,
 )
 
-from pownet.folder_utils import get_model_dir
+from pownet.folder_utils import get_pownet_dir
 
 
 class TestDataProcessor(unittest.TestCase):
     def test_initialization(self):
         # Arrange
         test_model_library_path = os.path.abspath(
-            os.path.join(os.path.dirname(__file__), "..", "test_model_library")
+            os.path.join(get_pownet_dir(), "model_library")
         )
         model_name = "dummy"
         year = 2024
@@ -37,7 +36,7 @@ def test_initialization(self):
         self.assertEqual(processor.wavelength, 6000)
         self.assertEqual(
             processor.model_folder,
-            os.path.join(get_model_dir(), test_model_library_path, model_name),
+            os.path.join(test_model_library_path, model_name),
         )
         # Timeseries should have 8760 rows
         self.assertEqual(processor.cycle_map, {})

src/test_pownet/test_core/test_data_processor.py

@@ -1,13 +1,10 @@
-""" This is test_model.py
-"""
+"""test_model.py"""
 
-import os
 import unittest
-from unittest.mock import patch, MagicMock, call
 
 import gurobipy as gp
 import pandas as pd
-from pownet.modeling import PowerSystemModel
+from pownet.optim_model import PowerSystemModel
 
 
 class TestPowerSystemModel(unittest.TestCase):