Updated some unittests to use subtests

aviary/mission/height_energy/ode/test/test_landing_eom.py

@@ -44,8 +44,8 @@ def setUp(self):
 
     def test_case(self):
         do_validation_test(
+            self,
             self.prob,
-            'landing_flare_eom',
             input_validation_data=detailed_landing_flare,
             output_validation_data=detailed_landing_flare,
             input_keys=[

aviary/mission/height_energy/ode/test/test_landing_ode.py

@@ -54,8 +54,8 @@ def test_case(self):
         set_aviary_initial_values(prob, aviary_options)
 
         do_validation_test(
+            self,
             prob,
-            'landing_flare_ode',
             input_validation_data=detailed_landing_flare,
             output_validation_data=detailed_landing_flare,
             input_keys=[

aviary/mission/height_energy/ode/test/test_range_rate.py

@@ -27,8 +27,8 @@ def setUp(self):
 
     def test_case1(self):
         do_validation_test(
+            self,
             self.prob,
-            'full_mission_test_data',
             input_validation_data=data,
             output_validation_data=data,
             input_keys=[Dynamic.Mission.ALTITUDE_RATE, Dynamic.Mission.VELOCITY],

aviary/mission/height_energy/ode/test/test_takeoff_eom.py

@@ -34,8 +34,8 @@ def test_case_ground(self):
         prob = self._make_prob(climbing=False)
 
         do_validation_test(
+            self,
             prob,
-            'takeoff_eom_ground',
             input_validation_data=detailed_takeoff_ground,
             output_validation_data=detailed_takeoff_ground,
             input_keys=[
@@ -59,8 +59,8 @@ def test_case_climbing(self):
         prob = self._make_prob(climbing=True)
 
         do_validation_test(
+            self,
             prob,
-            'takeoff_eom_climbing',
             input_validation_data=detailed_takeoff_climbing,
             output_validation_data=detailed_takeoff_climbing,
             input_keys=[

aviary/mission/height_energy/ode/test/test_takeoff_ode.py

@@ -29,8 +29,8 @@ def test_case_ground(self):
         prob = self._make_prob(climbing=False)
 
         do_validation_test(
+            self,
             prob,
-            'takeoff_ode_ground',
             input_validation_data=detailed_takeoff_ground,
             output_validation_data=detailed_takeoff_ground,
             input_keys=[
@@ -59,8 +59,8 @@ def test_case_climbing(self):
         prob = self._make_prob(climbing=True)
 
         do_validation_test(
+            self,
             prob,
-            'takeoff_ode_climbing',
             input_validation_data=detailed_takeoff_climbing,
             output_validation_data=detailed_takeoff_climbing,
             input_keys=[

aviary/mission/ode/test/test_altitude_rate.py

@@ -26,8 +26,8 @@ def setUp(self):
 
     def test_case1(self):
         do_validation_test(
+            self,
             self.prob,
-            'full_mission_test_data',
             input_validation_data=data,
             output_validation_data=data,
             input_keys=[

aviary/mission/ode/test/test_specific_energy_rate.py

@@ -26,8 +26,8 @@ def setUp(self):
 
     def test_case1(self):
         do_validation_test(
+            self,
             self.prob,
-            'full_mission_test_data',
             input_validation_data=data,
             output_validation_data=data,
             input_keys=[

aviary/subsystems/aerodynamics/flops_based/test/test_mux_component.py

@@ -74,11 +74,23 @@ def test_mux(self):
         laminar_fractions_lower_output = prob['mux.laminar_fractions_lower']
 
         # Assert that the outputs are near the expected values
-        assert_near_equal(wetted_areas_output, wetted_areas_truth, 1e-7)
-        assert_near_equal(fineness_ratios_output, fineness_ratios_truth, 1e-7)
-        assert_near_equal(characteristic_lengths_output, characteristic_lengths_truth, 1e-7)
-        assert_near_equal(laminar_fractions_upper_output, laminar_fractions_upper_truth, 1e-7)
-        assert_near_equal(laminar_fractions_lower_output, laminar_fractions_lower_truth, 1e-7)
+        expected_values = {
+            'wetted_areas': (wetted_areas_output, wetted_areas_truth),
+            'fineness_ratios': (fineness_ratios_output, fineness_ratios_truth),
+            'characteristic_lengths': (characteristic_lengths_output, characteristic_lengths_truth),
+            'laminar_fractions_upper': (
+                laminar_fractions_upper_output,
+                laminar_fractions_upper_truth,
+            ),
+            'laminar_fractions_lower': (
+                laminar_fractions_lower_output,
+                laminar_fractions_lower_truth,
+            ),
+        }
+
+        for var_name, (output, truth) in expected_values.items():
+            with self.subTest(var=var_name):
+                assert_near_equal(output, truth, 1e-7)
 
     def test_mux_multiengine(self):
         prob = om.Problem()
@@ -151,11 +163,23 @@ def test_mux_multiengine(self):
         laminar_fractions_lower_output = prob['mux.laminar_fractions_lower']
 
         # Assert that the outputs are near the expected values
-        assert_near_equal(wetted_areas_output, wetted_areas_truth, 1e-7)
-        assert_near_equal(fineness_ratios_output, fineness_ratios_truth, 1e-7)
-        assert_near_equal(characteristic_lengths_output, characteristic_lengths_truth, 1e-7)
-        assert_near_equal(laminar_fractions_upper_output, laminar_fractions_upper_truth, 1e-7)
-        assert_near_equal(laminar_fractions_lower_output, laminar_fractions_lower_truth, 1e-7)
+        expected_values = {
+            'wetted_areas': (wetted_areas_output, wetted_areas_truth),
+            'fineness_ratios': (fineness_ratios_output, fineness_ratios_truth),
+            'characteristic_lengths': (characteristic_lengths_output, characteristic_lengths_truth),
+            'laminar_fractions_upper': (
+                laminar_fractions_upper_output,
+                laminar_fractions_upper_truth,
+            ),
+            'laminar_fractions_lower': (
+                laminar_fractions_lower_output,
+                laminar_fractions_lower_truth,
+            ),
+        }
+
+        for var_name, (output, truth) in expected_values.items():
+            with self.subTest(var=var_name):
+                assert_near_equal(output, truth, 1e-7)
 
 
 if __name__ == '__main__':

aviary/subsystems/aerodynamics/gasp_based/flaps_model/test/test_Clmax.py

@@ -49,19 +49,17 @@ def setUp(self):
     def test_case(self):
         self.prob.run_model()
         tol = 6e-4
-        print()
 
-        reg_data = 2.8155
-        ans = self.prob['CL_max']
-        assert_near_equal(ans, reg_data, tol)
+        expected_values = {
+            'CL_max': 2.8155,
+            Dynamic.Atmosphere.MACH: 0.17522,
+            'reynolds': 157.19864,
+        }
 
-        reg_data = 0.17522
-        ans = self.prob[Dynamic.Atmosphere.MACH]
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 157.19864
-        ans = self.prob['reynolds']
-        assert_near_equal(ans, reg_data, tol)
+        for var_name, reg_data in expected_values.items():
+            with self.subTest(var=var_name):
+                ans = self.prob[var_name]
+                assert_near_equal(ans, reg_data, tol)
 
         data = self.prob.check_partials(out_stream=None, method='fd')
         assert_check_partials(

aviary/subsystems/aerodynamics/gasp_based/flaps_model/test/test_basic_calculations.py

@@ -43,43 +43,23 @@ def setUp(self):
     def test_case(self):
         self.prob.run_model()
         tol = 2.1e-4
-        print()
 
-        reg_data = 0.74444
-        ans = self.prob['VLAM8']
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 0.93578
-        ans = self.prob['VDEL4']
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 0.90761
-        ans = self.prob['VDEL5']
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 0.9975
-        ans = self.prob['VLAM9']
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 0.5
-        ans = self.prob['slat_defl_ratio']
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 0.89761
-        ans = self.prob[Aircraft.Wing.SLAT_SPAN_RATIO]
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 0.09239
-        ans = self.prob['body_to_span_ratio']
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 0.12679
-        ans = self.prob['chord_to_body_ratio']
-        assert_near_equal(ans, reg_data, tol)
-
-        reg_data = 0.79208
-        ans = self.prob['VLAM12']
-        assert_near_equal(ans, reg_data, tol)
+        expected_values = {
+            'VLAM8': 0.74444,
+            'VDEL4': 0.93578,
+            'VDEL5': 0.90761,
+            'VLAM9': 0.9975,
+            'slat_defl_ratio': 0.5,
+            Aircraft.Wing.SLAT_SPAN_RATIO: 0.89761,
+            'body_to_span_ratio': 0.09239,
+            'chord_to_body_ratio': 0.12679,
+            'VLAM12': 0.79208,
+        }
+
+        for var_name, reg_data in expected_values.items():
+            with self.subTest(var=var_name):
+                ans = self.prob[var_name]
+                assert_near_equal(ans, reg_data, tol)
 
         data = self.prob.check_partials(out_stream=None, method='fd')
         assert_check_partials(data, atol=1e-6, rtol=4e-6)