Skip to content

Commit 0ee8b1f

Browse files
lgu1234lgu1234
committed
Merge branch 'develop' into RAFN-CheckEquipName-Issue
2 parents 29905bd + cb9e70f commit 0ee8b1f

File tree

106 files changed

+1587
-1422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1587
-1422
lines changed

‎tst/EnergyPlus/unit/AirTerminalSingleDuct.unit.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ TEST_F(EnergyPlusFixture, AirTerminalSingleDuctVAVReheat_NormalActionTest)
646646
EXPECT_EQ(1.0, state->dataSingleDuct->sd_airterminal(SysNum).MaxAirVolFlowRate);
647647
EXPECT_EQ(1.0, MassFlowRateMaxAvail);
648648
EXPECT_EQ("COIL:HEATING:ELECTRIC", state->dataSingleDuct->sd_airterminal(SysNum).ReheatComp);
649-
EXPECT_TRUE(compare_enums(Action::Normal, state->dataSingleDuct->sd_airterminal(SysNum).DamperHeatingAction));
649+
EXPECT_ENUM_EQ(Action::Normal, state->dataSingleDuct->sd_airterminal(SysNum).DamperHeatingAction);
650650
EXPECT_EQ(0.2, state->dataSingleDuct->sd_airterminal(SysNum).ZoneMinAirFracDes);
651651

652652
// set air inlet node properties

‎tst/EnergyPlus/unit/AirflowNetworkConditions.unit.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,13 @@ TEST_F(EnergyPlusFixture, AirflowNetwork_TestDefaultBehaviourOfSimulationControl
167167
EXPECT_TRUE(state->afn->control_defaulted);
168168

169169
EXPECT_EQ(state->afn->simulation_control.name, "AFNDefaultControl");
170-
EXPECT_TRUE(compare_enums(AirflowNetwork::ControlType::MultizoneWithoutDistribution, state->afn->simulation_control.type));
170+
EXPECT_ENUM_EQ(AirflowNetwork::ControlType::MultizoneWithoutDistribution, state->afn->simulation_control.type);
171171
EXPECT_EQ(state->afn->simulation_control.WPCCntr, "SURFACEAVERAGECALCULATION");
172172
EXPECT_EQ(state->afn->simulation_control.HeightOption, "OPENINGHEIGHT");
173173
EXPECT_EQ(state->afn->simulation_control.BldgType, "LOWRISE");
174174
EXPECT_EQ(state->afn->simulation_control.InitType, "ZERONODEPRESSURES");
175175
EXPECT_FALSE(state->afn->simulation_control.temperature_height_dependence);
176-
EXPECT_TRUE(compare_enums(AirflowNetwork::SimulationControl::Solver::SkylineLU, state->afn->simulation_control.solver));
176+
EXPECT_ENUM_EQ(AirflowNetwork::SimulationControl::Solver::SkylineLU, state->afn->simulation_control.solver);
177177
//// Use default values for numerical fields
178178
EXPECT_EQ(state->afn->simulation_control.maximum_iterations, 500);
179179
EXPECT_NEAR(state->afn->simulation_control.relative_convergence_tolerance, 1.0E-4, 0.00001);
@@ -270,7 +270,7 @@ TEST_F(EnergyPlusFixture, AirflowNetworkSimulationControl_DefaultSolver)
270270

271271
state->afn->get_input();
272272

273-
EXPECT_TRUE(compare_enums(AirflowNetwork::SimulationControl::Solver::SkylineLU, state->afn->simulation_control.solver));
273+
EXPECT_ENUM_EQ(AirflowNetwork::SimulationControl::Solver::SkylineLU, state->afn->simulation_control.solver);
274274

275275
state->dataHeatBal->Zone.deallocate();
276276
state->dataSurface->Surface.deallocate();
@@ -368,7 +368,7 @@ TEST_F(EnergyPlusFixture, AirflowNetworkSimulationControl_SetSolver)
368368

369369
state->afn->get_input();
370370

371-
EXPECT_TRUE(compare_enums(AirflowNetwork::SimulationControl::Solver::SkylineLU, state->afn->simulation_control.solver));
371+
EXPECT_ENUM_EQ(AirflowNetwork::SimulationControl::Solver::SkylineLU, state->afn->simulation_control.solver);
372372

373373
state->dataHeatBal->Zone.deallocate();
374374
state->dataSurface->Surface.deallocate();

‎tst/EnergyPlus/unit/AirflowNetworkHVAC.unit.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10628,12 +10628,12 @@ TEST_F(EnergyPlusFixture, AirflowNetwork_TestZoneVentingAirBoundary)
1062810628
state->dataScheduleMgr->Schedule({1, state->dataScheduleMgr->NumSchedules}));
1062910629
EXPECT_GT(GetIndex, 0);
1063010630
EXPECT_EQ(GetIndex, state->afn->MultizoneSurfaceData(1).VentingSchNum);
10631-
EXPECT_TRUE(compare_enums(state->afn->MultizoneSurfaceData(1).VentSurfCtrNum, AirflowNetwork::VentControlType::Temp));
10631+
EXPECT_ENUM_EQ(state->afn->MultizoneSurfaceData(1).VentSurfCtrNum, AirflowNetwork::VentControlType::Temp);
1063210632

1063310633
// MultizoneSurfaceData(2) is connected to an air boundary surface
1063410634
// venting schedule should be zero and venting method should be Constant
1063510635
EXPECT_EQ(0, state->afn->MultizoneSurfaceData(2).VentingSchNum);
10636-
EXPECT_TRUE(compare_enums(state->afn->MultizoneSurfaceData(2).VentSurfCtrNum, AirflowNetwork::VentControlType::Const));
10636+
EXPECT_ENUM_EQ(state->afn->MultizoneSurfaceData(2).VentSurfCtrNum, AirflowNetwork::VentControlType::Const);
1063710637
}
1063810638

1063910639
TEST_F(EnergyPlusFixture, AirflowNetwork_TestNoZoneEqpSupportZoneERV)

‎tst/EnergyPlus/unit/Autosizing/All_Simple_Sizing.unit.cc

Lines changed: 74 additions & 74 deletions
Large diffs are not rendered by default.

‎tst/EnergyPlus/unit/Autosizing/BaseClassSizing.unit.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ TEST_F(EnergyPlusFixture, BaseSizer_selectSizerOutput)
112112
Real64 autoSizedValue = thisSizer.size(*state, TempSize, errorsFound);
113113

114114
EXPECT_EQ(-1.0, autoSizedValue);
115-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, thisSizer.errorType));
115+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, thisSizer.errorType);
116116
}
117117

118118
TEST_F(EnergyPlusFixture, BaseSizer_GetCoilDesFlowT)

‎tst/EnergyPlus/unit/Autosizing/CoolingAirFlowSizing.unit.cc

Lines changed: 59 additions & 59 deletions
Large diffs are not rendered by default.

‎tst/EnergyPlus/unit/Autosizing/CoolingCapacitySizing.unit.cc

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
101101
// uninitialized sizing type
102102
Real64 sizedValue = sizer.size(*this->state, inputValue, errorsFound);
103103
EXPECT_TRUE(errorsFound);
104-
EXPECT_TRUE(compare_enums(AutoSizingResultType::ErrorType2, sizer.errorType));
104+
EXPECT_ENUM_EQ(AutoSizingResultType::ErrorType2, sizer.errorType);
105105
EXPECT_NEAR(0.0, sizedValue, 0.01); // unitialized sizing types always return 0
106106
errorsFound = false;
107107

