From 3ea13232988a164418448d9bb353ab3a231c41e1 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Wed, 18 Nov 2015 17:12:37 +0900 Subject: [PATCH] Fix UTC prevent issue Change-Id: Ibbc41bd7ef9a5bbb9138bf68ffff8e8506340a3b --- automated-tests/src/dali-toolkit/utc-Dali-Control.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp index 93311ed..9f220de 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp @@ -300,7 +300,12 @@ int UtcDaliControlSignalConnectDisconnect(void) DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION ); Toolkit::Internal::Control& control = Toolkit::Internal::GetImplementation( dummy ); DummyControlImpl* dummyImpl = dynamic_cast(&control); - DALI_TEST_CHECK( dummyImpl ); + + if( dummyImpl == NULL ) + { + tet_result( TET_FAIL ); + END_TEST; + } actor.OnStageSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 ); DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 1u, TEST_LOCATION ); @@ -329,7 +334,12 @@ int UtcDaliControlSignalAutomaticDisconnect(void) DummyControl dummy = DummyControlImpl::New(); Toolkit::Internal::Control& control = Toolkit::Internal::GetImplementation( dummy ); DummyControlImpl* dummyImpl = dynamic_cast(&control); - DALI_TEST_CHECK( dummyImpl ); + + if( dummyImpl == NULL ) + { + tet_result( TET_FAIL ); + END_TEST; + } actor.OnStageSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 ); DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 1u, TEST_LOCATION ); -- 2.7.4