X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ProgressBar.cpp;h=916fb13985cc4d9bb7a7fa075703ad010c316eb9;hb=33f29d762e4410026a85521f05b7b66aa2d087d1;hp=4b965c8b75233e01171837cff13d4e921f7f517a;hpb=867aa572372bf901975516db0fa77630754a8c27;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp
index 4b965c8..916fb13 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.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.
@@ -17,10 +17,7 @@
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali/devel-api/actors/actor-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -126,10 +123,10 @@ int UtcDaliProgressBarSignals(void)
   // Create the ProgressBar actor
   ProgressBar progressBar = ProgressBar::New();
   Stage::GetCurrent().Add( progressBar );
-  progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
-  progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT);
-  progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
-  progressBar.SetPosition( 0.0f, 0.0f );
+  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
+  progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
   progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
 
   progressBar.SetProperty(ProgressBar::Property::PROGRESS_VALUE, 0.2f);
@@ -156,10 +153,10 @@ int UtcDaliProgressBarSetPropertyP(void)
   tet_infoline( "UtcDaliProgressBarSetPropertyP" );
 
   ProgressBar progressBar = ProgressBar::New();
-  progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
-  progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT);
-  progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
-  progressBar.SetPosition( 0.0f, 0.0f );
+  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
+  progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
   progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
   Stage::GetCurrent().Add(progressBar);
   application.SendNotification();
@@ -249,7 +246,7 @@ int UtcDaliProgressBarSetPropertyP(void)
   DALI_TEST_EQUALS( textString, std::string( "test1" ), TEST_LOCATION );
 
   Property::Map textVisualMap2;
-  textVisualMap2.Insert( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT );
+  textVisualMap2.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT );
   textVisualMap2.Insert( Toolkit::TextVisual::Property::TEXT, "test2" );
   textVisualMap2.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 12.0f );
   progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, textVisualMap2);
@@ -303,10 +300,10 @@ int UtcDaliProgressBarSetPropertyP1(void)
   tet_infoline( "UtcDaliProgressBarSetPropertyP1" );
 
   ProgressBar progressBar = ProgressBar::New();
-  progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
-  progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT);
-  progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
-  progressBar.SetPosition( 0.0f, 0.0f );
+  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
+  progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
   progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
 
   Stage::GetCurrent().Add(progressBar);
@@ -376,9 +373,9 @@ int UtcDaliProgressBarSetPropertyP2(void)
   tet_infoline( "UtcDaliProgressBarSetPropertyP2" );
 
   ProgressBar progressBar = ProgressBar::New();
-  progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
-  progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT);
-  progressBar.SetPosition( 0.0f, 0.0f );
+  progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
+  progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
   progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, "test");
   progressBar.SetProperty(ProgressBar::Property::INDETERMINATE, true);
   progressBar.SetProperty(ProgressBar::Property::TRACK_VISUAL, trackImage);
@@ -398,7 +395,7 @@ int UtcDaliProgressBarSetPropertyP2(void)
   progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VALUE, 0.3f);
 
   progressBar.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-  progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
+  progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
   Stage::GetCurrent().Add(progressBar);
   application.SendNotification();
   application.Render();