Merge pull request #5146 from NREL/adjust_python_measure_templates

Fix typo in ReportingMeasure template measure.py + use pathlib.Path in tests

src/utilities/bcl/templates/EnergyPlusMeasure/tests/test_energyplus_measure.py

@@ -111,5 +111,5 @@ def test_good_argument_values(self):
         assert zone.getString(0).get() == "New Zone"
 
         # save the workspace to test output directory
-        output_file_path = openstudio.toPath(str(Path(__file__).parent.absolute() / "output" / "test_output.idf"))
+        output_file_path = Path(__file__).parent.absolute() / "output" / "test_output.idf"
         workspace.save(output_file_path, True)

src/utilities/bcl/templates/ModelMeasure/tests/test_model_measure.py

@@ -78,7 +78,7 @@ def test_good_argument_values(self):
 
         # load the test model
         translator = openstudio.osversion.VersionTranslator()
-        path = openstudio.toPath(str(Path(__file__).parent.absolute() / "example_model.osm"))
+        path = Path(__file__).parent.absolute() / "example_model.osm"
         model = translator.loadModel(path)
         assert model.is_initialized()
         model = model.get()
@@ -124,5 +124,5 @@ def test_good_argument_values(self):
         assert num_spaces_final == num_spaces_seed + 1
 
         # save the model to test output directory
-        output_file_path = openstudio.toPath(str(Path(__file__).parent.absolute() / "output" / "test_output.osm"))
+        output_file_path = Path(__file__).parent.absolute() / "output" / "test_output.osm"
         model.save(output_file_path, True)

src/utilities/bcl/templates/ReportingMeasure/measure.py

@@ -51,7 +51,7 @@ def arguments(self, model: openstudio.model.Model):
 
         report_drybulb_temp = openstudio.measure.OSArgument.makeBoolArgument("report_drybulb_temp", True)
         report_drybulb_temp.setDisplayName("Add output variables for Drybulb Temperature")
-        report_drybulb_temp.setDescription("Will add drybulb temp and report min/mix value in html.")
+        report_drybulb_temp.setDescription("Will add drybulb temp and report min/max values in html.")
         report_drybulb_temp.setValue(True)
         args.append(report_drybulb_temp)
 
@@ -269,7 +269,7 @@ def format_dt(dt):
             </tr>
             <tr>
               <th scope="row">Maximum Site Outdoor Air Drybulb Temperature</th>
-              <td>{min(vals):.1f}</td>
+              <td>{max(vals):.1f}</td>
               <td>C</td>
             </tr>
          </tbody>

src/utilities/bcl/templates/ReportingMeasure/tests/test_reporting_measure.py

@@ -60,7 +60,7 @@ def setup_test(
         request_model = rt.translateWorkspace(workspace)
 
         translator = openstudio.osversion.VersionTranslator()
-        model = translator.loadModel(openstudio.toPath(str(model_in_path)))
+        model = translator.loadModel(model_in_path)
         assert model.is_initialized()
         model = model.get()
         model.addObjects(request_model.objects())
@@ -122,7 +122,7 @@ def test_with_drybulb_temp(self):
         argument_map["report_drybulb_temp"] = report_drybulb_temp
 
         # temp set path so idf_output_requests work
-        runner.setLastOpenStudioModelPath(openstudio.toPath(str(MODEL_IN_PATH_DEFAULT)))
+        runner.setLastOpenStudioModelPath(MODEL_IN_PATH_DEFAULT)
 
         # get the energyplus output requests, this will be done automatically by OS App and PAT
         idf_output_requests = measure.energyPlusOutputRequests(runner, argument_map)
@@ -138,9 +138,9 @@ def test_with_drybulb_temp(self):
         assert TestReportingMeasureName.sql_path(test_name).exists()
 
         # set up runner, this will happen automatically when measure is run in PAT or OpenStudio
-        runner.setLastOpenStudioModelPath(openstudio.toPath(str(model_out_path)))
-        runner.setLastEpwFilePath(openstudio.toPath(str(epw_path)))
-        runner.setLastEnergyPlusSqlFilePath(openstudio.toPath(str(TestReportingMeasureName.sql_path(test_name))))
+        runner.setLastOpenStudioModelPath(model_out_path)
+        runner.setLastEpwFilePath(epw_path)
+        runner.setLastEnergyPlusSqlFilePath(TestReportingMeasureName.sql_path(test_name))
 
         # delete the output if it exists
         report_path = TestReportingMeasureName.report_path(test_name)
@@ -191,7 +191,7 @@ def test_without_drybulb_temp(self):
         argument_map["report_drybulb_temp"] = report_drybulb_temp
 
         # temp set path so idf_output_requests work
-        runner.setLastOpenStudioModelPath(openstudio.toPath(str(MODEL_IN_PATH_DEFAULT)))
+        runner.setLastOpenStudioModelPath(MODEL_IN_PATH_DEFAULT)
 
         # get the energyplus output requests, this will be done automatically by OS App and PAT
         idf_output_requests = measure.energyPlusOutputRequests(runner, argument_map)
@@ -207,9 +207,9 @@ def test_without_drybulb_temp(self):
         assert TestReportingMeasureName.sql_path(test_name).exists()
 
         # set up runner, this will happen automatically when measure is run in PAT or OpenStudio
-        runner.setLastOpenStudioModelPath(openstudio.toPath(str(model_out_path)))
-        runner.setLastEpwFilePath(openstudio.toPath(str(epw_path)))
-        runner.setLastEnergyPlusSqlFilePath(openstudio.toPath(str(TestReportingMeasureName.sql_path(test_name))))
+        runner.setLastOpenStudioModelPath(model_out_path)
+        runner.setLastEpwFilePath(epw_path)
+        runner.setLastEnergyPlusSqlFilePath(TestReportingMeasureName.sql_path(test_name))
 
         # delete the output if it exists
         report_path = TestReportingMeasureName.report_path(test_name)