X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ToolBar.cpp;h=c4777bc9f29a09cc0263a06e991ec34c85ded557;hp=9adf9cd9fe2eac2a06a81aef07a8744f4c6c43c3;hb=e0c063be9e7ecde0e5665079289489d456828abf;hpb=2078fd4ac40a042eed5d62239e70745aea8f8fba

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
index 9adf9cd..c4777bc 100644
--- 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) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -21,7 +21,8 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
-#include <dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include "dummy-control.h"
 
 using namespace Dali;
 using namespace Toolkit;
@@ -37,14 +38,15 @@ static void TestCallback(BaseHandle handle)
 
 Actor CreateColorActor( const Vector4& color )
 {
-  Actor solidColorActor = Actor::New();
+  DummyControl solidColorActor = DummyControl::New();
+  DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(solidColorActor.GetImplementation());
 
-  RendererFactory factory = RendererFactory::Get();
+  VisualFactory factory = VisualFactory::Get();
   Dali::Property::Map map;
-  map[ "rendererType" ] = "color";
-  map[ "mixColor" ] = color;
-  ControlRenderer colorRenderer = factory.CreateControlRenderer( map );
-  colorRenderer.SetOnStage( solidColorActor );
+  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 );
 
   return solidColorActor;
 }
@@ -80,7 +82,7 @@ int UtcDaliToolBarNew(void)
   DALI_TEST_CHECK( toolbar2 == toolbar );
 
   //Additional check to ensure object is created by checking if it's registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
   DALI_TEST_CHECK( registry );
 
   gObjectCreatedCallBackCalled = false;
@@ -91,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;
@@ -105,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();
@@ -124,26 +126,26 @@ int UtcDaliToolBarAddControl01(void)
     application.SendNotification();
 
     toolbar.Add( control1 );
-    toolbar.AddControl( control2, 0.1f, Alignment::HorizontalLeft, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control3, 0.1f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control4, 0.1f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control5, 0.1f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl( control2, 0.1f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl( control3, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl( control4, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl( control5, 0.1f, Alignment::HORIZONTAL_RIGHT, 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();
     application.Render();
     application.SendNotification();
 
-    toolbar.AddControl( control6, 0.4f, Alignment::HorizontalLeft, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control7, 0.2f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
-    toolbar.AddControl( control8, 0.2f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl( control6, 0.4f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl( control7, 0.2f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+    toolbar.AddControl( control8, 0.2f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
   }
   catch( ... )
   {
@@ -196,7 +198,7 @@ int UtcDaliToolBarRemoveControl01(void)
     Actor control = CreateColorActor( Color::RED );
 
     ToolBar toolbar = ToolBar::New();
-    toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft );
+    toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT );
 
     toolbar.RemoveControl( control );
   }
@@ -221,8 +223,8 @@ int UtcDaliToolBarRemoveControl02(void)
 
     ToolBar toolbar01 = ToolBar::New();
     ToolBar toolbar02 = ToolBar::New();
-    toolbar01.AddControl( control01, 0.1f, Alignment::HorizontalLeft );
-    toolbar02.AddControl( control02, 0.1f, Alignment::HorizontalLeft );
+    toolbar01.AddControl( control01, 0.1f, Alignment::HORIZONTAL_LEFT );
+    toolbar02.AddControl( control02, 0.1f, Alignment::HORIZONTAL_LEFT );
 
     toolbar02.RemoveControl( control01 );
   }
@@ -241,7 +243,7 @@ int UtcDaliToolBarRemoveControl02(void)
     Actor control = CreateColorActor( Color::RED );
 
     ToolBar toolbar = ToolBar::New();
-    toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft );
+    toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT );
 
     toolbar.RemoveControl( control );
     toolbar.RemoveControl( control );