Skip to content

Commit 4876a5c

Browse files
GabrielBarberiniGabrielBarberini
committed
fixes imports
1 parent de87146 commit 4876a5c

File tree

7 files changed

+84
-81
lines changed

7 files changed

+84
-81
lines changed

‎lib/services/motor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
TankGeometry,
1616
)
1717

18-
from lib.models.motor import MotorKinds, TankKinds
18+
from lib.models.sub.tanks import TankKinds
19+
from lib.models.motor import MotorKinds
1920
from lib.views.motor import MotorSummary, MotorView
2021

2122

‎requirements-dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
pytest_asyncio
12
flake8
23
pylint
34
ruff

‎tests/test_routes/conftest.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
import json
22
import pytest
33

4-
from lib.models.rocket import Rocket
5-
from lib.models.motor import Motor, MotorTank, TankFluids, TankKinds
6-
from lib.models.environment import Env
7-
from lib.models.aerosurfaces import Fins, NoseCone
4+
from lib.models.rocket import RocketModel
5+
from lib.models.sub.tanks import MotorTank, TankFluids, TankKinds
6+
from lib.models.motor import MotorModel
7+
from lib.models.environment import EnvironmentModel
8+
from lib.models.sub.aerosurfaces import Fins, NoseCone
89

910

1011
@pytest.fixture
1112
def stub_env():
12-
env = Env(latitude=0, longitude=0)
13+
env = EnvironmentModel(latitude=0, longitude=0)
1314
env_json = env.model_dump_json()
1415
return json.loads(env_json)
1516

1617

