Merge branch 'ansi_301_2022' of https://github.com/NREL/OpenStudio-ERI …

…into ansi_301_2022_lighting_appl # Conflicts: # workflow/tests/base_results/sample_files1.csv
NREL · Jan 27, 2024 · 8fde46b · 8fde46b
2 parents bfe1ecc + 54f81df
commit 8fde46b
Show file tree

Hide file tree

Showing 8 changed files with 309 additions and 79 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  run-unit-tests:
+  run-ruleset-tests:
     runs-on: ubuntu-latest
     container:
       image: docker://nrel/openstudio:3.7.0
@@ -33,9 +33,9 @@ jobs:
           git config --global --add safe.directory $(realpath .)
           git diff --exit-code --ignore-cr-at-eol workflow/*.xml
 
-      - name: Run measure unit tests
+      - name: Run ruleset tests
         run: |
-          bundle exec rake test_measures
+          bundle exec rake test_rulesets
 
       - name: Store code coverage
         uses: actions/upload-artifact@v3
@@ -54,7 +54,7 @@ jobs:
           name: documentation
           path: docs/_build/html/
 
-  run-eri-tests:
+  run-sample-files1-tests:
     runs-on: ubuntu-latest
     container:
       image: docker://nrel/openstudio:3.7.0
@@ -67,15 +67,38 @@ jobs:
         run: |
           rm -f Gemfile.lock && bundle install
 
-      - name: Run ERI tests
+      - name: Run Sample Files 1 tests
         run: |
-          bundle exec rake test_eri
+          bundle exec rake test_sample_files1
 
       - name: Store results
         uses: actions/upload-artifact@v3
         with:
           path: workflow/tests/test_results
-          name: test_results_eri
+          name: test_results_sample_files1
+
+  run-sample-files2-tests:
+    runs-on: ubuntu-latest
+    container:
+      image: docker://nrel/openstudio:3.7.0
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Install software
+        run: |
+          rm -f Gemfile.lock && bundle install
+
+      - name: Run Sample Files 2 tests
+        run: |
+          bundle exec rake test_sample_files2
+
+      - name: Store results
+        uses: actions/upload-artifact@v3
+        with:
+          path: workflow/tests/test_results
+          name: test_results_sample_files2
 
   run-real-home-tests:
     runs-on: ubuntu-latest
@@ -100,7 +123,7 @@ jobs:
           path: workflow/tests/test_results
           name: test_results_real_homes
 
-  run-resnet-es-zerh-tests:
+  run-other-tests:
     runs-on: ubuntu-latest
     container:
       image: docker://nrel/openstudio:3.7.0
@@ -113,15 +136,15 @@ jobs:
         run: |
           rm -f Gemfile.lock && bundle install
 
-      - name: Run RESNET/ES/ZERH tests
+      - name: Run Other tests
         run: |
-          bundle exec rake test_resnet_es_zerh
+          bundle exec rake test_other
 
       - name: Store results
         uses: actions/upload-artifact@v3
         with:
           path: workflow/tests/test_results
-          name: test_results_resnet_es_zerh
+          name: test_results_other
 
   run-windows-tests:
     runs-on: windows-latest
@@ -141,7 +164,7 @@ jobs:
   compare-results:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
-    needs: [run-eri-tests, run-real-home-tests, run-resnet-es-zerh-tests]
+    needs: [run-sample-files1-tests, run-sample-files2-tests, run-real-home-tests, run-other-tests]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -164,12 +187,19 @@ jobs:
             base_results
           name: base_results
 
-      - name: Download ERI feature results
+      - name: Download Sample Files 1 feature results
+        uses: actions/download-artifact@v3
+        with:
+          path: |
+            results
+          name: test_results_sample_files1
+
+      - name: Download Sample Files 2 feature results
         uses: actions/download-artifact@v3
         with:
           path: |
             results
-          name: test_results_eri
+          name: test_results_sample_files2
 
       - name: Download Real Home feature results
         uses: actions/download-artifact@v3
@@ -178,12 +208,12 @@ jobs:
             results
           name: test_results_real_homes
 
-      - name: Download RESNET/ES/ZERH feature results
+      - name: Download Other feature results
         uses: actions/download-artifact@v3
         with:
           path: |
             results
-          name: test_results_resnet_es_zerh
+          name: test_results_other
 
       - name: Compare results
         run: |
@@ -207,18 +237,25 @@ jobs:
 
   update-results:
     runs-on: ubuntu-latest
-    needs: [run-eri-tests, run-real-home-tests, run-resnet-es-zerh-tests]
+    needs: [run-sample-files1-tests, run-sample-files2-tests, run-real-home-tests, run-other-tests]
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Download ERI feature results
+      - name: Download Sample Files 1 feature results
+        uses: actions/download-artifact@v3
+        with:
+          path: |
+            results
+          name: test_results_sample_files1
+
+      - name: Download Sample Files 2 feature results
         uses: actions/download-artifact@v3
         with:
           path: |
             results
-          name: test_results_eri
+          name: test_results_sample_files2
 
       - name: Download Real Home feature results
         uses: actions/download-artifact@v3
@@ -227,12 +264,12 @@ jobs:
             results
           name: test_results_real_homes
 
-      - name: Download RESNET/ES/ZERH feature results
+      - name: Download Other feature results
         uses: actions/download-artifact@v3
         with:
           path: |
             results
-          name: test_results_resnet_es_zerh
+          name: test_results_other
 
       - name: Commit latest results
         shell: bash        

diff --git a/Rakefile b/Rakefile
@@ -13,16 +13,23 @@ Rake::TestTask.new('test_all') do |t|
   t.verbose = true
 end
 
-desc 'Run measure unit tests'
-Rake::TestTask.new('test_measures') do |t|
+desc 'Run ruleset tests'
+Rake::TestTask.new('test_rulesets') do |t|
   t.test_files = Dir['rulesets/tests/*.rb']
   t.warning = false
   t.verbose = true
 end
 
-desc 'Run ERI tests'
-Rake::TestTask.new('test_eri') do |t|
-  t.test_files = Dir['workflow/tests/energy_rating_index_test.rb']
+desc 'Run Sample Files 1 tests'
+Rake::TestTask.new('test_sample_files1') do |t|
+  t.test_files = Dir['workflow/tests/sample_files1_test.rb']
+  t.warning = false
+  t.verbose = true
+end
+
+desc 'Run Sample Files 2 tests'
+Rake::TestTask.new('test_sample_files2') do |t|
+  t.test_files = Dir['workflow/tests/sample_files2_test.rb']
   t.warning = false
   t.verbose = true
 end
@@ -34,9 +41,9 @@ Rake::TestTask.new('test_real_homes') do |t|
   t.verbose = true
 end
 
-desc 'Run RESNET/ES/ZERH tests'
-Rake::TestTask.new('test_resnet_es_zerh') do |t|
-  t.test_files = Dir['workflow/tests/*test.rb'] - Dir['workflow/tests/real_homes_test.rb'] - Dir['workflow/tests/energy_rating_index_test.rb']
+desc 'Run Other tests'
+Rake::TestTask.new('test_other') do |t|
+  t.test_files = Dir['workflow/tests/*test.rb'] - Dir['workflow/tests/real_homes_test.rb'] - Dir['workflow/tests/sample_files*test.rb']
   t.warning = false
   t.verbose = true
 end
diff --git a/workflow/tests/base_results/sample_files.csv → ...flow/tests/base_results/sample_files1.csv b/workflow/tests/base_results/sample_files.csv → ...flow/tests/base_results/sample_files1.csv