X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-TableView.cpp;h=b32c92e830b8b0dc113cf93c786db4d779b1f119;hb=3b16ae16f01bd50a26e6c44e6e20ebb8499b4f91;hp=7fe943acdd36e1f61a313ab1ae1c67434aa51ee9;hpb=f4d559ea999cbbc44b1ecd489c4ca3711d37feca;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
index 7fe943a..b32c92e 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
@@ -39,7 +39,6 @@ namespace
 const char* const PROPERTY_NAME_ROWS = "rows";
 const char* const PROPERTY_NAME_COLUMNS = "columns";
 const char* const PROPERTY_NAME_CELL_PADDING = "cell-padding";
-const char* const PROPERTY_NAME_LAYOUT_ANIMATION_DURATION = "layout-animation-duration";
 const char* const PROPERTY_NAME_LAYOUT_ROWS = "layout-rows";
 const char* const PROPERTY_NAME_LAYOUT_COLUMNS = "layout-columns";
 
@@ -74,8 +73,7 @@ static void SetupTableViewAndActors(TableView& tableView, Actor& actor1, Actor&
   DALI_TEST_CHECK(tableView);
 
   Stage::GetCurrent().Add( tableView );
-  tableView.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, Constraint100() ) );
-  tableView.SetLayoutAnimationDuration(0.0f);
+  tableView.SetSize( Dali::Vector3( 100.0f, 100.0f, 100.0f ) );
 
   actor1 = Actor::New();
   actor2 = Actor::New();
@@ -220,23 +218,6 @@ int UtcDaliTableViewMetricsRelative(void)
 }
 
 
-// Test animation duration setting.
-int UtcDaliTableViewAnimation(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline("UtcDaliTableViewAnimation");
-  TableView tableView = TableView::New(10,10);
-  DALI_TEST_CHECK(tableView);
-
-  tableView.SetLayoutAnimationDuration(5.0f);
-  DALI_TEST_EQUALS(tableView.GetLayoutAnimationDuration(), 5.0f, TEST_LOCATION);
-
-  tableView.SetLayoutAnimationDuration(2.5f);
-  DALI_TEST_EQUALS(tableView.GetLayoutAnimationDuration(), 2.5f, TEST_LOCATION);
-  END_TEST;
-}
-
 // Test Adding/Removing/Finding Children.
 int UtcDaliTableViewChild(void)
 {
@@ -585,14 +566,6 @@ int UtcDaliTableViewSetGetProperty(void)
   DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(6.f, 8.f), TEST_LOCATION );
   DALI_TEST_EQUALS( tableView.GetProperty(TableView::PROPERTY_CELL_PADDING).Get<Vector2>(), Vector2(6.f,8.f), TEST_LOCATION );
 
-  // Test "layout-animation-duration" property
-  DALI_TEST_CHECK( tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_ANIMATION_DURATION) == TableView::PROPERTY_LAYOUT_ANIMATION_DURATION );
-
-  tableView.SetProperty( TableView::PROPERTY_LAYOUT_ANIMATION_DURATION, 1.5f );
-
-  DALI_TEST_EQUALS( tableView.GetLayoutAnimationDuration(), 1.5f, TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.GetProperty(TableView::PROPERTY_LAYOUT_ANIMATION_DURATION).Get<float>(), 1.5f, TEST_LOCATION );
-
   //{ "policy": "fixed", "value": 30.0 },
   Property::Map item1;
   item1[ "policy" ] = "fixed";