Further Setter/Getter public API removal from Dali::Actor

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-ToolBar.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
index 3bb7da1..cbcac4b 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.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.
@@ -43,7 +43,7 @@ Actor CreateColorActor( const Vector4& color )
 
   VisualFactory factory = VisualFactory::Get();
   Dali::Property::Map map;
-  map[ Visual::Property::TYPE ] = Visual::COLOR;
+  map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
   map[ ColorVisual::Property::MIX_COLOR ] = color;
   Visual::Base colorVisual = factory.CreateVisual( map );
   dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, colorVisual );
@@ -93,7 +93,7 @@ int UtcDaliToolBarNew(void)
   DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
 
   Actor actor = toolbar;
-  toolbar == ToolBar::DownCast( actor );
+  toolbar = ToolBar::DownCast( actor );
 
   DALI_TEST_CHECK( toolbar );
   END_TEST;
@@ -107,18 +107,18 @@ int UtcDaliToolBarAddControl01(void)
   try
   {
     Actor control1 = CreateColorActor( Color::RED );
-    control1.SetSize( Vector2( 100.f, 100.f ) );
+    control1.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
     Actor control2 = CreateColorActor( Color::RED );
-    control2.SetSize( Vector2( 100.f, 100.f ) );
+    control2.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
     Actor control3 = CreateColorActor( Color::RED );
-    control3.SetSize( Vector2( 100.f, 100.f ) );
+    control3.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
     Actor control4 = CreateColorActor( Color::RED );
-    control4.SetSize( Vector2( 100.f, 100.f ) );
+    control4.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
     Actor control5 = CreateColorActor( Color::RED );
-    control5.SetSize( Vector2( 100.f, 100.f ) );
+    control5.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
 
     ToolBar toolbar = ToolBar::New();
-    toolbar.SetSize( Vector2( 600.f, 100.f ) );
+    toolbar.SetProperty( Actor::Property::SIZE, Vector2( 600.f, 100.f ) );
 
     application.Render();
     application.SendNotification();
@@ -132,11 +132,11 @@ int UtcDaliToolBarAddControl01(void)
     toolbar.AddControl( control5, 0.1f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
 
     Actor control6 = CreateColorActor( Color::RED );
-    control6.SetSize( Vector2( 100.f, 100.f ) );
+    control6.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
     Actor control7 = CreateColorActor( Color::RED );
-    control7.SetSize( Vector2( 100.f, 100.f ) );
+    control7.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
     Actor control8 = CreateColorActor( Color::RED );
-    control8.SetSize( Vector2( 100.f, 100.f ) );
+    control8.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
 
     application.Render();
     application.SendNotification();