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=2232cd321d5414f80288fd26c43ee6b4770e7238;hp=e1042b24b549f199245136a6226e9364bb337290;hb=f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45;hpb=cc82bd9b187cda8fe2c8336b73fd1fa9376cfebd

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
index e1042b2..2232cd3 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) 2016 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.
@@ -20,6 +20,8 @@
 #include <dali-toolkit-test-suite-utils.h>
 #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/visual-factory/visual-factory.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -32,6 +34,21 @@ static void TestCallback(BaseHandle handle)
 {
   gObjectCreatedCallBackCalled = true;
 }
+
+Actor CreateColorActor( const Vector4& color )
+{
+  Actor solidColorActor = Actor::New();
+
+  VisualFactory factory = VisualFactory::Get();
+  Dali::Property::Map map;
+  map[ Visual::Property::TYPE ] = Visual::COLOR;
+  map[ ColorVisual::Property::MIX_COLOR ] = color;
+  Visual::Base colorVisual = factory.CreateVisual( map );
+  colorVisual.SetOnStage( solidColorActor );
+
+  return solidColorActor;
+}
+
 } // namespace
 
 void dali_toolbar_startup(void)
@@ -80,32 +97,6 @@ int UtcDaliToolBarNew(void)
   END_TEST;
 }
 
-int UtcDaliToolBarSetBackground(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliToolBarSetBackground");
-
-  try
-  {
-    ImageActor toolBarBackground = CreateSolidColorActor( Color::RED );
-
-    ToolBar toolbar = ToolBar::New();
-    toolbar.SetBackground( toolBarBackground );
-
-    Stage::GetCurrent().Add( toolbar );
-  }
-  catch( ... )
-  {
-    tet_result(TET_FAIL);
-  }
-
-  tet_result(TET_PASS);
-
-  application.SendNotification(); // VCC To be removed!!
-  application.Render();     // VCC To be removed!!
-  END_TEST;
-}
-
 int UtcDaliToolBarAddControl01(void)
 {
   ToolkitTestApplication application;
@@ -113,24 +104,19 @@ int UtcDaliToolBarAddControl01(void)
 
   try
   {
-    ImageActor control1 = CreateSolidColorActor( Color::RED );
-    control1.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control1.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-    ImageActor control2 = CreateSolidColorActor( Color::RED );
-    control2.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control2.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-    ImageActor control3 = CreateSolidColorActor( Color::RED );
-    control3.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control3.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-    ImageActor control4 = CreateSolidColorActor( Color::RED );
-    control4.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control4.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-    ImageActor control5 = CreateSolidColorActor( Color::RED );
-    control5.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control5.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    Actor control1 = CreateColorActor( Color::RED );
+    control1.SetSize( Vector2( 100.f, 100.f ) );
+    Actor control2 = CreateColorActor( Color::RED );
+    control2.SetSize( Vector2( 100.f, 100.f ) );
+    Actor control3 = CreateColorActor( Color::RED );
+    control3.SetSize( Vector2( 100.f, 100.f ) );
+    Actor control4 = CreateColorActor( Color::RED );
+    control4.SetSize( Vector2( 100.f, 100.f ) );
+    Actor control5 = CreateColorActor( Color::RED );
+    control5.SetSize( Vector2( 100.f, 100.f ) );
 
     ToolBar toolbar = ToolBar::New();
-    toolbar.SetPreferredSize( Vector2( 600.f, 100.f ) );
+    toolbar.SetSize( Vector2( 600.f, 100.f ) );
 
     application.Render();
     application.SendNotification();
@@ -143,15 +129,12 @@ int UtcDaliToolBarAddControl01(void)
     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 ) );
 
-    ImageActor control6 = CreateSolidColorActor( Color::RED );
-    control6.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control6.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-    ImageActor control7 = CreateSolidColorActor( Color::RED );
-    control7.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control7.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-    ImageActor control8 = CreateSolidColorActor( Color::RED );
-    control8.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control8.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    Actor control6 = CreateColorActor( Color::RED );
+    control6.SetSize( Vector2( 100.f, 100.f ) );
+    Actor control7 = CreateColorActor( Color::RED );
+    control7.SetSize( Vector2( 100.f, 100.f ) );
+    Actor control8 = CreateColorActor( Color::RED );
+    control8.SetSize( Vector2( 100.f, 100.f ) );
 
     application.Render();
     application.SendNotification();
@@ -180,7 +163,7 @@ int UtcDaliToolBarAddControl02(void)
 
   try
   {
-    ImageActor control = CreateSolidColorActor( Color::RED );
+    Actor control = CreateColorActor( Color::RED );
 
     ToolBar toolbar = ToolBar::New();
 
@@ -210,7 +193,7 @@ int UtcDaliToolBarRemoveControl01(void)
 
   try
   {
-    ImageActor control = CreateSolidColorActor( Color::RED );
+    Actor control = CreateColorActor( Color::RED );
 
     ToolBar toolbar = ToolBar::New();
     toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft );
@@ -233,8 +216,8 @@ int UtcDaliToolBarRemoveControl02(void)
 
   try
   {
-    ImageActor control01 = CreateSolidColorActor( Color::RED );
-    ImageActor control02 = CreateSolidColorActor( Color::RED );
+    Actor control01 = CreateColorActor( Color::RED );
+    Actor control02 = CreateColorActor( Color::RED );
 
     ToolBar toolbar01 = ToolBar::New();
     ToolBar toolbar02 = ToolBar::New();
@@ -255,7 +238,7 @@ int UtcDaliToolBarRemoveControl02(void)
 
   try
   {
-    ImageActor control = CreateSolidColorActor( Color::RED );
+    Actor control = CreateColorActor( Color::RED );
 
     ToolBar toolbar = ToolBar::New();
     toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft );