Skip to content

Commit c652e54

Browse files
committed
Fix unit test issues
1 parent 11ac0a2 commit c652e54

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

src/test_pownet/test_core/test_builder.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
""" Unit tests for the ModelBuilder class.
22
"""
33

4+
import os
45
import unittest
5-
from unittest.mock import MagicMock, patch
6-
7-
import gurobipy as gp
8-
9-
from pownet.folder_utils import get_output_dir, get_model_dir
10-
from pownet.modeling import PowerSystemModel
116
from pownet.core import ModelBuilder, SystemInput
7+
from pownet.folder_utils import get_model_dir
128

139

1410
class TestModelBuilder(unittest.TestCase):
@@ -17,7 +13,8 @@ class TestModelBuilder(unittest.TestCase):
1713
def setUp(self) -> None:
1814
# Load the test data
1915
self.inputs = SystemInput(
20-
model_name="dummy_trade",
16+
input_folder=get_model_dir(),
17+
model_name="dummy",
2118
year=2016,
2219
sim_horizon=24,
2320
)

src/test_pownet/test_core/test_data_processor.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,29 @@
33

44
import os
55
import unittest
6-
from unittest.mock import patch, MagicMock
76
from pownet.core.data_processor import (
87
DataProcessor,
98
)
109

11-
from pownet.data_utils import get_dates
12-
from pownet.folder_utils import get_database_dir, get_model_dir
10+
from pownet.folder_utils import get_model_dir
1311

1412

1513
class TestDataProcessor(unittest.TestCase):
1614
def test_initialization(self):
1715
# Arrange
16+
input_folder = os.getcwd()
17+
print(input_folder)
1818
model_name = "test_model"
1919
year = 2024
2020
frequency = 50
2121

2222
# Act
23-
processor = DataProcessor(model_name, year, frequency)
23+
processor = DataProcessor(
24+
input_folder=input_folder,
25+
model_name=model_name,
26+
year=year,
27+
frequency=frequency,
28+
)
2429

2530
# Assert
2631
self.assertEqual(processor.model_name, model_name)
@@ -29,7 +34,7 @@ def test_initialization(self):
2934
self.assertEqual(processor.wavelength, 6000)
3035
self.assertEqual(
3136
processor.model_folder,
32-
os.path.join(get_model_dir(), model_name),
37+
os.path.join(get_model_dir(), input_folder, model_name),
3338
)
3439
# Timeseries should have 8760 rows
3540
self.assertEqual(processor.cycle_map, {})

0 commit comments

Comments
 (0)