X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-BubbleEmitter.cpp;h=1b15e74f7fc4d3fe9de0e8e23e9bacc452fc1ddc;hb=65fe4d97a7a58199b2f5ad2d84e26acbb2b6ae39;hp=a4575fc84788e1cbf1622c19d46ebd4bcd1a9ec2;hpb=8d7a2d639ced5d2eb3ce4321653ad4d8b55b0b95;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
index a4575fc..1b15e74 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -198,9 +198,9 @@ int UtcDaliBubbleEmitterSetBubbleScale(void)
   DALI_TEST_CHECK(emitter);
   Actor root = emitter.GetRootActor();
   Stage::GetCurrent().Add( root );
-  root.SetPosition( Vector3::ZERO );
-  root.SetParentOrigin( ParentOrigin::CENTER );
-  root.SetAnchorPoint( AnchorPoint::CENTER );
+  root.SetProperty( Actor::Property::POSITION, Vector3::ZERO );
+  root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
 
@@ -288,20 +288,24 @@ int UtcDaliBubbleEmitterEmitBubble(void)
   (bubbleRenderer.GetProperty(propertyIndex1)).Get( value1 );
   DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
   DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
+  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
+  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
+  DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
+  DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
 
   animation.Play();
 
   Wait(application, 300);
   propertyIndex0 = bubbleRenderer.GetPropertyIndex( "uPercentage[0]" );
   propertyIndex1 = bubbleRenderer.GetPropertyIndex( "uPercentage[1]" );
-  (bubbleRenderer.GetProperty(propertyIndex0)).Get( value0 );
-  (bubbleRenderer.GetProperty(propertyIndex1)).Get( value1 );
+  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
+  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
   DALI_TEST_CHECK( value0 >= 0.6f );
   DALI_TEST_CHECK( value1 >= 0.6f );
 
   Wait(application,500);
-  (bubbleRenderer.GetProperty(propertyIndex0)).Get( value0 );
-  (bubbleRenderer.GetProperty(propertyIndex1)).Get( value1 );
+  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
+  ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
   DALI_TEST_EQUALS(value0, 1.f, TEST_LOCATION );
   DALI_TEST_EQUALS(value1, 1.f, TEST_LOCATION );
   END_TEST;
@@ -317,9 +321,9 @@ int UtcDaliBubbleEmitterRestore(void)
   BubbleEmitter emitter = BubbleEmitter::New( movementArea,shapeImage, 90, Vector2( 5.f, 10.f ));
   Actor root = emitter.GetRootActor();
   Stage::GetCurrent().Add( root );
-  root.SetPosition( Vector3::ZERO );
-  root.SetParentOrigin( ParentOrigin::CENTER );
-  root.SetAnchorPoint( AnchorPoint::CENTER );
+  root.SetProperty( Actor::Property::POSITION, Vector3::ZERO );
+  root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
 
   Renderer renderer = root.GetRendererAt( 0 );
   DALI_TEST_CHECK( renderer );