Move some public apis in toolkit to devel

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
index 9f599a1..6beeda4 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
@@ -20,6 +20,7 @@
 #include <sstream>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -73,15 +74,15 @@ static void SetupTableViewAndActors(TableView& tableView, Actor& actor1, Actor&
   DALI_TEST_CHECK( tableView );
 
   Stage::GetCurrent().Add( tableView );
-  tableView.SetSize( Dali::Vector2( 100.0f, 100.0f ) );
+  tableView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
 
   actor1 = Actor::New();
   actor2 = Actor::New();
   actor3 = Actor::New();
 
-  actor1.SetSize( CELL_SIZE );
-  actor2.SetSize( CELL_SIZE );
-  actor3.SetSize( CELL_SIZE );
+  actor1.SetProperty( Actor::Property::SIZE, CELL_SIZE );
+  actor2.SetProperty( Actor::Property::SIZE, CELL_SIZE );
+  actor3.SetProperty( Actor::Property::SIZE, CELL_SIZE );
 
   tableView.AddChild( actor1, TableView::CellPosition( 0, 0 ) );
   tableView.AddChild( actor2, TableView::CellPosition( 0, 1 ) );
@@ -606,7 +607,7 @@ int UtcDaliTableViewSetGetProperty(void)
 
   // Create a 1x1 table-view
   TableView tableView = TableView::New(1,1);
-  tableView.SetSize( Vector2( 100.0f, 100.0f ) );
+  tableView.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
   DALI_TEST_CHECK( tableView );
 
   // Test "rows" property
@@ -711,7 +712,7 @@ int UtcDaliTableViewChildProperties(void)
   // Create a 10x10 table-view
   TableView tableView = TableView::New(10,10);
   Stage::GetCurrent().Add( tableView );
-  tableView.SetSize( Dali::Vector2( 100.0f, 100.0f ) );
+  tableView.SetProperty( Actor::Property::SIZE, Vector2(100.0f, 100.0f) );
 
   DALI_TEST_CHECK( tableView );
 
@@ -741,7 +742,7 @@ int UtcDaliTableViewChildProperties(void)
 
   // Create a third child actor with the cell alignment properties
   Actor child3 = Actor::New();
-  child3.SetSize( 5.f,5.f );
+  child3.SetProperty( Actor::Property::SIZE, Vector2( 5.f, 5.f ) );
   child3.SetProperty( TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT, "center" );
   child3.SetProperty( TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT,   "bottom" );
   tableView.Add( child3 );
@@ -857,7 +858,7 @@ int UtcDaliTableViewKeyboardFocus(void)
   ToolkitTestApplication application;
 
   TableView tableView = TableView::New(4,4);
-  tableView.SetKeyboardFocusable( true );
+  tableView.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
   tableView.SetProperty( Dali::Actor::Property::NAME, "TableView");
 
   for ( int row = 0; row < 4; ++row )
@@ -868,7 +869,7 @@ int UtcDaliTableViewKeyboardFocus(void)
       std::ostringstream str;
       str << row << "-" << col;
       control.SetProperty( Dali::Actor::Property::NAME, str.str() );
-      control.SetKeyboardFocusable( true );
+      control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
       tableView.AddChild( control, TableView::CellPosition( row, col ) );
     }
   }
@@ -938,7 +939,7 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void)
   ToolkitTestApplication application;
 
   TableView tableView = TableView::New(3, 3);
-  tableView.SetKeyboardFocusable( true );
+  tableView.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
   tableView.SetProperty( Dali::Actor::Property::NAME, "TableView");
 
   for ( int row = 0; row < 3; ++row )
@@ -962,7 +963,7 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void)
             std::ostringstream nameStr;
             nameStr << row << "-" << col << "-" << childRow << "-" << childCol;
             control.SetProperty( Dali::Actor::Property::NAME, nameStr.str() );
-            control.SetKeyboardFocusable( true );
+            control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
             childTableView.AddChild( control, TableView::CellPosition( childRow, childCol ) );
           }
         }
@@ -972,7 +973,7 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void)
       {
         Control control = Control::New();
         control.SetProperty( Dali::Actor::Property::NAME, str.str() );
-        control.SetKeyboardFocusable( true );
+        control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
         tableView.AddChild( control, TableView::CellPosition( row, col ) );
       }
     }