Fix C API Tests

ep_testing/config.py

@@ -1,9 +1,24 @@
+import os
+from tempfile import mkdtemp
+
+
 class TestConfiguration:
-    THIS_VERSION = '9.3'
-    TAG_THIS_VERSION = 'v9.3.0-RC2'
-    LAST_VERSION = '9.2'
-    TAG_LAST_VERSION = 'v9.2.0'
-
-    # If this is turned on, it expects to find an asset named target_file_name in the download_dir
-    SKIP_DOWNLOAD = False
-    SKIPPED_DOWNLOAD_DIR = '/tmp/'
+
+    def __init__(self):
+        self.this_version = '9.3'
+        self.tag_this_version = 'v9.3.0-RC2'
+        self.last_version = '9.2'
+        self.tag_last_version = 'v9.2.0'
+
+        # If this is turned on, it expects to find an asset named target_file_name in the download_dir
+        self.skip_download = True
+        self.skipped_download_dir = '/tmp/'
+
+        # But if we are on Travis, we override it to always download a new asset
+        if os.environ.get('TRAVIS', None) is not None:
+            self.skip_download = False
+
+        if self.skip_download:
+            self.download_dir = self.skipped_download_dir
+        else:
+            self.download_dir = mkdtemp()

ep_testing/downloader.py

@@ -15,9 +15,9 @@ class Downloader:
     Release_url = 'https://api.github.com/repos/NREL/EnergyPlus/releases'
     User_url = 'https://api.github.com/user'
 
-    def __init__(self, config: TestConfiguration, download_dir: str, announce: callable = None):
-        self.release_tag = config.TAG_THIS_VERSION
-        self.download_dir = download_dir
+    def __init__(self, config: TestConfiguration, announce: callable = None):
+        self.release_tag = config.tag_this_version
+        self.download_dir = config.download_dir
         self.announce = announce  # hijacking this instance method is mildly dangerous, like 1/5 danger stars
         github_token = os.environ.get('GITHUB_TOKEN', None)
         if github_token is None:
@@ -29,7 +29,7 @@ def __init__(self, config: TestConfiguration, download_dir: str, announce: calla
         self._my_print('Executing download operations as Github user: ' + user_response.json()['login'])
         this_platform = platform.system()
         extract_dir_name = 'ep_package'
-        self.extract_path = os.path.join(download_dir, extract_dir_name)
+        self.extract_path = os.path.join(config.download_dir, extract_dir_name)
         if this_platform == 'Linux':
             self.asset_pattern = 'Linux-x86_64.tar.gz'
             target_file_name = 'ep.tar.gz'
@@ -50,8 +50,8 @@ def __init__(self, config: TestConfiguration, download_dir: str, announce: calla
         releases = self._get_all_packages()
         matching_release = self._find_matching_release(releases)
         asset = self._find_matching_asset_for_release(matching_release)
-        self.download_path = os.path.join(download_dir, target_file_name)
-        if config.SKIP_DOWNLOAD:
+        self.download_path = os.path.join(config.download_dir, target_file_name)
+        if config.skip_download:
             if not os.path.exists(self.download_path):
                 raise EPTestingException('Download skipped, but package not available at ' + self.download_path)
         else:

ep_testing/tester.py

@@ -2,7 +2,7 @@
 from platform import system
 
 from ep_testing.config import TestConfiguration
-from ep_testing.tests.api import TestPythonAPIAccess, TestCAPIAccess
+from ep_testing.tests.api import TestPythonAPIAccess, TestCAPIAccess, TestCppAPIDelayedAccess
 from ep_testing.tests.documentation import TestVersionInfoInDocumentation
 from ep_testing.tests.energyplus import TestPlainDDRunEPlusFile
 from ep_testing.tests.expand_objects import TestExpandObjectsAndRun
@@ -29,20 +29,28 @@ def run(self):
                 self.install_path, {'test_file': 'HVACTemplate-5ZoneFanCoil.idf'}
             )
             TransitionOldFile().run(
-                self.install_path, {'last_version': self.config.TAG_LAST_VERSION}
+                self.install_path, {'last_version': self.config.tag_last_version}
+            )
+            # to use the DLL at link-time, Windows requires the lib file, so just build this on Mac/Linux
+            if system() == 'Linux' or system() == 'Darwin':  # windows needs lib or def
+                TestCAPIAccess().run(
+                    self.install_path, {}
+                )
+            else:
+                print("Building against the DLL at link time on Linux/Mac ONLY until we get a .lib file")
+            # however, linking at run-time works just fine on all three platforms
+            TestCppAPIDelayedAccess().run(
+                self.install_path, {}
             )
             if system() == 'Linux':
                 TestVersionInfoInDocumentation().run(
-                    self.install_path, {'pdf_file': 'AuxiliaryPrograms.pdf', 'version_string': self.config.THIS_VERSION}
+                    self.install_path, {'pdf_file': 'AuxiliaryPrograms.pdf', 'version_string': self.config.this_version}
                 )
                 TestPythonAPIAccess().run(
                     self.install_path, {}
                 )
-                TestCAPIAccess().run(
-                    self.install_path, {}
-                )
             else:
-                print("Skipping API and Doc stuff on Linux FOR NOW!!!!")
+                print("Running Python API and Doc stuff on Linux ONLY FOR NOW!!!!")
         except Exception:
             raise
         finally: