Remove unnecessary try/except blocks - PointMass classes are available in codebase

Co-authored-by: aZira371 <99824864+aZira371@users.noreply.github.com>

Author: Copilot

tests/acceptance/test_3dof_flight.py

@@ -12,32 +12,13 @@
 The tests use realistic rocket configurations and scenarios to ensure the
 robustness of the 3 DOF implementation.
 
-Note: These tests are designed for the 3 DOF feature implemented in issue #882.
-They will be skipped until PointMassMotor and PointMassRocket are available.
 All fixtures are defined in tests/fixtures/flight/flight_fixtures.py.
 """
 
 import numpy as np
-import pytest
 
 from rocketpy import Flight
 
-# Try to import 3DOF-specific classes, skip tests if not available
-try:
-    from rocketpy.motors.point_mass_motor import PointMassMotor
-    from rocketpy.rocket.point_mass_rocket import PointMassRocket
-
-    THREEDOF_AVAILABLE = True
-except ImportError:
-    THREEDOF_AVAILABLE = False
-
-# Skip all tests in this module if 3DOF is not available
-pytestmark = pytest.mark.skipif(
-    not THREEDOF_AVAILABLE,
-    reason="3 DOF feature (PointMassMotor, PointMassRocket) not yet available. "
-    "These tests will be enabled when issue #882 is merged.",
-)
-
 
 def test_3dof_flight_basic_trajectory(flight_3dof_no_weathercock):
     """Test that 3 DOF flight produces reasonable trajectory.

tests/fixtures/flight/flight_fixtures.py

@@ -2,6 +2,8 @@
 import pytest
 
 from rocketpy import Flight, Function, Rocket
+from rocketpy.motors.point_mass_motor import PointMassMotor
+from rocketpy.rocket.point_mass_rocket import PointMassRocket
 
 
 @pytest.fixture
@@ -365,111 +367,99 @@ def flight_flat(example_plain_env, cesaroni_m1670):
 
 # 3 DOF Flight Fixtures
 # These fixtures are for testing the 3 DOF flight simulation mode