1718
@pytest.fixture
1819
def stub_motor():
19-
motor = Motor(
20+
motor = MotorModel(
2021
thrust_source=[[0, 0]],
2122
burn_time=0,
2223
nozzle_radius=0,
@@ -109,7 +110,7 @@ def stub_fins():
109110

110111
@pytest.fixture
111112
def stub_rocket(stub_motor, stub_nose_cone, stub_fins):
112-
rocket = Rocket(
113+
rocket = RocketModel(
113114
motor=stub_motor,
114115
radius=0,
115116
mass=0,

‎tests/test_routes/test_environments_route.py

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import pytest
44
from fastapi.testclient import TestClient
55
from fastapi import HTTPException, status
6-
from lib.models.environment import Env
7-
from lib.controllers.environment import EnvController
6+
from lib.models.environment import EnvironmentModel
7+
from lib.controllers.environment import EnvironmentController
88
from lib.views.environment import (
9-
EnvCreated,
10-
EnvUpdated,
11-
EnvDeleted,
9+
EnvironmentCreated,
10+
EnvironmentUpdated,
11+
EnvironmentDeleted,
1212
EnvironmentSummary,
1313
)
1414
from lib import app
@@ -25,15 +25,15 @@ def stub_env_summary():
2525

2626
def test_create_env(stub_env):
2727
with patch.object(
28-
EnvController, 'create_env', return_value=EnvCreated(env_id='123')
28+
EnvironmentController, 'create_env', return_value=EnvironmentCreated(env_id='123')
2929
) as mock_create_env:
3030
response = client.post('/environments/', json=stub_env)
3131
assert response.status_code == 200
3232
assert response.json() == {
3333
'env_id': '123',
3434
'message': 'Environment successfully created',
3535
}
36-
mock_create_env.assert_called_once_with(Env(**stub_env))
36+
mock_create_env.assert_called_once_with(EnvironmentModel(**stub_env))
3737

3838

3939
def test_create_env_optional_params():
@@ -46,15 +46,15 @@ def test_create_env_optional_params():
4646
'date': '2021-01-01T00:00:00',
4747
}
4848
with patch.object(
49-
EnvController, 'create_env', return_value=EnvCreated(env_id='123')
49+
EnvironmentController, 'create_env', return_value=EnvironmentCreated(env_id='123')
5050
) as mock_create_env:
5151
response = client.post('/environments/', json=test_object)
5252
assert response.status_code == 200
5353
assert response.json() == {
5454
'env_id': '123',
5555
'message': 'Environment successfully created',
5656
}
57-
mock_create_env.assert_called_once_with(Env(**test_object))
57+
mock_create_env.assert_called_once_with(EnvironmentModel(**test_object))
5858

5959

6060
def test_create_env_invalid_input():
@@ -66,7 +66,7 @@ def test_create_env_invalid_input():
6666

6767
def test_create_env_server_error(stub_env):
6868
with patch.object(
69-
EnvController,
69+
EnvironmentController,
7070
'create_env',
7171
side_effect=HTTPException(
7272
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR
@@ -79,7 +79,7 @@ def test_create_env_server_error(stub_env):
7979

8080
def test_read_env(stub_env):
8181
with patch.object(
82-
EnvController, 'get_env_by_id', return_value=Env(**stub_env)
82+
EnvironmentController, 'get_env_by_id', return_value=EnvironmentModel(**stub_env)
8383
) as mock_read_env:
8484
response = client.get('/environments/123')
8585
assert response.status_code == 200
@@ -89,7 +89,7 @@ def test_read_env(stub_env):
8989

9090
def test_read_env_not_found():
9191
with patch.object(
92-
EnvController,
92+
EnvironmentController,
9393
'get_env_by_id',
9494
side_effect=HTTPException(status_code=status.HTTP_404_NOT_FOUND),
9595
) as mock_read_env:
@@ -101,7 +101,7 @@ def test_read_env_not_found():
101101

102102
def test_read_env_server_error():
103103
with patch.object(
104-
EnvController,
104+
EnvironmentController,
105105
'get_env_by_id',
106106
side_effect=HTTPException(
107107
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR
@@ -114,17 +114,17 @@ def test_read_env_server_error():
114114

115115
def test_update_env(stub_env):
116116
with patch.object(
117-
EnvController,
117+
EnvironmentController,
118118
'update_env_by_id',
119-
return_value=EnvUpdated(env_id='123'),
119+
return_value=EnvironmentUpdated(env_id='123'),
120120
) as mock_update_env:
121121
response = client.put('/environments/123', json=stub_env)
122122
assert response.status_code == 200
123123
assert response.json() == {
124124
'env_id': '123',
125125
'message': 'Environment successfully updated',
126126
}
127-
mock_update_env.assert_called_once_with('123', Env(**stub_env))
127+
mock_update_env.assert_called_once_with('123', EnvironmentModel(**stub_env))
128128

129129

130130
def test_update_env_invalid_input():
@@ -136,7 +136,7 @@ def test_update_env_invalid_input():
136136

137137
def test_update_env_not_found(stub_env):
138138
with patch.object(
139-
EnvController,
139+
EnvironmentController,
140140
'update_env_by_id',
141141
side_effect=HTTPException(status_code=status.HTTP_404_NOT_FOUND),
142142
):
@@ -147,7 +147,7 @@ def test_update_env_not_found(stub_env):
147147

148148
def test_update_env_server_error(stub_env):
149149
with patch.object(
150-
EnvController,
150+
EnvironmentController,
151151
'update_env_by_id',
152152
side_effect=HTTPException(
153153
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR
@@ -160,9 +160,9 @@ def test_update_env_server_error(stub_env):
160160

161161
def test_delete_env():
162162
with patch.object(
163-
EnvController,
163+
EnvironmentController,
164164
'delete_env_by_id',
165-
return_value=EnvDeleted(env_id='123'),
165+
return_value=EnvironmentDeleted(env_id='123'),
166166
) as mock_delete_env:
167167
response = client.delete('/environments/123')
168168
assert response.status_code == 200
@@ -175,7 +175,7 @@ def test_delete_env():
175175

176176
def test_delete_env_server_error():
177177
with patch.object(
178-
EnvController,
178+
EnvironmentController,
179179
'delete_env_by_id',
180180
side_effect=HTTPException(
181181
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR
@@ -188,7 +188,7 @@ def test_delete_env_server_error():
188188

189189
def test_simulate_env(stub_env_summary):
190190
with patch.object(
191-
EnvController,
191+
EnvironmentController,
192192
'simulate_env',
193193
return_value=EnvironmentSummary(**stub_env_summary),
194194
) as mock_simulate_env:
@@ -200,7 +200,7 @@ def test_simulate_env(stub_env_summary):
200200

201201
def test_simulate_env_not_found():
202202
with patch.object(
203-
EnvController,
203+
EnvironmentController,
204204
'simulate_env',
205205
side_effect=HTTPException(status_code=status.HTTP_404_NOT_FOUND),
206206
) as mock_simulate_env:
@@ -212,7 +212,7 @@ def test_simulate_env_not_found():
212212

213213
def test_simulate_env_server_error():
214214
with patch.object(
215-
EnvController,
215+
EnvironmentController,
216216
'simulate_env',
217217
side_effect=HTTPException(
218218
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR
@@ -225,7 +225,7 @@ def test_simulate_env_server_error():
225225

226226
def test_read_rocketpy_env():
227227
with patch.object(
228-
EnvController, 'get_rocketpy_env_binary', return_value=b'rocketpy'
228+
EnvironmentController, 'get_rocketpy_env_binary', return_value=b'rocketpy'
229229
) as mock_read_rocketpy_env:
230230
response = client.get('/environments/123/rocketpy')
231231
assert response.status_code == 203
@@ -236,7 +236,7 @@ def test_read_rocketpy_env():
236236

237237
def test_read_rocketpy_env_not_found():
238238
with patch.object(
239-
EnvController,
239+
EnvironmentController,
240240
'get_rocketpy_env_binary',
241241
side_effect=HTTPException(status_code=status.HTTP_404_NOT_FOUND),
242242
) as mock_read_rocketpy_env:
@@ -248,7 +248,7 @@ def test_read_rocketpy_env_not_found():
248248

249249
def test_read_rocketpy_env_server_error():
250250
with patch.object(
251-
EnvController,
251+
EnvironmentController,
252252
'get_rocketpy_env_binary',
253253
side_effect=HTTPException(
254254
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR

‎tests/test_routes/test_flights_route.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import pytest
44
from fastapi.testclient import TestClient
55
from fastapi import HTTPException, status
6-
from lib.models.environment import Env
7-
from lib.models.flight import Flight
8-
from lib.models.motor import Motor, MotorKinds
9-
from lib.models.rocket import Rocket
6+
from lib.models.environment import EnvironmentModel
7+
from lib.models.flight import FlightModel
8+
from lib.models.motor import MotorModel, MotorKinds
9+
from lib.models.rocket import RocketModel
1010
from lib.controllers.flight import FlightController
1111
from lib.views.motor import MotorView
1212
from lib.views.rocket import RocketView
@@ -50,7 +50,7 @@ def test_create_flight(stub_flight):
5050
return_value=FlightCreated(flight_id='123'),
5151
) as mock_create_flight:
5252
with patch.object(
53-
Motor, 'set_motor_kind', side_effect=None
53+
MotorModel, 'set_motor_kind', side_effect=None
5454
) as mock_set_motor_kind:
5555
response = client.post(
5656
'/flights/', json=stub_flight, params={'motor_kind': 'HYBRID'}
@@ -61,7 +61,7 @@ def test_create_flight(stub_flight):
6161
'message': 'Flight successfully created',
6262
}
6363
mock_set_motor_kind.assert_called_once_with(MotorKinds.HYBRID)
64-
mock_create_flight.assert_called_once_with(Flight(**stub_flight))
64+
mock_create_flight.assert_called_once_with(FlightModel(**stub_flight))
6565

6666

6767
def test_create_flight_optional_params(stub_flight):
@@ -83,7 +83,7 @@ def test_create_flight_optional_params(stub_flight):
8383
return_value=FlightCreated(flight_id='123'),
8484
) as mock_create_flight:
8585
with patch.object(
86-
Motor, 'set_motor_kind', side_effect=None
86+
MotorModel, 'set_motor_kind', side_effect=None
8787
) as mock_set_motor_kind:
8888
response = client.post(
8989
'/flights/', json=stub_flight, params={'motor_kind': 'HYBRID'}
@@ -94,7 +94,7 @@ def test_create_flight_optional_params(stub_flight):
9494
'message': 'Flight successfully created',
9595
}
9696
mock_set_motor_kind.assert_called_once_with(MotorKinds.HYBRID)
97-
mock_create_flight.assert_called_once_with(Flight(**stub_flight))
97+
mock_create_flight.assert_called_once_with(FlightModel(**stub_flight))
9898

9999

100100
def test_create_flight_invalid_input():
@@ -168,7 +168,7 @@ def test_update_flight(stub_flight):
168168
return_value=FlightUpdated(flight_id='123'),
169169
) as mock_update_flight:
170170
with patch.object(
171-
Motor, 'set_motor_kind', side_effect=None
171+
MotorModel, 'set_motor_kind', side_effect=None
172172
) as mock_set_motor_kind:
173173
response = client.put(
174174
'/flights/123',
@@ -181,7 +181,7 @@ def test_update_flight(stub_flight):
181181
'message': 'Flight successfully updated',
182182
}
183183
mock_update_flight.assert_called_once_with(
184-
'123', Flight(**stub_flight)
184+
'123', FlightModel(**stub_flight)
185185
)
186186
mock_set_motor_kind.assert_called_once_with(MotorKinds.GENERIC)
187187

@@ -198,7 +198,7 @@ def test_update_env_by_flight_id(stub_env):
198198
'flight_id': '123',
199199
'message': 'Flight successfully updated',
200200
}
201-
mock_update_flight.assert_called_once_with('123', env=Env(**stub_env))
201+
mock_update_flight.assert_called_once_with('123', env=EnvironmentModel(**stub_env))
202202

203203

204204
def test_update_rocket_by_flight_id(stub_rocket):
@@ -219,7 +219,7 @@ def test_update_rocket_by_flight_id(stub_rocket):
219219
}
220220
assert mock_update_flight.call_count == 1
221221
assert mock_update_flight.call_args[0][0] == '123'
222-
assert mock_update_flight.call_args[1]['rocket'].model_dump() == Rocket(**stub_rocket).model_dump()
222+
assert mock_update_flight.call_args[1]['rocket'].model_dump() == RocketModel(**stub_rocket).model_dump()
223223

224224

225225
def test_update_env_by_flight_id_invalid_input():

0 commit comments

Comments
 (0)