@@ -742,6 +742,20 @@ def test_environment_methods_accessible_in_controller(
742742 "temperature" : False ,
743743 }
744744
745+ def _call_env_methods (environment , altitude_asl , methods_called ):
746+ _ = environment .elevation
747+ methods_called ["elevation" ] = True
748+ _ = environment .wind_velocity_x (altitude_asl )
749+ methods_called ["wind_velocity_x" ] = True
750+ _ = environment .wind_velocity_y (altitude_asl )
751+ methods_called ["wind_velocity_y" ] = True
752+ _ = environment .speed_of_sound (altitude_asl )
753+ methods_called ["speed_of_sound" ] = True
754+ _ = environment .pressure (altitude_asl )
755+ methods_called ["pressure" ] = True
756+ _ = environment .temperature (altitude_asl )
757+ methods_called ["temperature" ] = True
758+
745759 def controller_test_environment_access ( # pylint: disable=unused-argument
746760 time ,
747761 sampling_rate ,
@@ -758,29 +772,10 @@ def controller_test_environment_access( # pylint: disable=unused-argument
758772 if time < 3.9 :
759773 return None
760774
761- # Test accessing various environment methods
762775 try :
763- _ = environment .elevation
764- methods_called ["elevation" ] = True
765-
766- _ = environment .wind_velocity_x (altitude_asl )
767- methods_called ["wind_velocity_x" ] = True
768-
769- _ = environment .wind_velocity_y (altitude_asl )
770- methods_called ["wind_velocity_y" ] = True
771-
772- _ = environment .speed_of_sound (altitude_asl )
773- methods_called ["speed_of_sound" ] = True
774-
775- _ = environment .pressure (altitude_asl )
776- methods_called ["pressure" ] = True
777-
778- _ = environment .temperature (altitude_asl )
779- methods_called ["temperature" ] = True
780-
776+ _call_env_methods (environment , altitude_asl , methods_called )
781777 air_brakes .deployment_level = 0.3
782778 except AttributeError as e :
783- # If any method is not accessible, the test should fail
784779 raise AssertionError (f"Environment method not accessible: { e } " ) from e
785780
786781 return (time , air_brakes .deployment_level )
0 commit comments