OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 17:32:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#6029 Fix unsigned/signed comparison in Fwk tests.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2020-06-03 22:06:30 +02:00
1 parent 16c3ce1ca2
commit 8f5edbf5b0
2 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCoreBasicTest.cpp
+9 -9
View File
@@ -414,12 +414,12 @@ TEST(BaseTest, PdmChildArrayFieldHandle)
InheritedDemoObj* ihd1 = new InheritedDemoObj;
caf::PdmChildArrayFieldHandle* listField = &(ihd1->m_childArrayField);
EXPECT_EQ(0, listField->size());
EXPECT_EQ(0u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_TRUE(listField->empty());
listField->insertAt(0, s0);
EXPECT_EQ(1, listField->size());
EXPECT_EQ(1u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_FALSE(listField->empty());
@@ -427,17 +427,17 @@ TEST(BaseTest, PdmChildArrayFieldHandle)
ihd1->m_childArrayField.push_back(s2);
ihd1->m_childArrayField.push_back(s3);
EXPECT_EQ(4, listField->size());
EXPECT_EQ(4u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_FALSE(listField->empty());
listField->erase(0);
EXPECT_EQ(3, listField->size());
EXPECT_EQ(3u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_FALSE(listField->empty());
listField->deleteAllChildObjects();
EXPECT_EQ(0, listField->size());
EXPECT_EQ(0u, listField->size());
EXPECT_TRUE(listField->hasSameFieldCountForAllObjects());
EXPECT_TRUE(listField->empty());
}
@@ -535,7 +535,7 @@ TEST(BaseTest, PdmPtrField)
{
std::vector<caf::PdmObjectHandle*> objects;
ihd1->m_ptrField.ptrReferencedObjects(&objects);
EXPECT_EQ(1, objects.size());
EXPECT_EQ(1u, objects.size());
EXPECT_EQ(ihd2, objects[0]);
}
@@ -547,21 +547,21 @@ TEST(BaseTest, PdmPtrField)
{
std::vector<caf::PdmFieldHandle*> ptrFields;
ihd2->referringPtrFields(ptrFields);
EXPECT_EQ(1, ptrFields.size());
EXPECT_EQ(1u, ptrFields.size());
EXPECT_EQ(&(ihd1->m_ptrField), ptrFields[0]);
}
{
std::vector<caf::PdmObjectHandle*> objects;
ihd2->objectsWithReferringPtrFields(objects);
EXPECT_EQ(1, objects.size());
EXPECT_EQ(1u, objects.size());
EXPECT_EQ(ihd1, objects[0]);
}
{
std::vector<InheritedDemoObj*> reffingDemoObjects;
ihd2->objectsWithReferringPtrFieldsOfType(reffingDemoObjects);
EXPECT_EQ(1, reffingDemoObjects.size());
EXPECT_EQ(1u, reffingDemoObjects.size());
}
delete ihd1;
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp
+2 -2
View File
@@ -327,7 +327,7 @@ TEST(BaseTest, ChildArrayFieldSerializing)
{
InheritedDemoObj* ihd1 = new InheritedDemoObj;
ASSERT_EQ(0, ihd1->m_childArrayField.size());
ASSERT_EQ(0u, ihd1->m_childArrayField.size());
QXmlStreamReader xmlStream(serializedString);
@@ -385,7 +385,7 @@ TEST(BaseTest, FilePathSerializing)
ihd1->readObjectFromXmlString(serializedString, caf::PdmDefaultObjectFactory::instance());
EXPECT_EQ(2, ihd1->m_multipleFilePath.v().size());
EXPECT_EQ(2u, ihd1->m_multipleFilePath.v().size());
EXPECT_EQ(newVal.toStdString(), ihd1->m_singleFilePath().path().toStdString());
delete ihd1;