Skip to content

Commit 41b6051

Browse files
CopilotaZira371
andcommitted
Remove duplicate bella_lui fixtures, keep only acceptance_point_mass fixtures
Co-authored-by: aZira371 <[email protected]>
1 parent e136699 commit 41b6051

File tree

1 file changed

+7
-55
lines changed

1 file changed

+7
-55
lines changed

tests/fixtures/flight/flight_fixtures.py

Lines changed: 7 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ def flight_flat(example_plain_env, cesaroni_m1670):
391391

392392

393393
@pytest.fixture
394-
def bella_lui_point_mass_motor():
395-
"""Create a point mass motor based on Bella Lui rocket (K828FJ motor).
394+
def acceptance_point_mass_motor():
395+
"""Create a realistic point mass motor for acceptance testing.
396396
397-
The Bella Lui rocket used an AeroTech K828FJ motor with the following specs:
397+
Based on Bella Lui rocket (K828FJ motor) with the following specs:
398398
- Total impulse: ~2157 N·s
399399
- Average thrust: ~888 N
400400
- Burn time: ~2.43 s
@@ -415,18 +415,18 @@ def bella_lui_point_mass_motor():
415415

416416

417417
@pytest.fixture
418-
def bella_lui_point_mass_rocket(bella_lui_point_mass_motor):
419-
"""Create a point mass rocket based on Bella Lui rocket parameters.
418+
def acceptance_point_mass_rocket(acceptance_point_mass_motor):
419+
"""Create a realistic point mass rocket for acceptance testing.
420420
421-
The Bella Lui rocket specifications:
421+
Based on Bella Lui rocket parameters:
422422
- Radius: 156 mm (diameter 312 mm)
423423
- Dry mass (without motor): ~17.227 kg
424424
- Power-off drag coefficient: ~0.43
425425
- Power-on drag coefficient: ~0.43
426426
427427
Parameters
428428
----------
429-
bella_lui_point_mass_motor : rocketpy.PointMassMotor
429+
acceptance_point_mass_motor : rocketpy.PointMassMotor
430430
The motor to be added to the rocket.
431431
432432
Returns
@@ -441,54 +441,6 @@ def bella_lui_point_mass_rocket(bella_lui_point_mass_motor):
441441
power_off_drag=0.43,
442442
power_on_drag=0.43,
443443
)
444-
rocket.add_motor(bella_lui_point_mass_motor, position=0)
445-
return rocket
446-
447-
448-
@pytest.fixture
449-
def acceptance_point_mass_motor():
450-
"""Create a realistic point mass motor for acceptance testing.
451-
452-
Uses the same Bella Lui rocket parameters (K828FJ motor) to provide
453-
a consistent baseline for all acceptance tests.
454-
455-
Returns
456-
-------
457-
rocketpy.PointMassMotor
458-
A point mass motor with Bella Lui rocket parameters.
459-
"""
460-
return PointMassMotor(
461-
thrust_source="data/motors/aerotech/AeroTech_K828FJ.eng",
462-
dry_mass=1.0,
463-
propellant_initial_mass=1.373,
464-
burn_time=2.43,
465-
)
466-
467-
468-
@pytest.fixture
469-
def acceptance_point_mass_rocket(acceptance_point_mass_motor):
470-
"""Create a realistic point mass rocket for acceptance testing.
471-
472-
Uses the same Bella Lui rocket parameters to provide a consistent
473-
baseline for all acceptance tests.
474-
475-
Parameters
476-
----------
477-
acceptance_point_mass_motor : rocketpy.PointMassMotor
478-
The motor to be added to the rocket.
479-
480-
Returns
481-
-------
482-
rocketpy.PointMassRocket
483-
A point mass rocket with Bella Lui rocket parameters.
484-
"""
485-
rocket = PointMassRocket(
486-
radius=0.156,
487-
mass=17.227,
488-
center_of_mass_without_motor=0,
489-
power_off_drag=0.43,
490-
power_on_drag=0.43,
491-
)
492444
rocket.add_motor(acceptance_point_mass_motor, position=0)
493445
return rocket
494446

0 commit comments

Comments
 (0)