X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-EffectsView.cpp;h=2cce946f7f903a2610f005db19930496024bf11a;hb=5aaba5adcf1a717e1ece3ef9c55c8912420993b5;hp=15758d50af432fc797f53aa0bc439b73c8926267;hpb=ed6731da113ef109a6cb6a68db97fafb5ecf1278;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
index 15758d5..2cce946 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <stdlib.h>
 #include <sstream>
-#include <dali/devel-api/object/handle-devel.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/effects-view/effects-view.h>
@@ -110,8 +109,8 @@ int UtcDaliEffectsViewAddRemoveDropShadow(void)
   DALI_TEST_CHECK( !actor.OnStage() );
 
 
-  view.SetParentOrigin(ParentOrigin::CENTER);
-  view.SetSize(Stage::GetCurrent().GetSize());
+  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  view.SetProperty( Actor::Property::SIZE, Stage::GetCurrent().GetSize());
   view.Add(actor);
   Stage::GetCurrent().Add(view);
 
@@ -156,7 +155,7 @@ int UtcDaliEffectsViewAddRemoveEmboss(void)
   actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
   DALI_TEST_CHECK( !actor.OnStage() );
 
-  view.SetParentOrigin(ParentOrigin::CENTER);
+  view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
 
   view.Add(actor);
   view.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
@@ -208,7 +207,7 @@ int UtcDaliEffectsViewOnStage(void)
   ToolkitTestApplication application;
 
   EffectsView view = EffectsView::New(EffectsView::EMBOSS);
-  view.SetSize(100.f, 100.f);
+  view.SetProperty( Actor::Property::SIZE, Vector2(100.f, 100.f) );
   Stage stage = Stage::GetCurrent();
   DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
 
@@ -225,7 +224,7 @@ int UtcDaliEffectsViewOffStage(void)
   ToolkitTestApplication application;
 
   EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-  view.SetSize(100.f, 100.f);
+  view.SetProperty( Actor::Property::SIZE, Vector2(100.f, 100.f) );
   Stage stage = Stage::GetCurrent();
   DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
 
@@ -360,7 +359,7 @@ int UtcDaliEffectsViewOffsetProperty(void)
   application.SendNotification();
   application.Render(static_cast<unsigned int>(durationSeconds*1000.0f) + 1u/*just beyond the animation duration*/);
 
-  value = DevelHandle::GetCurrentProperty( view, EffectsView::Property::EFFECT_OFFSET );
+  value = view.GetCurrentProperty( EffectsView::Property::EFFECT_OFFSET );
   value.Get(offsetValue);
   DALI_TEST_EQUALS( offsetValue, offsetAnimate, TEST_LOCATION );
 
@@ -395,7 +394,7 @@ int UtcDaliEffectsViewColorProperty(void)
   application.SendNotification();
   application.Render(static_cast<unsigned int>(durationSeconds*1000.0f) + 1u/*just beyond the animation duration*/);
 
-  value = DevelHandle::GetCurrentProperty( view, EffectsView::Property::EFFECT_COLOR );
+  value = view.GetCurrentProperty( EffectsView::Property::EFFECT_COLOR );
   value.Get(colorValue);
   DALI_TEST_EQUALS( colorValue, colorAnimate, TEST_LOCATION );
 
@@ -458,7 +457,7 @@ int UtcDaliEffectsViewSetRefreshOnDemandP(void)
   ToolkitTestApplication application;
 
   EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-  view.SetSize(100.f, 100.f);
+  view.SetProperty( Actor::Property::SIZE, Vector2(100.f, 100.f) );
 
   Stage stage = Stage::GetCurrent();
   stage.Add( view );
@@ -502,26 +501,26 @@ int UtcDaliEffectsViewSizeSet(void)
 
   {
     EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-    view.SetSize( 200.0f, 200.0f, 0.0f );
+    view.SetProperty( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f ) );
     stage.Add( view );
     application.SendNotification();
     application.Render();
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
   }
 
   {
     EffectsView view = EffectsView::New(EffectsView::EMBOSS);
-    view.SetSize( 200.0f, 200.0f, 0.0f );
+    view.SetProperty( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f ) );
     stage.Add( view );
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
   }
 
   {
     EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
-    view.SetSize( 200.0f, 200.0f, 0.0f );
+    view.SetProperty( Actor::Property::SIZE, Vector3( 200.0f, 200.0f, 0.0f ) );
     stage.Add( view );
     application.SendNotification();
     application.Render();
@@ -530,7 +529,7 @@ int UtcDaliEffectsViewSizeSet(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
   }
 
   END_TEST;