X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-AsyncImageLoader.cpp;h=7375515b1b146b64240044653acbab5c354be1c5;hb=fca202af829a0657805e44461f08f284cdbf0bbb;hp=74dcc7325cb2dd0fbb9f39c93eaf6c33f74dba4b;hpb=7386b0e7cc501917168284f388353dab660db58f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
index 74dcc73..7375515 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <dali/dali.h>
+#include <dali/devel-api/actors/actor-devel.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <toolkit-event-thread-callback.h>
 #include <dali-toolkit/dali-toolkit.h>
@@ -141,6 +142,8 @@ int UtcDaliAsyncImageLoaderAssignmentOperator(void)
 
 int UtcDaliAsyncImageLoaderDownCastP(void)
 {
+  ToolkitTestApplication application;
+
   AsyncImageLoader asyncImageLoader = AsyncImageLoader::New();
   BaseHandle object(asyncImageLoader);
 
@@ -153,6 +156,8 @@ int UtcDaliAsyncImageLoaderDownCastP(void)
 
 int UtcDaliAsyncImageLoaderDownCastN(void)
 {
+  ToolkitTestApplication application;
+
   BaseHandle unInitializedObject;
   AsyncImageLoader asyncImageLoader = AsyncImageLoader::DownCast( unInitializedObject );
 
@@ -174,12 +179,7 @@ int UtcDaliAsyncImageLoaderLoadAndLoadedSignal(void)
   uint32_t id02 = loader.Load( gImage_50_RGBA, ImageDimensions( 25, 25 ) );
   uint32_t id03 = loader.Load( gImage_128_RGB, ImageDimensions( 100, 100 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
 
-  EventThreadCallback* eventTrigger = EventThreadCallback::Get();
-  CallbackBase* callback = eventTrigger->GetCallback();
-
-  eventTrigger->WaitingForTrigger( 3 );// waiting until all three images are loaded
-
-  CallbackBase::Execute( *callback );
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
 
   application.SendNotification();
   application.Render();
@@ -205,12 +205,7 @@ int UtcDaliAsyncImageLoaderCancel(void)
   uint32_t id02 = loader.Load( gImage_50_RGBA, ImageDimensions( 25, 25 ) );
   uint32_t id03 = loader.Load( gImage_128_RGB, ImageDimensions( 100, 100 ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR, true );
 
-  EventThreadCallback* eventTrigger = EventThreadCallback::Get();
-  CallbackBase* callback = eventTrigger->GetCallback();
-
-  eventTrigger->WaitingForTrigger( 3 ); // waiting until images are loaded
-
-  CallbackBase::Execute( *callback );
+  DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION );
 
   application.SendNotification();
   application.Render();
@@ -248,4 +243,3 @@ int UtcDaliAsyncImageLoaderCancelAll(void)
 
   END_TEST;
 }
-