OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6029 Update test helper to new gtest version.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-06-03 19:16:56 +02:00
parent 2eb18d8151
commit 16c3ce1ca2
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp
View File

@ -463,9 +463,8 @@ TEST(BaseTest, PdmChildArrayField)
} }
#endif #endif
template <> void PrintTo(const QString& val, std::ostream* os) {
inline void GTestStreamToHelper<QString>(std::ostream* os, const QString& val) { *os << val.toLatin1().data();
*os << val.toLatin1().data();
} }
@ -889,12 +888,12 @@ TEST(BaseTest, PdmChildArrayFieldHandle)
InheritedDemoObj* ihd1 = new InheritedDemoObj; InheritedDemoObj* ihd1 = new InheritedDemoObj;
caf::PdmChildArrayFieldHandle* listField = &(ihd1->m_simpleObjectsField); caf::PdmChildArrayFieldHandle* listField = &(ihd1->m_simpleObjectsField);
EXPECT_EQ(0, listField->size()); EXPECT_EQ(0u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects()); EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_TRUE(listField->empty()); EXPECT_TRUE(listField->empty());
ihd1->m_simpleObjectsField.push_back(new SimpleObj); ihd1->m_simpleObjectsField.push_back(new SimpleObj);
EXPECT_EQ(1, listField->size()); EXPECT_EQ(1u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects()); EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_FALSE(listField->empty()); EXPECT_FALSE(listField->empty());
@ -902,17 +901,17 @@ TEST(BaseTest, PdmChildArrayFieldHandle)
ihd1->m_simpleObjectsField.push_back(s2); ihd1->m_simpleObjectsField.push_back(s2);
ihd1->m_simpleObjectsField.push_back(s3); ihd1->m_simpleObjectsField.push_back(s3);
EXPECT_EQ(4, listField->size()); EXPECT_EQ(4u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects()); EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_FALSE(listField->empty()); EXPECT_FALSE(listField->empty());
listField->erase(0); listField->erase(0);
EXPECT_EQ(3, listField->size()); EXPECT_EQ(3u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects()); EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_FALSE(listField->empty()); EXPECT_FALSE(listField->empty());
listField->deleteAllChildObjects(); listField->deleteAllChildObjects();
EXPECT_EQ(0, listField->size()); EXPECT_EQ(0u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects()); EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_TRUE(listField->empty()); EXPECT_TRUE(listField->empty());