-# They will be available when PointMassMotor and PointMassRocket are implemented
-
-try:
-    from rocketpy.motors.point_mass_motor import PointMassMotor
-    from rocketpy.rocket.point_mass_rocket import PointMassRocket
-
-    THREEDOF_AVAILABLE = True
-except ImportError:
-    THREEDOF_AVAILABLE = False
-    PointMassMotor = None
-    PointMassRocket = None
-
-
-if THREEDOF_AVAILABLE:
-
-    @pytest.fixture
-    def acceptance_point_mass_motor():
-        """Create a realistic point mass motor for acceptance testing.
-
-        Returns
-        -------
-        rocketpy.PointMassMotor
-            A point mass motor with realistic thrust and mass properties.
-        """
-        return PointMassMotor(
-            thrust_source=1500,  # 1500 N constant thrust
-            dry_mass=2.5,  # 2.5 kg dry mass
-            propellant_initial_mass=3.0,  # 3.0 kg propellant
-            burn_time=3.5,  # 3.5 s burn time
-        )
-
-    @pytest.fixture
-    def acceptance_point_mass_rocket(acceptance_point_mass_motor):
-        """Create a realistic point mass rocket for acceptance testing.
-
-        Parameters
-        ----------
-        acceptance_point_mass_motor : rocketpy.PointMassMotor
-            The motor to be added to the rocket.
-
-        Returns
-        -------
-        rocketpy.PointMassRocket
-            A point mass rocket with realistic dimensions and properties.
-        """
-        rocket = PointMassRocket(
-            radius=0.0635,  # 127 mm diameter (5 inches)
-            mass=5.0,  # 5 kg without motor
-            center_of_mass_without_motor=0.5,
-            power_off_drag=0.45,
-            power_on_drag=0.50,
-        )
-        rocket.add_motor(acceptance_point_mass_motor, position=0)
-        return rocket
-
-    @pytest.fixture
-    def flight_3dof_no_weathercock(example_spaceport_env, acceptance_point_mass_rocket):
-        """Create a 3 DOF flight without weathercocking.
-
-        Parameters
-        ----------
-        example_spaceport_env : rocketpy.Environment
-            Environment fixture for Spaceport America.
-        acceptance_point_mass_rocket : rocketpy.PointMassRocket
-            Point mass rocket fixture.
-
-        Returns
-        -------
-        rocketpy.Flight
-            A 3 DOF flight simulation with weathercock_coeff=0.0.
-        """
-        return Flight(
-            rocket=acceptance_point_mass_rocket,
-            environment=example_spaceport_env,
-            rail_length=5.0,
-            inclination=85,  # 85 degrees from horizontal (5 degrees from vertical)
-            heading=0,
-            simulation_mode="3 DOF",
-            weathercock_coeff=0.0,
-        )
-
-    @pytest.fixture
-    def flight_3dof_with_weathercock(
-        example_spaceport_env, acceptance_point_mass_rocket
-    ):
-        """Create a 3 DOF flight with weathercocking enabled.
-
-        Parameters
-        ----------
-        example_spaceport_env : rocketpy.Environment
-            Environment fixture for Spaceport America.
-        acceptance_point_mass_rocket : rocketpy.PointMassRocket
-            Point mass rocket fixture.
-
-        Returns
-        -------
-        rocketpy.Flight
-            A 3 DOF flight simulation with weathercock_coeff=1.0.
-        """
-        return Flight(
-            rocket=acceptance_point_mass_rocket,
-            environment=example_spaceport_env,
-            rail_length=5.0,
-            inclination=85,
-            heading=0,
-            simulation_mode="3 DOF",
-            weathercock_coeff=1.0,
-        )
+
+
+@pytest.fixture
+def acceptance_point_mass_motor():
+    """Create a realistic point mass motor for acceptance testing.
+
+    Returns
+    -------
+    rocketpy.PointMassMotor
+        A point mass motor with realistic thrust and mass properties.
+    """
+    return PointMassMotor(
+        thrust_source=1500,  # 1500 N constant thrust
+        dry_mass=2.5,  # 2.5 kg dry mass
+        propellant_initial_mass=3.0,  # 3.0 kg propellant
+        burn_time=3.5,  # 3.5 s burn time
+    )
+
+
+@pytest.fixture
+def acceptance_point_mass_rocket(acceptance_point_mass_motor):
+    """Create a realistic point mass rocket for acceptance testing.
+
+    Parameters
+    ----------
+    acceptance_point_mass_motor : rocketpy.PointMassMotor
+        The motor to be added to the rocket.
+
+    Returns
+    -------
+    rocketpy.PointMassRocket
+        A point mass rocket with realistic dimensions and properties.
+    """
+    rocket = PointMassRocket(
+        radius=0.0635,  # 127 mm diameter (5 inches)
+        mass=5.0,  # 5 kg without motor
+        center_of_mass_without_motor=0.5,
+        power_off_drag=0.45,
+        power_on_drag=0.50,
+    )
+    rocket.add_motor(acceptance_point_mass_motor, position=0)
+    return rocket
+
+
+@pytest.fixture
+def flight_3dof_no_weathercock(example_spaceport_env, acceptance_point_mass_rocket):
+    """Create a 3 DOF flight without weathercocking.
+
+    Parameters
+    ----------
+    example_spaceport_env : rocketpy.Environment
+        Environment fixture for Spaceport America.
+    acceptance_point_mass_rocket : rocketpy.PointMassRocket
+        Point mass rocket fixture.
+
+    Returns
+    -------
+    rocketpy.Flight
+        A 3 DOF flight simulation with weathercock_coeff=0.0.
+    """
+    return Flight(
+        rocket=acceptance_point_mass_rocket,
+        environment=example_spaceport_env,
+        rail_length=5.0,
+        inclination=85,  # 85 degrees from horizontal (5 degrees from vertical)
+        heading=0,
+        simulation_mode="3 DOF",
+        weathercock_coeff=0.0,
+    )
+
+
+@pytest.fixture
+def flight_3dof_with_weathercock(example_spaceport_env, acceptance_point_mass_rocket):
+    """Create a 3 DOF flight with weathercocking enabled.
+
+    Parameters
+    ----------
+    example_spaceport_env : rocketpy.Environment
+        Environment fixture for Spaceport America.
+    acceptance_point_mass_rocket : rocketpy.PointMassRocket
+        Point mass rocket fixture.
+
+    Returns
+    -------
+    rocketpy.Flight
+        A 3 DOF flight simulation with weathercock_coeff=1.0.
+    """
+    return Flight(
+        rocket=acceptance_point_mass_rocket,
+        environment=example_spaceport_env,
+        rail_length=5.0,
+        inclination=85,
+        heading=0,
+        simulation_mode="3 DOF",
+        weathercock_coeff=1.0,
+    )