From bbf02ebfad83092cb6fb733ae8b8b3efd21eda90 Mon Sep 17 00:00:00 2001 From: Joe Robertson Date: Wed, 5 Jun 2024 11:00:09 -0700 Subject: [PATCH] Update epw filenames and fix test. --- resources/CMakeLists.txt | 2 +- .../{AMY2012-noleapday.epw => leapday-test-noleapday.epw} | 0 src/utilities/filetypes/test/EpwFile_GTest.cpp | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) rename resources/utilities/Filetypes/{AMY2012-noleapday.epw => leapday-test-noleapday.epw} (100%) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index f3ad4f6df5..3e54315693 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -47,7 +47,7 @@ set(utilities_resources_src utilities/Filetypes/TDV_2008_kBtu_CZ13.csv utilities/Filetypes/TUN_Tunis.607150_IWEC.epw utilities/Filetypes/leapday-test.epw - utilities/Filetypes/AMY2012-noleapday.epw + utilities/Filetypes/leapday-test-noleapday.epw utilities/Filetypes/min.osw utilities/Filetypes/full.osw utilities/Filetypes/test_csv.csv diff --git a/resources/utilities/Filetypes/AMY2012-noleapday.epw b/resources/utilities/Filetypes/leapday-test-noleapday.epw similarity index 100% rename from resources/utilities/Filetypes/AMY2012-noleapday.epw rename to resources/utilities/Filetypes/leapday-test-noleapday.epw diff --git a/src/utilities/filetypes/test/EpwFile_GTest.cpp b/src/utilities/filetypes/test/EpwFile_GTest.cpp index b5c8e18bb8..98afc8f826 100644 --- a/src/utilities/filetypes/test/EpwFile_GTest.cpp +++ b/src/utilities/filetypes/test/EpwFile_GTest.cpp @@ -528,7 +528,7 @@ TEST(Filetypes, EpwFile_LeapTimeSeries_AMYNoLeapDay) { // Tests for #5214 try { - path p = resourcesPath() / toPath("utilities/Filetypes/AMY2012-noleapday.epw"); + path p = resourcesPath() / toPath("utilities/Filetypes/leapday-test-noleapday.epw"); EpwFile epwFile(p); boost::optional _t; ASSERT_NO_THROW(_t = epwFile.getTimeSeries("Dry Bulb Temperature")); @@ -567,6 +567,7 @@ TEST(Filetypes, EpwFile_LeapTimeSeries_TMYLeapFebLeapDay) { } catch (...) { ASSERT_TRUE(true); } +} TEST(Filetypes, EpwFile_NonActualTimeSeries) { try {