fix pressure/depth input/output categorization logic and add coverage for HipRaXResult

Author: softwareengineerprogrammer

src/hip_ra_x/hip_ra_x.py

@@ -834,15 +834,14 @@ def render_scientific(p: Parameter) -> str:
 
             inputs = self._get_output_config_for_summary_of_inputs_category(render_default, render_scientific)
             # If depth and/or pressure are provided, report them as inputs. If not, as outputs
-            if self.reservoir_depth.Provided:
-                # inputs.append((self.reservoir_depth, render_default))
-                reservoir_pressure_idx = [it[0].Name for it in inputs].index(self.reservoir_pressure.Name)
-                inputs.pop(reservoir_pressure_idx)
-            if self.reservoir_pressure.Provided:
-                # inputs.append((self.reservoir_pressure, render_default))
+            if not self.reservoir_depth.Provided:
                 reservoir_depth_idx = [it[0].Name for it in inputs].index(self.reservoir_depth.Name)
                 inputs.pop(reservoir_depth_idx)
 
+            if not self.reservoir_pressure.Provided:
+                reservoir_pressure_idx = [it[0].Name for it in inputs].index(self.reservoir_pressure.Name)
+                inputs.pop(reservoir_pressure_idx)
+
             for param, render in inputs:
                 summary_of_inputs[param.Name] = render(param)
 
@@ -851,14 +850,12 @@ def render_scientific(p: Parameter) -> str:
             outputs = self._get_output_config_for_summary_of_results_category(render_default, render_scientific)
 
             # If depth and/or pressure are provided, report them as inputs. If not, as outputs
-            if not self.reservoir_depth.Provided:
-                # outputs.insert(0, (self.reservoir_depth, render_default))
-                reservoir_pressure_idx = [it[0].Name for it in outputs].index(self.reservoir_pressure.Name)
-                outputs.pop(reservoir_pressure_idx)
-            if not self.reservoir_pressure.Provided:
-                # outputs.insert(0, (self.reservoir_pressure, render_default))
+            if self.reservoir_depth.Provided:
                 reservoir_depth_idx = [it[0].Name for it in outputs].index(self.reservoir_depth.Name)
                 outputs.pop(reservoir_depth_idx)
+            if self.reservoir_pressure.Provided:
+                reservoir_pressure_idx = [it[0].Name for it in outputs].index(self.reservoir_pressure.Name)
+                outputs.pop(reservoir_pressure_idx)
 
             for param, render in outputs:
                 summary_of_results[param.Name] = render(param)

tests/hip_ra_x_tests/test_hip_ra_x.py

@@ -27,6 +27,7 @@
 from hip_ra import HipRaResult
 from hip_ra.HIP_RA import HIP_RA
 from hip_ra_x import HipRaXClient
+from hip_ra_x import HipRaXResult
 from hip_ra_x.hip_ra_x import HIP_RA_X
 from tests.base_test_case import BaseTestCase
 
@@ -54,6 +55,10 @@ def get_output_file_for_example(example_file: Path):
                     expected_result = HipRaResult(expected_result_output_file_path)
                     self.assertDictEqual(expected_result.result, result.result)
 
+                    x_result = client.get_hip_ra_x_result(HipRaInputParameters(input_file_path))
+                    expected_x_result = HipRaXResult.from_hip_ra_result(expected_result)
+                    self.assertDictEqual(expected_x_result.result, x_result.result)
+
                     # TODO
                     # self.assertFileContentsEqual(expected_result_output_file_path, result.output_file_path)