Skip to content

Commit

Permalink
Fix Namespace change in new unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
Myoldmopar committed Oct 30, 2023
1 parent 5586547 commit 557ac55
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tst/EnergyPlus/unit/OutputProcessor.unit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6110,13 +6110,13 @@ namespace OutputProcessor {
EXPECT_EQ(1, state->dataOutputProcessor->EndUseCategory(2).NumSubcategories);
EXPECT_EQ("General", state->dataOutputProcessor->EndUseCategory(2).SubcategoryName(1));

found = UtilityRoutines::FindItem("Cooling:Electricity", state->dataOutputProcessor->EnergyMeters);
found = Util::FindItem("Cooling:Electricity", state->dataOutputProcessor->EnergyMeters);
EXPECT_NE(0, found);
EXPECT_EQ("Electricity", state->dataOutputProcessor->EnergyMeters(found).ResourceType);
EXPECT_EQ("Cooling", state->dataOutputProcessor->EnergyMeters(found).EndUse);
EXPECT_EQ("", state->dataOutputProcessor->EnergyMeters(found).EndUseSub);

found = UtilityRoutines::FindItem("General:Cooling:Electricity", state->dataOutputProcessor->EnergyMeters);
found = Util::FindItem("General:Cooling:Electricity", state->dataOutputProcessor->EnergyMeters);
EXPECT_NE(0, found);
EXPECT_EQ("Electricity", state->dataOutputProcessor->EnergyMeters(found).ResourceType);
EXPECT_EQ("Cooling", state->dataOutputProcessor->EnergyMeters(found).EndUse);
Expand All @@ -6127,24 +6127,24 @@ namespace OutputProcessor {
EXPECT_EQ(1, state->dataOutputProcessor->EndUseCategory(3).NumSubcategories); // lighting end use
EXPECT_EQ("RailroadCrossing", state->dataOutputProcessor->EndUseCategory(3).SubcategoryName(1));

found = UtilityRoutines::FindItem("InteriorLights:Electricity", state->dataOutputProcessor->EnergyMeters);
found = Util::FindItem("InteriorLights:Electricity", state->dataOutputProcessor->EnergyMeters);
EXPECT_NE(0, found);
EXPECT_EQ("Electricity", state->dataOutputProcessor->EnergyMeters(found).ResourceType);
EXPECT_EQ("InteriorLights", state->dataOutputProcessor->EnergyMeters(found).EndUse);
EXPECT_EQ("", state->dataOutputProcessor->EnergyMeters(found).EndUseSub);

found = UtilityRoutines::FindItem("General:InteriorLights:Electricity", state->dataOutputProcessor->EnergyMeters);
found = Util::FindItem("General:InteriorLights:Electricity", state->dataOutputProcessor->EnergyMeters);
EXPECT_EQ(0, found); // should not find this

found = UtilityRoutines::FindItem("RailroadCrossing:InteriorLights:Electricity", state->dataOutputProcessor->EnergyMeters);
found = Util::FindItem("RailroadCrossing:InteriorLights:Electricity", state->dataOutputProcessor->EnergyMeters);
EXPECT_NE(0, found);
EXPECT_EQ("Electricity", state->dataOutputProcessor->EnergyMeters(found).ResourceType);
EXPECT_EQ("InteriorLights", state->dataOutputProcessor->EnergyMeters(found).EndUse);
EXPECT_EQ("RailroadCrossing", state->dataOutputProcessor->EnergyMeters(found).EndUseSub);

// fuel oil CO2 emissions
// testing a non-ABUPS end use with no sub end use specified
found = UtilityRoutines::FindItem("FuelOilNo2Emissions:CO2", state->dataOutputProcessor->EnergyMeters);
found = Util::FindItem("FuelOilNo2Emissions:CO2", state->dataOutputProcessor->EnergyMeters);
EXPECT_NE(0, found);
EXPECT_EQ("CO2", state->dataOutputProcessor->EnergyMeters(found).ResourceType);
EXPECT_EQ("FuelOilNo2Emissions", state->dataOutputProcessor->EnergyMeters(found).EndUse);
Expand Down

0 comments on commit 557ac55

Please sign in to comment.