perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unit tests update

This commit is contained in:
Markus Gans 2018-03-14 23:56:44 +01:00
parent 61f2a4677c
commit 12aeafb3d1
4 changed files with 171 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/final/fobject.h
View File

@ -194,13 +194,6 @@ inline bool FObject::isInstanceOf (const char classname[]) const
inline bool FObject::isTimerInUpdating() const
{ return timer_modify_lock; }
//----------------------------------------------------------------------
inline void FObject::removeParent()
{
parent_obj = 0;
has_parent = false;
}
//----------------------------------------------------------------------
// Operator functions for timeval

12
src/fobject.cpp
View File

@ -134,6 +134,15 @@ bool FObject::isChild (FObject* obj) const
return false;
}
//----------------------------------------------------------------------
void FObject::removeParent()
{
if ( ! hasParent() )
return;
getParent()->delChild(this);
}
//----------------------------------------------------------------------
void FObject::addChild (FObject* obj)
{
@ -156,7 +165,8 @@ void FObject::delChild (FObject* obj)
if ( hasChildren() )
{
obj->removeParent();
obj->parent_obj = 0;
obj->has_parent = false;
children_list.remove(obj);
}
}

176
src/test/fobject-test.cpp
View File

@ -30,6 +30,25 @@
#include <final/final.h>
//----------------------------------------------------------------------
// class FObject_protected
//----------------------------------------------------------------------
#pragma pack(push)
#pragma pack(1)
class FObject_protected : public FObject
{
public:
bool event (FEvent* ev)
{
return FObject::event(ev);
}
};
#pragma pack(pop)
//----------------------------------------------------------------------
// class FObjectTest
//----------------------------------------------------------------------
@ -46,8 +65,10 @@ class FObjectTest : public CPPUNIT_NS::TestFixture
protected:
void classNameTest();
void NoArgumentTest();
void copyConstructorTest();
void assignmentTest();
void childObjectTest();
void removeParentTest();
void addTest();
void delTest();
private:
// Adds code needed to register the test suite
@ -56,8 +77,10 @@ class FObjectTest : public CPPUNIT_NS::TestFixture
// Add a methods to the test suite
CPPUNIT_TEST (classNameTest);
CPPUNIT_TEST (NoArgumentTest);
CPPUNIT_TEST (copyConstructorTest);
CPPUNIT_TEST (assignmentTest);
CPPUNIT_TEST (childObjectTest);
CPPUNIT_TEST (removeParentTest);
CPPUNIT_TEST (addTest);
CPPUNIT_TEST (delTest);
// End of test suite definition
CPPUNIT_TEST_SUITE_END();
@ -93,30 +116,147 @@ void FObjectTest::NoArgumentTest()
CPPUNIT_ASSERT ( o1.isInstanceOf("FObject") );
CPPUNIT_ASSERT ( ! o1.isTimerInUpdating() );
struct test_protected : public FObject
{
bool test_event (FEvent* ev)
{
return event(ev);
}
};
test_protected t;
FObject_protected t;
FEvent* ev = new FEvent(fc::None_Event);
CPPUNIT_ASSERT ( ! t.test_event(ev) );
CPPUNIT_ASSERT ( ! t.event(ev) );
delete ev;
}
//----------------------------------------------------------------------
void FObjectTest::copyConstructorTest()
{
void FObjectTest::childObjectTest()
{/*
* obj -> c1 -> c5 -> c6
* -> c2
* -> c3
* -> c4
*/
FObject obj;
FObject* c1 = new FObject(&obj);
FObject* c2 = new FObject(&obj);
FObject* c3 = new FObject(&obj);
FObject* c4 = new FObject(&obj);
FObject* c5 = new FObject(c1);
FObject* c6 = new FObject(c5);
CPPUNIT_ASSERT ( obj.hasChildren() );
CPPUNIT_ASSERT ( obj.getChild(0) == 0 );
CPPUNIT_ASSERT ( obj.getChild(1) != 0 );
CPPUNIT_ASSERT ( obj.numOfChildren() == 4 );
CPPUNIT_ASSERT ( obj.isChild(c1) );
CPPUNIT_ASSERT ( obj.isChild(c2) );
CPPUNIT_ASSERT ( obj.isChild(c3) );
CPPUNIT_ASSERT ( obj.isChild(c4) );
CPPUNIT_ASSERT ( obj.isChild(c5) );
CPPUNIT_ASSERT ( obj.isChild(c6) );
CPPUNIT_ASSERT ( obj.isDirectChild(c1) );
CPPUNIT_ASSERT ( obj.isDirectChild(c2) );
CPPUNIT_ASSERT ( obj.isDirectChild(c3) );
CPPUNIT_ASSERT ( obj.isDirectChild(c4) );
CPPUNIT_ASSERT ( ! obj.isDirectChild(c5) );
CPPUNIT_ASSERT ( c1->isDirectChild(c5) );
CPPUNIT_ASSERT ( ! obj.isDirectChild(c6) );
CPPUNIT_ASSERT ( ! c1->isDirectChild(c6) );
CPPUNIT_ASSERT ( c5->isDirectChild(c6) );
CPPUNIT_ASSERT ( c1->hasParent() );
CPPUNIT_ASSERT ( c1->getParent() == &obj );
CPPUNIT_ASSERT ( c1->hasChildren() );
CPPUNIT_ASSERT ( ! c2->hasChildren() );
CPPUNIT_ASSERT ( c1->getChild(0) == 0 );
CPPUNIT_ASSERT ( c1->getChild(1) != 0 );
CPPUNIT_ASSERT ( c2->getChild(1) == 0 );
CPPUNIT_ASSERT ( c1->numOfChildren() == 1 );
CPPUNIT_ASSERT ( c2->numOfChildren() == 0 );
const FObject::FObjectList& children_list2 = c1->getChildren();
CPPUNIT_ASSERT ( children_list2.begin() == c1->begin() );
CPPUNIT_ASSERT ( children_list2.begin() != c1->end() );
CPPUNIT_ASSERT ( children_list2.end() != c1->begin() );
CPPUNIT_ASSERT ( children_list2.end() == c1->end() );
CPPUNIT_ASSERT ( ! c1->isDirectChild(c1) );
CPPUNIT_ASSERT ( ! c1->isWidget() );
CPPUNIT_ASSERT ( c1->isInstanceOf("FObject") );
CPPUNIT_ASSERT ( ! c1->isTimerInUpdating() );
}
//----------------------------------------------------------------------
void FObjectTest::assignmentTest()
{
void FObjectTest::removeParentTest()
{/*
* obj -> child
*/
FObject* obj = new FObject();
FObject* child = new FObject(obj);
CPPUNIT_ASSERT ( obj->hasChildren() );
CPPUNIT_ASSERT ( obj->numOfChildren() == 1 );
CPPUNIT_ASSERT ( obj->isChild(child) );
CPPUNIT_ASSERT ( child->hasParent() );
CPPUNIT_ASSERT ( child->getParent() == obj );
child->removeParent();
CPPUNIT_ASSERT ( ! obj->hasChildren() );
CPPUNIT_ASSERT ( obj->numOfChildren() == 0 );
CPPUNIT_ASSERT ( ! obj->isChild(child) );
CPPUNIT_ASSERT ( ! child->hasParent() );
CPPUNIT_ASSERT ( child->getParent() != obj );
delete child;
delete obj; // also deletes the child object
}
//----------------------------------------------------------------------
void FObjectTest::addTest()
{/*
* obj -> child
*/
FObject* obj = new FObject();
FObject* child = new FObject();
CPPUNIT_ASSERT ( ! obj->hasChildren() );
CPPUNIT_ASSERT ( obj->numOfChildren() == 0 );
CPPUNIT_ASSERT ( ! obj->isChild(child) );
CPPUNIT_ASSERT ( ! child->hasParent() );
CPPUNIT_ASSERT ( child->getParent() != obj );
obj->addChild(child);
CPPUNIT_ASSERT ( obj->hasChildren() );
CPPUNIT_ASSERT ( obj->numOfChildren() == 1 );
CPPUNIT_ASSERT ( obj->isChild(child) );
CPPUNIT_ASSERT ( child->hasParent() );
CPPUNIT_ASSERT ( child->getParent() == obj );
delete obj; // also deletes the child object
}
//----------------------------------------------------------------------
void FObjectTest::delTest()
{/*
* obj -> child
*/
FObject* obj = new FObject();
FObject* child = new FObject(obj);
CPPUNIT_ASSERT ( obj->hasChildren() );
CPPUNIT_ASSERT ( obj->numOfChildren() == 1 );
CPPUNIT_ASSERT ( obj->isChild(child) );
CPPUNIT_ASSERT ( child->hasParent() );
CPPUNIT_ASSERT ( child->getParent() == obj );
obj->delChild(child);
CPPUNIT_ASSERT ( ! obj->hasChildren() );
CPPUNIT_ASSERT ( obj->numOfChildren() == 0 );
CPPUNIT_ASSERT ( ! obj->isChild(child) );
CPPUNIT_ASSERT ( ! child->hasParent() );
CPPUNIT_ASSERT ( child->getParent() != obj );
delete child;
delete obj;
}

4
src/test/fobject_test
View File

@ -31,13 +31,13 @@ DUALCASE=1; export DUALCASE # for MKS sh
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
relink_command="(cd /usr/local/src/guru/finalcut/src/test; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=.:/home/guru/bin:/opt/trinity/bin:/sbin:/usr/sbin/:/home/guru/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games; export PATH; g++ -g -O0 -DDEBUG -o \$progdir/\$file fobject-test.o -L../../src/.libs /usr/local/src/guru/finalcut/src/.libs/libfinal.so -L/usr/lib/x86_64-linux-gnu -lcppunit -ldl -ltermcap -lgpm -Wl,-rpath -Wl,/usr/local/src/guru/finalcut/src/.libs)"
relink_command="(cd /usr/local/src/MyProgs/finalcut/src/test; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=.:/home/guru/bin:/opt/trinity/bin:/sbin:/usr/sbin/:/home/guru/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games; export PATH; g++ -g -O0 -DDEBUG -o \$progdir/\$file fobject-test.o -L../../src/.libs /usr/local/src/MyProgs/finalcut/src/.libs/libfinal.so -L/usr/lib/x86_64-linux-gnu -lcppunit -ldl -ltermcap -lgpm -Wl,-rpath -Wl,/usr/local/src/MyProgs/finalcut/src/.libs)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
# install mode needs the following variables:
generated_by_libtool_version='2.4.2'
notinst_deplibs=' /usr/local/src/guru/finalcut/src/.libs/libfinal.la'
notinst_deplibs=' /usr/local/src/MyProgs/finalcut/src/.libs/libfinal.la'
else
# When we are sourced in execute mode, $file and $ECHO are already set.
if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then