@@ -113,7 +113,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
113113
// Test #1 - Zone Equipment, no autosizing
114114
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
115115
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
116-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
116+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
117117
EXPECT_FALSE(sizer.wasAutoSized);
118118
EXPECT_NEAR(5125.3, sizedValue, 0.01); // hard-sized value
119119
sizer.autoSizedValue = 0.0; // reset for next test
@@ -130,7 +130,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
130130
state->dataSize->ZoneEqSizing(1).DesCoolingLoad = sizedValue;
131131
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
132132
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
133-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
133+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
134134
EXPECT_FALSE(sizer.wasAutoSized);
135135
EXPECT_NEAR(5125.3, sizedValue, 0.01); // hard-sized value
136136
sizer.autoSizedValue = 0.0; // reset for next test
@@ -170,7 +170,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
170170
sizer.zoneSizingInput(1).ZoneNum = 1;
171171
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
172172
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
173-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
173+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
174174
EXPECT_TRUE(sizer.wasAutoSized);
175175
EXPECT_NEAR(4981.71, sizedValue, 0.01);
176176
EXPECT_NEAR(1.2, state->dataEnvrn->StdRhoAir, 0.01);
@@ -186,7 +186,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
186186
sizer.wasAutoSized = false;
187187
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
188188
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
189-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
189+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
190190
EXPECT_TRUE(sizer.wasAutoSized);
191191
EXPECT_NEAR(4000.0, sizedValue, 0.01);
192192
sizer.autoSizedValue = 0.0; // reset for next test
@@ -200,7 +200,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
200200
sizer.wasAutoSized = false;
201201
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::CoilWater_CoolingHXAssisted), "MyHXCoil", printFlag, routineName);
202202
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
203-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
203+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
204204
EXPECT_TRUE(sizer.wasAutoSized);
205205
EXPECT_NEAR(4268.66, sizedValue, 0.01);
206206
sizer.autoSizedValue = 0.0; // reset for next test
@@ -214,7 +214,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
214214
sizer.wasAutoSized = false;
215215
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
216216
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
217-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
217+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
218218
EXPECT_TRUE(sizer.wasAutoSized);
219219
EXPECT_NEAR(3500.0, sizedValue, 0.01);
220220
sizer.autoSizedValue = 0.0; // reset for next test
@@ -228,7 +228,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
228228
sizer.wasAutoSized = false;
229229
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::CoilDX_CoolingSingleSpeed), "MyDXCoil", printFlag, routineName);
230230
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
231-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
231+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
232232
EXPECT_TRUE(sizer.wasAutoSized);
233233
EXPECT_NEAR(4981.71, sizedValue, 0.01);
234234
sizer.autoSizedValue = 0.0; // reset for next test
@@ -242,7 +242,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
242242
sizer.wasAutoSized = false;
243243
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::CoilDX_CoolingSingleSpeed), "MyDXCoil", printFlag, routineName);
244244
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
245-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
245+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
246246
EXPECT_TRUE(sizer.wasAutoSized);
247247
EXPECT_NEAR(3899.81, sizedValue, 0.01);
248248
sizer.autoSizedValue = 0.0; // reset for next test
@@ -256,7 +256,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
256256
sizer.wasAutoSized = false;
257257
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::CoilDX_CoolingSingleSpeed), "MyDXCoil", printFlag, routineName);
258258
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
259-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
259+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
260260
EXPECT_TRUE(sizer.wasAutoSized);
261261
EXPECT_NEAR(4981.71, sizedValue, 0.01);
262262
sizer.autoSizedValue = 0.0; // reset for next test
@@ -272,7 +272,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
272272
sizer.wasAutoSized = false;
273273
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
274274
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
275-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
275+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
276276
EXPECT_FALSE(sizer.wasAutoSized);
277277
EXPECT_NEAR(5500.0, sizedValue, 0.01); // hard size value
278278
sizer.autoSizedValue = 0.0; // reset for next test
@@ -305,7 +305,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
305305
printFlag = false;
306306
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
307307
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
308-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
308+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
309309
EXPECT_FALSE(sizer.wasAutoSized);
310310
EXPECT_NEAR(2700.8, sizedValue, 0.0001); // hard-sized value
311311
sizer.autoSizedValue = 0.0; // reset for next test
@@ -332,7 +332,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
332332
printFlag = false;
333333
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
334334
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
335-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
335+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
336336
EXPECT_TRUE(sizer.wasAutoSized);
337337
EXPECT_NEAR(4981.71, sizedValue, 0.01);
338338
sizer.autoSizedValue = 0.0; // reset for next test
@@ -347,7 +347,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
347347
printFlag = false;
348348
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
349349
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
350-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
350+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
351351
EXPECT_TRUE(sizer.wasAutoSized);
352352
EXPECT_NEAR(4981.71, sizedValue, 0.01); // no change in capacity because coil is in air loop
353353
sizer.autoSizedValue = 0.0; // reset for next test
@@ -363,7 +363,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
363363
printFlag = false;
364364
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
365365
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
366-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
366+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
367367
EXPECT_TRUE(sizer.wasAutoSized);
368368
EXPECT_NEAR(4582.31, sizedValue, 0.01); // change in capacity because precool conditions mixed with return
369369
sizer.autoSizedValue = 0.0; // reset for next test
@@ -393,7 +393,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
393393
printFlag = false;
394394
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
395395
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
396-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
396+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
397397
EXPECT_TRUE(sizer.wasAutoSized);
398398
EXPECT_NEAR(4740.64, sizedValue, 0.01); // change in capacity because precool conditions mixed with return
399399
EXPECT_NEAR(158.33, sizer.primaryAirSystem(1).FanDesCoolLoad, 0.01); // air loop fan heat is saved in sizer class
@@ -413,7 +413,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
413413
printFlag = false;
414414
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
415415
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
416-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
416+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
417417
EXPECT_TRUE(sizer.wasAutoSized);
418418
EXPECT_NEAR(unScaledCapacity * 0.5, sizedValue, 0.01); // change in capacity because precool conditions mixed with return
419419
EXPECT_NEAR(158.33, sizer.primaryAirSystem(1).FanDesCoolLoad, 0.01); // air loop fan heat is saved in sizer class
@@ -432,7 +432,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
432432
printFlag = false;
433433
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
434434
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
435-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
435+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
436436
EXPECT_TRUE(sizer.wasAutoSized);
437437
EXPECT_NEAR(4500.0, sizedValue, 0.01); // capacity precalculated and saved in FinalSysSizing(1).CoolingTotalCapacity
438438
sizer.autoSizedValue = 0.0; // reset for next test
@@ -447,7 +447,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
447447
printFlag = false;
448448
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
449449
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
450-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
450+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
451451
EXPECT_TRUE(sizer.wasAutoSized);
452452
EXPECT_NEAR(3500.0, sizedValue, 0.01); // capacity precalculated and saved in FinalSysSizing(1).CoolingTotalCapacity
453453
sizer.autoSizedValue = 0.0; // reset for next test
@@ -463,7 +463,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
463463
printFlag = false;
464464
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
465465
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
466-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
466+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
467467
EXPECT_TRUE(sizer.wasAutoSized);
468468
EXPECT_NEAR(2500.0, sizedValue, 0.01); // capacity precalculated and saved in UnitarySysEqSizing(1).DesCoolingLoad
469469
sizer.autoSizedValue = 0.0; // reset for next test
@@ -481,7 +481,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
481481
printFlag = false;
482482
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
483483
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
484-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
484+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
485485
EXPECT_TRUE(sizer.wasAutoSized);
486486
EXPECT_NEAR(1500.0, sizedValue, 0.01); // capacity precalculated and saved in OASysEqSizing(1).DesCoolingLoad
487487
sizer.autoSizedValue = 0.0; // reset for next test
@@ -509,7 +509,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
509509
printFlag = false;
510510
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
511511
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
512-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
512+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
513513
EXPECT_TRUE(sizer.wasAutoSized);
514514
EXPECT_NEAR(5634.12, sizedValue, 0.01); // capacity includes system fan heat
515515
sizer.autoSizedValue = 0.0; // reset for next test
@@ -525,7 +525,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
525525
printFlag = true;
526526
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
527527
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
528-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
528+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
529529
EXPECT_FALSE(sizer.wasAutoSized);
530530
EXPECT_NEAR(4200.0, sizedValue, 0.01); // hard sized capacity
531531
sizer.autoSizedValue = 0.0; // reset for next test
@@ -561,7 +561,7 @@ TEST_F(AutoSizingFixture, CoolingCapacitySizingGauntlet)
561561
printFlag = false;
562562
sizer.initializeWithinEP(*this->state, HVAC::cAllCoilTypes(HVAC::Coil_CoolingWater), "MyWaterCoil", printFlag, routineName);
563563
sizedValue = sizer.size(*this->state, inputValue, errorsFound);
564-
EXPECT_TRUE(compare_enums(AutoSizingResultType::NoError, sizer.errorType));
564+
EXPECT_ENUM_EQ(AutoSizingResultType::NoError, sizer.errorType);
565565
EXPECT_TRUE(sizer.wasAutoSized);
566566
EXPECT_NEAR(5633.933, sizedValue, 0.01); // capacity includes system fan heat
567567
sizer.autoSizedValue = 0.0; // reset for next test

0 commit comments

Comments
 (0)