OnActivated() change for Accessibility and KeyboardFocus

[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 e1042b2..36e8f8c 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
@@ -20,6 +20,7 @@
 #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>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -80,32 +81,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;
@@ -114,23 +89,18 @@ int UtcDaliToolBarAddControl01(void)
   try
   {
     ImageActor control1 = CreateSolidColorActor( Color::RED );
-    control1.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control1.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    control1.SetSize( Vector2( 100.f, 100.f ) );
     ImageActor control2 = CreateSolidColorActor( Color::RED );
-    control2.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control2.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    control2.SetSize( Vector2( 100.f, 100.f ) );
     ImageActor control3 = CreateSolidColorActor( Color::RED );
-    control3.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control3.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    control3.SetSize( Vector2( 100.f, 100.f ) );
     ImageActor control4 = CreateSolidColorActor( Color::RED );
-    control4.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control4.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    control4.SetSize( Vector2( 100.f, 100.f ) );
     ImageActor control5 = CreateSolidColorActor( Color::RED );
-    control5.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control5.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    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();
@@ -144,14 +114,11 @@ int UtcDaliToolBarAddControl01(void)
     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 );
+    control6.SetSize( Vector2( 100.f, 100.f ) );
     ImageActor control7 = CreateSolidColorActor( Color::RED );
-    control7.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control7.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    control7.SetSize( Vector2( 100.f, 100.f ) );
     ImageActor control8 = CreateSolidColorActor( Color::RED );
-    control8.SetPreferredSize( Vector2( 100.f, 100.f ) );
-    control8.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    control8.SetSize( Vector2( 100.f, 100.f ) );
 
     application.Render();
     application.SendNotification();