From c0123138104701ffba37210be711618479f43358 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Fri, 29 Sep 2023 11:57:09 +0200 Subject: [PATCH] Remove workaround in SqlFile test (thanks past me to have put that in there!) --- src/utilities/sql/Test/SqlFile_GTest.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/utilities/sql/Test/SqlFile_GTest.cpp b/src/utilities/sql/Test/SqlFile_GTest.cpp index f7f1799a2c8..dff4f800657 100644 --- a/src/utilities/sql/Test/SqlFile_GTest.cpp +++ b/src/utilities/sql/Test/SqlFile_GTest.cpp @@ -75,15 +75,10 @@ TEST_F(SqlFileFixture, FuelTypes) { EXPECT_NEAR(409.97, *(sqlFile3.districtCoolingTotalEndUses()), 2); EXPECT_NEAR(378.43, *(sqlFile3.districtHeatingWaterExteriorEquipment()), 2); EXPECT_NEAR(378.43, *(sqlFile3.districtHeatingWaterTotalEndUses()), 2); - if (energyPlusBuildSHA() == "c854ba6bfe") { - GTEST_SKIP() << "\nFIXME: Skip the checks for DistrictHeatingSteam pending new E+ package after https://github.com/NREL/EnergyPlus/pull/10212\n"; - } else { - EXPECT_TRUE(false) << "Please come remove the special check now that a new E+ package is out"; - EXPECT_NEAR(346.90, *(sqlFile3.districtHeatingSteamExteriorEquipment()), 2); - EXPECT_NEAR(346.90, *(sqlFile3.districtHeatingSteamTotalEndUses()), 2); - EXPECT_NEAR(725.33, *(sqlFile3.districtHeatingExteriorEquipment()), 2); - EXPECT_NEAR(725.33, *(sqlFile3.districtHeatingTotalEndUses()), 2); - } + EXPECT_NEAR(346.90, *(sqlFile3.districtHeatingSteamExteriorEquipment()), 2); + EXPECT_NEAR(346.90, *(sqlFile3.districtHeatingSteamTotalEndUses()), 2); + EXPECT_NEAR(725.33, *(sqlFile3.districtHeatingExteriorEquipment()), 2); + EXPECT_NEAR(725.33, *(sqlFile3.districtHeatingTotalEndUses()), 2); } TEST_F(SqlFileFixture, EnvPeriods) {