Merge pull request #60 from NREL/PolishForV2

Final polishing for version 2.0
NREL · Nov 16, 2020 · 0eac3df · 0eac3df
2 parents f8c9f9d + d04aae5
commit 0eac3df
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1,2 @@
 recursive-include epregressions *.config
+recursive-include epregressions *.png
diff --git a/epregressions/__init__.py b/epregressions/__init__.py
@@ -1 +1 @@
-VERSION = '1.9.4'
+VERSION = '1.9.5'
diff --git a/epregressions/ep.png b/epregressions/ep.png
diff --git a/epregressions/runtests.py b/epregressions/runtests.py
@@ -397,6 +397,8 @@ def diff_text_files(file_a, file_b, diff_file):
             "(idf)=",
             "(user input)=",
             "(input file)=",
+            "(IDF Directory)=",
+            "(Current Working Directory)\"=",
             "ReadVars Run Time",
             "EnergyPlus Program Version",
             "PythonPlugin: Class"

diff --git a/epregressions/structures.py b/epregressions/structures.py
@@ -179,7 +179,7 @@ class TestEntry:
     def __init__(self, name_relative_to_testfiles_dir, epw):
         self.name_relative_to_testfiles_dir = name_relative_to_testfiles_dir
         self.basename = os.path.splitext(name_relative_to_testfiles_dir.replace(os.path.sep, '__'))[0]
-        if epw.endswith('.epw'):
+        if epw and epw.endswith('.epw'):
             self.epw = epw[:-4]
         else:  # the basename was passed in already
             self.epw = epw

diff --git a/epregressions/tests/resources/eplusout_base.audit b/epregressions/tests/resources/eplusout_base.audit
@@ -0,0 +1,26 @@
+   Processing Schedule Input -- Start
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
+   Processing Schedule Input -- Complete
+  MonthlyInputCount=          63
+  sizeMonthlyInput=          75
diff --git a/epregressions/tests/resources/eplusout_mod.audit b/epregressions/tests/resources/eplusout_mod.audit
@@ -0,0 +1,26 @@
+   Processing Schedule Input -- Start
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
+found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
+   Processing Schedule Input -- Complete
+  MonthlyInputCount=          63
+  sizeMonthlyInput=          75
diff --git a/epregressions/tests/test_runtests.py b/epregressions/tests/test_runtests.py
@@ -1970,10 +1970,16 @@ def test_eio_diff_with_utf8(self):
         self.assertEqual(TextDifferences.DIFFS, SuiteRunner.diff_text_files(base_eio, mod_eio, diff_file))
 
     def test_err_diff_equal_with_ignored_differences(self):
-        base_eio = os.path.join(self.resources, 'eplusout_base.err')
-        mod_eio = os.path.join(self.resources, 'eplusout_mod.err')
+        base_err = os.path.join(self.resources, 'eplusout_base.err')
+        mod_err = os.path.join(self.resources, 'eplusout_mod.err')
         diff_file = os.path.join(self.temp_base_build_dir, 'err.diff')
-        self.assertEqual(TextDifferences.EQUAL, SuiteRunner.diff_text_files(base_eio, mod_eio, diff_file))
+        self.assertEqual(TextDifferences.EQUAL, SuiteRunner.diff_text_files(base_err, mod_err, diff_file))
+
+    def test_audit_diff_equal_with_ignored_differences(self):
+        base_audit = os.path.join(self.resources, 'eplusout_base.audit')
+        mod_audit = os.path.join(self.resources, 'eplusout_mod.audit')
+        diff_file = os.path.join(self.temp_base_build_dir, 'err.audit')
+        self.assertEqual(TextDifferences.EQUAL, SuiteRunner.diff_text_files(base_audit, mod_audit, diff_file))
 
     def test_glhe_diff(self):
         base_glhe = os.path.join(self.resources, 'eplusout_base.glhe')

diff --git a/epregressions/tk_window.py b/epregressions/tk_window.py
@@ -10,6 +10,7 @@
 from time import sleep
 from tkinter import (
     Tk, ttk,  # Core pieces
+    PhotoImage,  # for taskbar icon
     Button, Frame, Label, LabelFrame, Listbox, Menu, OptionMenu, Scrollbar, Spinbox,  # Widgets
     StringVar,  # Special Types
     messagebox,  # Dialog boxes
@@ -81,9 +82,13 @@ class PubSubMessageTypes:
 class MyApp(Frame):
 
     def __init__(self):
-        self.root = Tk()
+        self.root = Tk(className='eplus_regression_runner')
         Frame.__init__(self, self.root)
 
+        # add the taskbar icon
+        img = PhotoImage(file=os.path.join(os.path.dirname(os.path.abspath(__file__)), 'ep.png'))
+        self.root.iconphoto(False, img)
+
         # high level GUI configuration
         self.root.geometry('1000x600')
         self.root.resizable(width=1, height=1)