Skip to content

Commit

Permalink
Fixing build error
Browse files Browse the repository at this point in the history
  • Loading branch information
axelstudios committed Jan 2, 2015
1 parent 2f063d7 commit f6ccda5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
30 changes: 15 additions & 15 deletions openstudiocore/src/model/test/MasslessOpaqueMaterial_GTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,30 +107,30 @@ TEST_F(ModelFixture, MasslessOpaqueMaterial_StandardsInformation)
MasslessOpaqueMaterial masslessOpaqueMaterial(model);
StandardsInformationMaterial info = masslessOpaqueMaterial.standardsInformation();

EXPECT_LT(0, info.suggestedCompositeFramingMaterials().size());
EXPECT_LT(0, info.suggestedCompositeFramingConfigurations().size());
EXPECT_LT(0, info.suggestedCompositeFramingDepths().size());
EXPECT_LT(0, info.suggestedCompositeFramingSizes().size());
EXPECT_LT(0, info.suggestedCompositeCavityInsulations().size());
EXPECT_LT(0u, info.suggestedCompositeFramingMaterials().size());
EXPECT_LT(0u, info.suggestedCompositeFramingConfigurations().size());
EXPECT_LT(0u, info.suggestedCompositeFramingDepths().size());
EXPECT_LT(0u, info.suggestedCompositeFramingSizes().size());
EXPECT_LT(0u, info.suggestedCompositeCavityInsulations().size());

info.setMaterialStandard("CEC Title24-2013");
ASSERT_TRUE(info.materialStandard());
EXPECT_EQ("CEC Title24-2013", info.materialStandard().get());

EXPECT_LT(0, info.suggestedCompositeFramingMaterials().size());
EXPECT_LT(0, info.suggestedCompositeFramingConfigurations().size());
EXPECT_LT(0, info.suggestedCompositeFramingDepths().size());
EXPECT_LT(0, info.suggestedCompositeFramingSizes().size());
EXPECT_LT(0, info.suggestedCompositeCavityInsulations().size());
EXPECT_LT(0u, info.suggestedCompositeFramingMaterials().size());
EXPECT_LT(0u, info.suggestedCompositeFramingConfigurations().size());
EXPECT_LT(0u, info.suggestedCompositeFramingDepths().size());
EXPECT_LT(0u, info.suggestedCompositeFramingSizes().size());
EXPECT_LT(0u, info.suggestedCompositeCavityInsulations().size());

info.setMaterialStandard("Non-Existent Standard");
ASSERT_TRUE(info.materialStandard());
EXPECT_EQ("Non-Existent Standard", info.materialStandard().get());

EXPECT_EQ(0, info.suggestedCompositeFramingMaterials().size());
EXPECT_EQ(0, info.suggestedCompositeFramingConfigurations().size());
EXPECT_EQ(0, info.suggestedCompositeFramingDepths().size());
EXPECT_EQ(0, info.suggestedCompositeFramingSizes().size());
EXPECT_EQ(0, info.suggestedCompositeCavityInsulations().size());
EXPECT_EQ(0u, info.suggestedCompositeFramingMaterials().size());
EXPECT_EQ(0u, info.suggestedCompositeFramingConfigurations().size());
EXPECT_EQ(0u, info.suggestedCompositeFramingDepths().size());
EXPECT_EQ(0u, info.suggestedCompositeFramingSizes().size());
EXPECT_EQ(0u, info.suggestedCompositeCavityInsulations().size());
}

2 changes: 1 addition & 1 deletion openstudiocore/src/model/test/Model_GTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void checkObject(ModelObject object){
// TODO: DLM@20101102: in general this should be true but this is failing in case of asking for
// electric lighting power from a zone that does not have lights, should the model object
// be capable of providing all the potentional output variables and the currently available variables
// be capable of providing all the potential output variables and the currently available variables
// separately????
//EXPECT_TRUE(data);
if (!data) {
Expand Down

5 comments on commit f6ccda5

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2065 of 2188 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - i386-Windows-7-VisualStudio-12: OK (2170 of 2188 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - Win64-Windows-7-VisualStudio-12: OK (2173 of 2188 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-MacOS-10.9-clang: Build Failed

Build Badge Test Badge

Please sign in to comment.