Merge branch 'develop'

urbanopt · Jul 21, 2023 · 1aa3bce · 1aa3bce
2 parents a04eba7 + 9cc62f7
commit 1aa3bce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/example_files/resources/hpxml-measures/ReportUtilityBills/measure.xml b/example_files/resources/hpxml-measures/ReportUtilityBills/measure.xml
@@ -73,7 +73,7 @@
       <checksum>3DCED656</checksum>
     </file>
     <file>
-      <filename>Jackson Electric Member Corp - A Residential Service Senior Citizen Low Income Assistance (Effective 2017-01-01).json</filename>
+      <filename>JacksonElectricMemberCorp-ResidentialSeniorCitizenLowIncomeAssistance.json</filename>
       <filetype>json</filetype>
       <usage_type>test</usage_type>
       <checksum>953EE2AC</checksum>

diff --git a/...me Assistance (Effective 2017-01-01).json → ...tialSeniorCitizenLowIncomeAssistance.json b/...me Assistance (Effective 2017-01-01).json → ...tialSeniorCitizenLowIncomeAssistance.json
diff --git a/example_files/resources/hpxml-measures/ReportUtilityBills/tests/utility_bills_test.rb b/example_files/resources/hpxml-measures/ReportUtilityBills/tests/utility_bills_test.rb
@@ -238,7 +238,7 @@ def test_workflow_no_bill_scenarios
   def test_workflow_detailed_calculations
     @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
     hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base.xml'))
-    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/Jackson Electric Member Corp - A Residential Service Senior Citizen Low Income Assistance (Effective 2017-01-01).json')
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/JacksonElectricMemberCorp-ResidentialSeniorCitizenLowIncomeAssistance.json')
     XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
     actual_bills = _test_measure()
     assert_operator(actual_bills['Test 1: Total (USD)'], :>, 0)
@@ -247,7 +247,7 @@ def test_workflow_detailed_calculations
   def test_workflow_detailed_calculations_all_electric
     @args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
     hpxml = HPXML.new(hpxml_path: File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-1-speed.xml'))
-    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/Jackson Electric Member Corp - A Residential Service Senior Citizen Low Income Assistance (Effective 2017-01-01).json')
+    hpxml.header.utility_bill_scenarios.add(name: 'Test 1', elec_tariff_filepath: '../../ReportUtilityBills/tests/JacksonElectricMemberCorp-ResidentialSeniorCitizenLowIncomeAssistance.json')
     XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
     actual_bills = _test_measure()
     assert_operator(actual_bills['Test 1: Total (USD)'], :>, 0)