testing_upgrade, try 2

NREL · Jan 23, 2025 · 4384f89 · 4384f89
1 parent 082c1b5
commit 4384f89
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/test/test_run_analysis.rb b/test/test_run_analysis.rb
@@ -12,11 +12,11 @@ def before_setup
     cli_path = OpenStudio.getOpenStudioCLI
     @command = "\"#{cli_path}\" workflow/run_analysis.rb"
 
-    buildstock_directory = File.join(File.dirname(__FILE__), '..')
+    @buildstock_directory = File.join(File.dirname(__FILE__), '..')
 
-    @testing_baseline = File.join(buildstock_directory, 'testing_baseline')
-    @national_baseline = File.join(buildstock_directory, 'national_baseline')
-    @sdr_upgrades_tmy3 = File.join(buildstock_directory, 'sdr_upgrades_tmy3')
+    @testing_baseline = File.join(@buildstock_directory, 'testing_baseline')
+    @national_baseline = File.join(@buildstock_directory, 'national_baseline')
+    @sdr_upgrades_tmy3 = File.join(@buildstock_directory, 'sdr_upgrades_tmy3')
 
     FileUtils.rm_rf(@testing_baseline)
     FileUtils.rm_rf(@national_baseline)
@@ -179,18 +179,18 @@ def test_building_id
   end
 
   def test_upgrade_name
-    yml = ' -y test/tests_yml_files/yml_valid/testing_upgrades.yml'
+    yml = ' -y test/tests_yml_files/yml_valid/test_upgrade_name.yml'
     @command += yml
     @command += ' -u "Foundation Type" -u Walls'
-
     system(@command)
-    @testing_upgrades = File.join(buildstock_directory, 'testing_upgrades_measure_order')
 
-    _test_measure_order(File.join(@testing_upgrades, 'testing_upgrades-FoundationType.osw'))
-    assert(File.exist?(File.join(@testing_upgrades, 'results-FoundationType.csv')))
-    _test_measure_order(File.join(@testing_upgrades, 'testing_upgrades-Walls.osw'))
-    assert(File.exist?(File.join(@testing_upgrades, 'results-Walls.csv')))
-    assert(!File.exist?(File.join(@testing_upgrades, 'results-Baseline.csv')))
+    test_upgrade_name = File.join(@buildstock_directory, 'test_upgrade_name')
+
+    _test_measure_order(File.join(test_upgrade_name, 'test_upgrade_name-FoundationType.osw'))
+    assert(File.exist?(File.join(test_upgrade_name, 'results-FoundationType.csv')))
+    _test_measure_order(File.join(test_upgrade_name, 'test_upgrade_name-Walls.osw'))
+    assert(File.exist?(File.join(test_upgrade_name, 'results-Walls.csv')))
+    assert(!File.exist?(File.join(test_upgrade_name, 'results-Baseline.csv')))
   end
 
   def test_threads_and_keep_run_folders

diff --git a/..._yml_files/yml_valid/testing_upgrades.yml → ...yml_files/yml_valid/test_upgrade_name.yml b/..._yml_files/yml_valid/testing_upgrades.yml → ...yml_files/yml_valid/test_upgrade_name.yml
@@ -1,7 +1,7 @@
 schema_version: '0.3'
 buildstock_directory: ../../../ # Relative to this file or absolute
 project_directory: project_testing # Relative to buildstock_directory
-output_directory: testing_upgrades_measure_order
+output_directory: test_upgrade_name
 weather_files_url: https://data.nrel.gov/system/files/156/Buildstock_TMY3_FIPS-1678817889.zip
 # weather_files_path: c:/OpenStudio/BuildStock_TMY3_FIPS.zip