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

Improved unit test so they run correctly in debug

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-06 15:40:51 +01:00
parent 0428dbffa3
commit a5ed533c00
3 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp
View File

@ -58,7 +58,8 @@ class ContainerObj : public caf::PdmObjectHandle
public: public:
ContainerObj() : PdmObjectHandle() ContainerObj() : PdmObjectHandle()
{ {
this->addField(&derivedObjs, "derivedObjs"); this->addField(&derivedObjs, "derivedObjs");
this->addField(&derivedOtherObjs, "derivedOtherObjs");
} }
~ContainerObj() ~ContainerObj()

17
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCoreBasicTest.cpp
View File

@ -209,10 +209,15 @@ TEST(BaseTest, TestPdmValueFieldInterface)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
TEST(BaseTest, NormalPdmField) TEST(BaseTest, NormalPdmField)
{ {
class A class A : public caf::PdmObjectHandle
{ {
public: public:
A(const std::vector<double>& testValue) : field2(testValue), field3(field2) {} A(const std::vector<double>& testValue) : field2(testValue), field3(field2)
{
this->addField(&field1, "field1");
this->addField(&field2, "field2");
this->addField(&field3, "field3");
}
caf::PdmDataValueField<std::vector<double> > field1; caf::PdmDataValueField<std::vector<double> > field1;
caf::PdmDataValueField<std::vector<double> > field2; caf::PdmDataValueField<std::vector<double> > field2;
@ -432,9 +437,13 @@ TEST(BaseTest, PdmChildArrayFieldHandle)
TEST(BaseTest, PdmChildField) TEST(BaseTest, PdmChildField)
{ {
class A { class A : public caf::PdmObjectHandle
{
public: public:
A(Child* a) :field2(a) {} A(Child* a) :field2(a)
{
this->addField(&field2, "field2");
}
~A() ~A()
{ {

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

@ -279,6 +279,22 @@ TEST(BaseTest, Start)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
TEST(BaseTest, NormalPdmField) TEST(BaseTest, NormalPdmField)
{ {
class ObjectWithVectors : public caf::PdmObjectHandle
{
public:
ObjectWithVectors()
{
this->addField(&field1, "field1");
this->addField(&field2, "field2");
this->addField(&field3, "field3");
}
caf::PdmField<std::vector<double> > field1;
caf::PdmField<std::vector<double> > field2;
caf::PdmField<std::vector<double> > field3;
};
std::vector<double> testValue; std::vector<double> testValue;
testValue.push_back(1.1); testValue.push_back(1.1);
testValue.push_back(1.2); testValue.push_back(1.2);
@ -289,22 +305,24 @@ TEST(BaseTest, NormalPdmField)
testValue2.push_back(2.2); testValue2.push_back(2.2);
testValue2.push_back(2.3); testValue2.push_back(2.3);
ObjectWithVectors myObj;
// Constructors // Constructors
caf::PdmField<std::vector<double> > field2(testValue); myObj.field2 = testValue;
EXPECT_EQ(1.3, field2.v()[2]); EXPECT_EQ(1.3, myObj.field2.v()[2]);
caf::PdmField<std::vector<double> > field3(field2);
EXPECT_EQ(1.3, field3.v()[2]); myObj.field3 = myObj.field2;
caf::PdmField<std::vector<double> > field1; EXPECT_EQ(1.3, myObj.field3.v()[2]);
EXPECT_EQ(size_t(0), field1().size()); EXPECT_EQ(size_t(0), myObj.field1().size());
// Operators // Operators
EXPECT_FALSE(field1 == field3); EXPECT_FALSE(myObj.field1 == myObj.field3);
field1 = field2; myObj.field1 = myObj.field2;
EXPECT_EQ(1.3, field1()[2]); EXPECT_EQ(1.3, myObj.field1()[2]);
field1 = testValue2; myObj.field1 = testValue2;
EXPECT_EQ(2.3, field1()[2]); EXPECT_EQ(2.3, myObj.field1()[2]);
field3 = field1; myObj.field3 = myObj.field1;
EXPECT_TRUE(field1 == field3); EXPECT_TRUE(myObj.field1 == myObj.field3);
} }
#if 0 #if 0