X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdali-test-suite-utils.cpp;h=87750e239af86b5be840dcf13c0cb1fccb161cd5;hp=b494a989c13001c7feb827149df019cf5be22c9e;hb=610495b8647d1a25c98bf0773ccc0dd6d1996263;hpb=49d793abda445643e4b3b270c10af70aed3d2f52 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp index b494a98..87750e2 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp @@ -40,6 +40,8 @@ void tet_result(int32_t value) #define END_TEST \ return ((test_return_value>0)?1:0) +extern "C" +{ void tet_infoline(const char* str) { @@ -53,6 +55,8 @@ void tet_printf(const char *format, ...) vfprintf(stderr, format, arg); va_end(arg); } +} + bool operator==(TimePeriod a, TimePeriod b) { @@ -356,17 +360,16 @@ struct ObjectDestructionFunctor bool& refObjectDestroyedBoolean; }; -ObjectDestructionTracker::ObjectDestructionTracker() - :mRefObjectDestroyed( false) +ObjectDestructionTracker::ObjectDestructionTracker( ObjectRegistry objectRegistry ) +: mObjectRegistry( objectRegistry ), + mRefObjectDestroyed( false) { } void ObjectDestructionTracker::Start( Actor actor ) { ObjectDestructionFunctor destructionFunctor( actor.GetObjectPtr(), mRefObjectDestroyed ); - - ObjectRegistry objectRegistry = Stage::GetCurrent().GetObjectRegistry(); - objectRegistry.ObjectDestroyedSignal().Connect( this, destructionFunctor ); + mObjectRegistry.ObjectDestroyedSignal().Connect( this, destructionFunctor ); } bool ObjectDestructionTracker::IsDestroyed()