X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-TableView.cpp;h=8e6bffa5602ca3fdfef7d05690954767797a574f;hb=f2a9e28631d560e4821cc542cbc21a71d0a29f2f;hp=87731870dab0bdf00a2acd7b1e501b9017e4c8f1;hpb=eea53605c5acb244aebb72d75bdd9b3a68a9678a;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 8773187..8e6bffa 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp @@ -41,6 +41,7 @@ const char* const PROPERTY_NAME_COLUMNS = "columns"; const char* const PROPERTY_NAME_CELL_PADDING = "cell-padding"; const char* const PROPERTY_NAME_LAYOUT_ROWS = "layout-rows"; const char* const PROPERTY_NAME_LAYOUT_COLUMNS = "layout-columns"; +const Vector2 CELL_SIZE( 10, 10 ); static bool gObjectCreatedCallBackCalled; @@ -58,36 +59,47 @@ struct Constraint100 /** * function operator to apply the parent size */ - Dali::Vector3 operator()(const Dali::Vector3& current) + void operator()( Dali::Vector3& current, const PropertyInputContainer& /* inputs */ ) { - return Dali::Vector3( 100.0f, 100.0f, 100.0f ); + current.x = current.y = current.z = 100.0f; } }; // Convenience function to quickly set up a 10x10 table with each cell being 10x10 pixels in size by default. static void SetupTableViewAndActors(TableView& tableView, Actor& actor1, Actor& actor2, Actor& actor3) { - tableView = TableView::New(10,10); // 10 by 10 grid. - DALI_TEST_CHECK(tableView); + tableView = TableView::New( 10, 10 ); // 10 by 10 grid. + DALI_TEST_CHECK( tableView ); Stage::GetCurrent().Add( tableView ); - tableView.SetSize( Dali::Vector3( 100.0f, 100.0f, 100.0f ) ); + tableView.SetSize( Dali::Vector2( 100.0f, 100.0f ) ); actor1 = Actor::New(); actor2 = Actor::New(); actor3 = Actor::New(); - actor1.SetSize(10,10); - actor2.SetSize(10,10); - actor3.SetSize(10,10); + actor1.SetSize( CELL_SIZE ); + actor2.SetSize( CELL_SIZE ); + actor3.SetSize( CELL_SIZE ); - tableView.AddChild(actor1, TableView::CellPosition(0,0)); - tableView.AddChild(actor2, TableView::CellPosition(0,1)); - tableView.AddChild(actor3, TableView::CellPosition(1,0)); + tableView.AddChild( actor1, TableView::CellPosition( 0, 0 ) ); + tableView.AddChild( actor2, TableView::CellPosition( 0, 1 ) ); + tableView.AddChild( actor3, TableView::CellPosition( 1, 0 ) ); } } // namespace +int UtcDaliTableViewCtorCopyP(void) +{ + TestApplication application; + + TableView actor1 = TableView::New(10,10); + TableView actor2( actor1 ); + + DALI_TEST_EQUALS( actor1, actor2, TEST_LOCATION ); + END_TEST; +} + int UtcDaliTableViewNew(void) { ToolkitTestApplication application; @@ -143,6 +155,42 @@ int UtcDaliTableViewMetricsPadding(void) } // Test adjusting the metric values for the cell. +int UtcDaliTableViewMetricsFit(void) +{ + ToolkitTestApplication application; + + tet_infoline("UtcDaliTableViewMetricsFit"); + + TableView tableView; + Actor actor1; + Actor actor2; + Actor actor3; + + SetupTableViewAndActors(tableView, actor1, actor2, actor3); + application.SendNotification(); + application.Render(); + + // 1. check that with no fixed width/heights, actors are in default position. + DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); + + // 2. check that with a fixed width & height, actors to the right and below are offsetted. + tableView.SetFitHeight(0); + tableView.SetFitWidth(0); + DALI_TEST_EQUALS( tableView.IsFitHeight(0), true, TEST_LOCATION ); + DALI_TEST_EQUALS( tableView.IsFitWidth(0), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); + END_TEST; +} + +// Test adjusting the metric values for the cell. int UtcDaliTableViewMetricsFixed(void) { ToolkitTestApplication application; @@ -390,6 +438,10 @@ int UtcDaliTableViewCells(void) tableView.AddChild(actor1, TableView::CellPosition(110, 110, 5, 5)); DALI_TEST_CHECK( tableView.GetRows() == 115 && tableView.GetColumns() == 115 ); + // Set the alignment of the cell + tableView.SetCellAlignment( TableView::CellPosition(100, 100, 1, 1), HorizontalAlignment::CENTER, VerticalAlignment::CENTER ); + tableView.SetCellAlignment( TableView::CellPosition(110, 110, 5, 5), HorizontalAlignment::LEFT, VerticalAlignment::TOP ); + DALI_TEST_CHECK( true ); END_TEST; } @@ -438,7 +490,7 @@ int UtcDaliTableViewMetricsAssert(void) catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_EQUALS(e.condition, "rowIndex < mFixedHeights.size()", TEST_LOCATION); + DALI_TEST_EQUALS(e.condition, "rowIndex < mRowData.Size()", TEST_LOCATION); } try @@ -450,7 +502,7 @@ int UtcDaliTableViewMetricsAssert(void) catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_EQUALS(e.condition, "rowIndex < mFixedHeights.size()", TEST_LOCATION); + DALI_TEST_EQUALS(e.condition, "rowIndex < mRowData.Size()", TEST_LOCATION); } try @@ -462,7 +514,7 @@ int UtcDaliTableViewMetricsAssert(void) catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_EQUALS(e.condition, "columnIndex < mFixedWidths.size()", TEST_LOCATION); + DALI_TEST_EQUALS(e.condition, "columnIndex < mColumnData.Size()", TEST_LOCATION); } try @@ -474,7 +526,7 @@ int UtcDaliTableViewMetricsAssert(void) catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_EQUALS(e.condition, "columnIndex < mFixedWidths.size()", TEST_LOCATION); + DALI_TEST_EQUALS(e.condition, "columnIndex < mColumnData.Size()", TEST_LOCATION); } // relatives... @@ -488,7 +540,7 @@ int UtcDaliTableViewMetricsAssert(void) catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_EQUALS(e.condition, "rowIndex < mRelativeHeights.size()", TEST_LOCATION); + DALI_TEST_EQUALS(e.condition, "rowIndex < mRowData.Size()", TEST_LOCATION); } try @@ -500,7 +552,7 @@ int UtcDaliTableViewMetricsAssert(void) catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_EQUALS(e.condition, "rowIndex < mRelativeHeights.size()", TEST_LOCATION); + DALI_TEST_EQUALS(e.condition, "rowIndex < mRowData.Size()", TEST_LOCATION); } try @@ -512,7 +564,7 @@ int UtcDaliTableViewMetricsAssert(void) catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_EQUALS(e.condition, "columnIndex < mRelativeWidths.size()", TEST_LOCATION); + DALI_TEST_EQUALS(e.condition, "columnIndex < mColumnData.Size()", TEST_LOCATION); } try @@ -524,7 +576,7 @@ int UtcDaliTableViewMetricsAssert(void) catch( Dali::DaliException& e ) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_EQUALS(e.condition, "columnIndex < mRelativeWidths.size()", TEST_LOCATION); + DALI_TEST_EQUALS(e.condition, "columnIndex < mColumnData.Size()", TEST_LOCATION); } END_TEST; } @@ -536,7 +588,7 @@ int UtcDaliTableViewSetGetProperty(void) // Create a 1x1 table-view TableView tableView = TableView::New(1,1); - tableView.ApplyConstraint( Constraint::New( Actor::Property::SIZE, Constraint100() ) ); + tableView.SetSize( Vector2( 100.0f, 100.0f ) ); DALI_TEST_CHECK( tableView ); // Test "rows" property @@ -591,12 +643,14 @@ int UtcDaliTableViewSetGetProperty(void) DALI_TEST_EQUALS( tableView.GetRelativeHeight( 3u ), 0.2f, TEST_LOCATION ); Property::Map layoutRowsGet = tableView.GetProperty(TableView::Property::LAYOUT_ROWS).Get(); - DALI_TEST_CHECK( layoutRowsGet.GetKey(0).compare(layoutRows.GetKey(0)) == 0 ); - DALI_TEST_CHECK( layoutRowsGet.GetValue(0).GetValue( "policy" ).Get().compare(layoutRows.GetValue(0).GetValue( "policy" ).Get()) == 0 ); - DALI_TEST_EQUALS( layoutRowsGet.GetValue(0).GetValue( "value" ).Get(),layoutRows.GetValue(0).GetValue( "value" ).Get(), TEST_LOCATION ); - DALI_TEST_CHECK( layoutRowsGet.GetKey(1).compare(layoutRows.GetKey(1)) == 0 ); - DALI_TEST_CHECK( layoutRowsGet.GetValue(1).GetValue( "policy" ).Get().compare(layoutRows.GetValue(1).GetValue( "policy" ).Get()) == 0 ); - DALI_TEST_EQUALS( layoutRowsGet.GetValue(1).GetValue( "value" ).Get(),layoutRows.GetValue(1).GetValue( "value" ).Get(), TEST_LOCATION ); + + DALI_TEST_EQUALS( layoutRowsGet.GetKey(1).compare(layoutRows.GetKey(0)), 0, TEST_LOCATION ); + DALI_TEST_CHECK( layoutRowsGet.GetValue(1).GetValue( "policy" ).Get().compare(layoutRows.GetValue(0).GetValue( "policy" ).Get()) == 0 ); + DALI_TEST_EQUALS( layoutRowsGet.GetValue(1).GetValue( "value" ).Get(), layoutRows.GetValue(0).GetValue( "value" ).Get(), TEST_LOCATION ); + + DALI_TEST_CHECK( layoutRowsGet.GetKey(3).compare(layoutRows.GetKey(1)) == 0 ); + DALI_TEST_CHECK( layoutRowsGet.GetValue(3).GetValue( "policy" ).Get().compare(layoutRows.GetValue(1).GetValue( "policy" ).Get()) == 0 ); + DALI_TEST_EQUALS( layoutRowsGet.GetValue(3).GetValue( "value" ).Get(), layoutRows.GetValue(1).GetValue( "value" ).Get(), TEST_LOCATION ); // Test "layout-columns" property DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_LAYOUT_COLUMNS ) == TableView::Property::LAYOUT_COLUMNS ); @@ -617,12 +671,13 @@ int UtcDaliTableViewSetGetProperty(void) DALI_TEST_EQUALS( tableView.GetFixedWidth( 3u ), 30.f, TEST_LOCATION ); Property::Map layoutColumnsGet = tableView.GetProperty(TableView::Property::LAYOUT_COLUMNS).Get(); - DALI_TEST_CHECK( layoutColumnsGet.GetKey(0).compare(layoutColumns.GetKey(0)) == 0 ); - DALI_TEST_CHECK( layoutColumnsGet.GetValue(0).GetValue( "policy" ).Get().compare(layoutColumns.GetValue(0).GetValue( "policy" ).Get()) == 0 ); - DALI_TEST_EQUALS( layoutColumnsGet.GetValue(0).GetValue( "value" ).Get(),layoutColumns.GetValue(0).GetValue( "value" ).Get(), TEST_LOCATION ); - DALI_TEST_CHECK( layoutColumnsGet.GetKey(1).compare(layoutColumns.GetKey(1)) == 0 ); - DALI_TEST_CHECK( layoutColumnsGet.GetValue(1).GetValue( "policy" ).Get().compare(layoutColumns.GetValue(1).GetValue( "policy" ).Get()) == 0 ); - DALI_TEST_EQUALS( layoutColumnsGet.GetValue(1).GetValue( "value" ).Get(),layoutColumns.GetValue(1).GetValue( "value" ).Get(), TEST_LOCATION ); + DALI_TEST_CHECK( layoutColumnsGet.GetKey(2).compare(layoutColumns.GetKey(0)) == 0 ); + DALI_TEST_CHECK( layoutColumnsGet.GetValue(2).GetValue( "policy" ).Get().compare(layoutColumns.GetValue(0).GetValue( "policy" ).Get()) == 0 ); + DALI_TEST_EQUALS( layoutColumnsGet.GetValue(2).GetValue( "value" ).Get(),layoutColumns.GetValue(0).GetValue( "value" ).Get(), TEST_LOCATION ); + + DALI_TEST_CHECK( layoutColumnsGet.GetKey(3).compare(layoutColumns.GetKey(1)) == 0 ); + DALI_TEST_CHECK( layoutColumnsGet.GetValue(3).GetValue( "policy" ).Get().compare(layoutColumns.GetValue(1).GetValue( "policy" ).Get()) == 0 ); + DALI_TEST_EQUALS( layoutColumnsGet.GetValue(3).GetValue( "value" ).Get(),layoutColumns.GetValue(1).GetValue( "value" ).Get(), TEST_LOCATION ); END_TEST; } @@ -634,7 +689,8 @@ int UtcDaliTableViewCustomProperties(void) // Create a 10x10 table-view TableView tableView = TableView::New(10,10); - tableView.ApplyConstraint( Constraint::New( Actor::Property::SIZE, Constraint100() ) ); + Constraint constraint = Constraint::New( tableView, Actor::Property::SIZE, Constraint100() ); + constraint.Apply(); DALI_TEST_CHECK( tableView ); // Create a child actor with the custom properties