From 30293ca380cfbaf82d686df169b91a646993ddce Mon Sep 17 00:00:00 2001
From: Joe Robertson <joseph.robertson@nrel.gov>
Date: Wed, 4 Dec 2024 12:43:50 -0700
Subject: [PATCH] Fix merge conflicts.

---
 .../workflow/tests/test_real_homes.rb         | 26 -------------------
 .../workflow/tests/test_sample_files.rb       | 26 -------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 resources/hpxml-measures/workflow/tests/test_real_homes.rb
 delete mode 100644 resources/hpxml-measures/workflow/tests/test_sample_files.rb

diff --git a/resources/hpxml-measures/workflow/tests/test_real_homes.rb b/resources/hpxml-measures/workflow/tests/test_real_homes.rb
deleted file mode 100644
index 2cf26d171f..0000000000
--- a/resources/hpxml-measures/workflow/tests/test_real_homes.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../HPXMLtoOpenStudio/resources/minitest_helper'
-require 'openstudio'
-require 'fileutils'
-require 'parallel'
-require_relative '../../HPXMLtoOpenStudio/measure.rb'
-require_relative 'util.rb'
-
-class WorkflowRealHomesTest < Minitest::Test
-  def test_simulations_real_homes
-    results_dir = File.join(File.dirname(__FILE__), 'results')
-    FileUtils.mkdir_p results_dir
-
-    results_out = File.join(results_dir, 'results_real_homes.csv')
-    bills_out = File.join(results_dir, 'results_real_homes_bills.csv')
-    File.delete(results_out) if File.exist? results_out
-    File.delete(bills_out) if File.exist? bills_out
-
-    hpxml_files_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', 'real_homes'))
-    all_results, all_results_bills = run_simulation_tests(hpxml_files_dir)
-
-    _write_results(all_results.sort_by { |k, _v| k.downcase }.to_h, results_out)
-    _write_results(all_results_bills.sort_by { |k, _v| k.downcase }.to_h, bills_out)
-  end
-end
diff --git a/resources/hpxml-measures/workflow/tests/test_sample_files.rb b/resources/hpxml-measures/workflow/tests/test_sample_files.rb
deleted file mode 100644
index 4b932c0b88..0000000000
--- a/resources/hpxml-measures/workflow/tests/test_sample_files.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../HPXMLtoOpenStudio/resources/minitest_helper'
-require 'openstudio'
-require 'fileutils'
-require 'parallel'
-require_relative '../../HPXMLtoOpenStudio/measure.rb'
-require_relative 'util.rb'
-
-class WorkflowSampleFilesTest < Minitest::Test
-  def test_simulations_sample_files
-    results_dir = File.join(File.dirname(__FILE__), 'results')
-    FileUtils.mkdir_p results_dir
-
-    results_out = File.join(results_dir, 'results_sample_files.csv')
-    bills_out = File.join(results_dir, 'results_sample_files_bills.csv')
-    File.delete(results_out) if File.exist? results_out
-    File.delete(bills_out) if File.exist? bills_out
-
-    hpxml_files_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', 'sample_files'))
-    all_results, all_results_bills = run_simulation_tests(hpxml_files_dir)
-
-    _write_results(all_results.sort_by { |k, _v| k.downcase }.to_h, results_out)
-    _write_results(all_results_bills.sort_by { |k, _v| k.downcase }.to_h, bills_out)
-  end
-end