[ITC][dali-toolkit][ACR-650][Added Tc according to ACR]

Change-Id: If5ebd191285f9d42f655de254f14fee5c4b6289c

diff --git a/src/itc/dali-toolkit/table-view/ITs-table-view-impl.h b/src/itc/dali-toolkit/table-view/ITs-table-view-impl.h
index f5c42eb..09743eb 100755 (executable)
--- a/src/itc/dali-toolkit/table-view/ITs-table-view-impl.h
+++ b/src/itc/dali-toolkit/table-view/ITs-table-view-impl.h
@@ -375,6 +375,55 @@ void VTTableViewSetGetCellPadding002()
        Stage::GetCurrent().Remove( g_TableView );
        DaliLog::PrintPass();
 }
+Actor g_childActor;
+Actor g_child1;
+Actor g_child2;
+TableView g_tableView;
+void TableViewChildProperties()
+{
+       OPEN_GL_FREATURE_CHECK(SUITE_NAME,__LINE__)
+       // Create a 10x10 table-view
+       g_tableView = TableView::New(10,10);
+       DALI_CHECK_FAIL( !g_tableView ,"TableView::New() failed");
+       g_tableView.SetSize( Dali::Vector2( 100.0f, 100.0f ) );
+
+       g_child1 = Actor::New();
+       g_child1.SetProperty( TableView::ChildProperty::CELL_INDEX, Vector2( 3, 4 ) );
+       g_tableView.Add( g_child1 );
+       Stage::GetCurrent().Add( g_tableView );
+       DALI_CHECK_FAIL( g_child1 != g_tableView.GetChildAt(TableView::CellPosition(3,4)), "GetChildAt() is failed");
+
+       g_child2 = Actor::New();
+       float rowSpan = 3.f;
+       float columnSpan = 2.f;
+       g_child2.SetProperty( TableView::ChildProperty::CELL_INDEX, Vector2( 6, 1 ) );
+       g_child2.SetProperty( TableView::ChildProperty::ROW_SPAN, rowSpan );
+       g_child2.SetProperty( TableView::ChildProperty::COLUMN_SPAN, columnSpan );
+       g_tableView.Add( g_child2 );
+       for( int i=0; i<rowSpan; i++ )
+       {
+               for(int j=0; j<columnSpan; j++)
+               {
+                       DALI_CHECK_FAIL( g_child2 != g_tableView.GetChildAt(TableView::CellPosition(6+i,1+j)), "GetChildAt() is failed");
+               }
+       }
+       
+       g_childActor = Actor::New();
+       g_childActor.SetSize( 5.f,5.f );
+       g_childActor.SetProperty( TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT, "center" );
+       g_childActor.SetProperty( TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT, "bottom" );
+       g_tableView.Add( g_childActor );
+
+       DALI_CHECK_FAIL( g_childActor != g_tableView.GetChildAt(TableView::CellPosition(0,0)) , "GetChildAt() is failed")
+}
+void VTTableViewChildProperties001()
+{
+       DALI_CHECK_FAIL( g_childActor.GetCurrentAnchorPoint() != AnchorPoint::TOP_LEFT, "AnchorPoint mismatch" );
+       DALI_CHECK_FAIL( g_childActor.GetCurrentParentOrigin() != ParentOrigin::TOP_LEFT, "ParentOrigin mismatch" );
+       DALI_CHECK_FAIL( g_childActor.GetCurrentPosition() != Vector3(2.5f, 5.0f, 0.0f), "Position mismatch" );
+       
+       DaliLog::PrintPass();
+}
 
 
  /**

diff --git a/src/itc/dali-toolkit/table-view/ITs-table-view.cpp b/src/itc/dali-toolkit/table-view/ITs-table-view.cpp
index 4ec0fad..7ada818 100755 (executable)
--- a/src/itc/dali-toolkit/table-view/ITs-table-view.cpp
+++ b/src/itc/dali-toolkit/table-view/ITs-table-view.cpp
@@ -43,7 +43,8 @@ namespace
                TABLE_VIEW_RESIZE,
                TABLE_VIEW_SET_GET_RELATIVE_WIDTH_HEIGHT,
                TABLE_VIEW_SET_GET_FIT_FIXED_WIDTH_HEIGHT,
-               TABLE_VIEW_SET_GET_CELL_PADDING
+               TABLE_VIEW_SET_GET_CELL_PADDING,
+               TABLE_VIEW_CHILD_PROPERTIES
        };
 
        struct TableView_TestApp : public ConnectionTracker
@@ -111,6 +112,10 @@ namespace
                          case TABLE_VIEW_SET_GET_CELL_PADDING:
                          TableViewSetGetCellPadding();
                          break;
+                         
+                         case TABLE_VIEW_CHILD_PROPERTIES:
+                         TableViewChildProperties();
+                         break;
                  }
          }
          
@@ -170,6 +175,15 @@ namespace
                                  break;
                          }
                          break;
+                         case TABLE_VIEW_CHILD_PROPERTIES:
+                         switch(g_nRenderCount_TableView)
+                         {
+                                 case 0:
+                                 VTTableViewChildProperties001();
+                                 g_nRenderCount_TableView++;
+                                 break;
+                         }
+                         break;
                          
                          default:
                          mTimer.Stop();
@@ -493,7 +507,34 @@ int ITcTableViewSetGetCellPadding(void)
 
     return test_return_value;
 }
+//& purpose: set/get child property
+//& type: auto
+/**
+* @testcase                    ITcTableViewChildProperties
+* @since_tizen                         3.0
+* @type                                Positive
+* @description                 set/get child proper
+* @scenario                            Create a tableview handle with an actor added to it \n
+*                                              Add table view to stage \n
+*                                              Check the postion of actor chiled properties\n
+* @apicovered                  TableView::New(),TableView::CellPosition(),TableView::ChildProperty::CELL_INDEX, \n
+                                               TableView::ChildProperty::ROW_SPAN,TableView::ChildProperty::COLUMN_SPAN, \n
+                                               TableView::ChildProperty::CELL_HORIZONTAL_ALIGNMENT,TableView::ChildProperty::CELL_VERTICAL_ALIGNMENT
+* @passcase                            If sets and gets work properly
+* @failcase                            If sets and gets not work properly
+* @precondition                        NA
+* @postcondition               NA
+*/
+int ITcTableViewChildProperties(void)
+{
+       DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
+
+       Application application = Application::New( &gArgc, &gArgv );
+       TableView_TestApp testApp( application, TABLE_VIEW_CHILD_PROPERTIES );
+       application.MainLoop();
 
+    return test_return_value;
+}
 
 /** @} */ // end of itc-table-view-testcases
 /** @} */ // end of itc-table-view

diff --git a/src/itc/dali-toolkit/tct-dali-toolkit-native_common_iot.h b/src/itc/dali-toolkit/tct-dali-toolkit-native_common_iot.h
index 7b972b1..a5c0e12 100755 (executable)
--- a/src/itc/dali-toolkit/tct-dali-toolkit-native_common_iot.h
+++ b/src/itc/dali-toolkit/tct-dali-toolkit-native_common_iot.h
@@ -303,6 +303,7 @@ extern int ITcTableViewResize(void);
 extern int ITcTableViewSetGetRelativeWidthHeight(void);
 extern int ITcTableViewSetGetFitFixedWidthHeight(void);
 extern int ITcTableViewSetGetCellPadding(void);
+extern int ITcTableViewChildProperties(void);
 extern int ITcTextFieldDownCast(void);
 extern int ITcTextFieldAssignment(void);
 extern int ITcTextFieldCopy(void);
@@ -543,6 +544,7 @@ testcase tc_array[] = {
        {"ITcTableViewSetGetRelativeWidthHeight", ITcTableViewSetGetRelativeWidthHeight, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTableViewSetGetFitFixedWidthHeight", ITcTableViewSetGetFitFixedWidthHeight, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTableViewSetGetCellPadding", ITcTableViewSetGetCellPadding, ITs_table_view_startup, ITs_table_view_cleanup},
+       {"ITcTableViewChildProperties", ITcTableViewChildProperties, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTextFieldDownCast", ITcTextFieldDownCast, ITs_text_field_startup, ITs_text_field_cleanup},
        {"ITcTextFieldAssignment", ITcTextFieldAssignment, ITs_text_field_startup, ITs_text_field_cleanup},
        {"ITcTextFieldCopy", ITcTextFieldCopy, ITs_text_field_startup, ITs_text_field_cleanup},
@@ -554,7 +556,7 @@ testcase tc_array[] = {
        {"ITcToolkitIsHorizontal", ITcToolkitIsHorizontal, ITs_toolkit_startup, ITs_toolkit_cleanup},
        {"ITcToolkitWrapActorConstraint", ITcToolkitWrapActorConstraint, ITs_toolkit_startup, ITs_toolkit_cleanup},
        {"ITcToolkitMoveActorConstraint", ITcToolkitMoveActorConstraint, ITs_toolkit_startup, ITs_toolkit_cleanup},
-    {NULL, NULL}
+       {NULL, NULL}
 };
 
 #endif // __TCT_DALI_TOOLKIT_NATIVE_H__

diff --git a/src/itc/dali-toolkit/tct-dali-toolkit-native_mobile.h b/src/itc/dali-toolkit/tct-dali-toolkit-native_mobile.h
index 7b972b1..a5c0e12 100755 (executable)
--- a/src/itc/dali-toolkit/tct-dali-toolkit-native_mobile.h
+++ b/src/itc/dali-toolkit/tct-dali-toolkit-native_mobile.h
@@ -303,6 +303,7 @@ extern int ITcTableViewResize(void);
 extern int ITcTableViewSetGetRelativeWidthHeight(void);
 extern int ITcTableViewSetGetFitFixedWidthHeight(void);
 extern int ITcTableViewSetGetCellPadding(void);
+extern int ITcTableViewChildProperties(void);
 extern int ITcTextFieldDownCast(void);
 extern int ITcTextFieldAssignment(void);
 extern int ITcTextFieldCopy(void);
@@ -543,6 +544,7 @@ testcase tc_array[] = {
        {"ITcTableViewSetGetRelativeWidthHeight", ITcTableViewSetGetRelativeWidthHeight, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTableViewSetGetFitFixedWidthHeight", ITcTableViewSetGetFitFixedWidthHeight, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTableViewSetGetCellPadding", ITcTableViewSetGetCellPadding, ITs_table_view_startup, ITs_table_view_cleanup},
+       {"ITcTableViewChildProperties", ITcTableViewChildProperties, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTextFieldDownCast", ITcTextFieldDownCast, ITs_text_field_startup, ITs_text_field_cleanup},
        {"ITcTextFieldAssignment", ITcTextFieldAssignment, ITs_text_field_startup, ITs_text_field_cleanup},
        {"ITcTextFieldCopy", ITcTextFieldCopy, ITs_text_field_startup, ITs_text_field_cleanup},
@@ -554,7 +556,7 @@ testcase tc_array[] = {
        {"ITcToolkitIsHorizontal", ITcToolkitIsHorizontal, ITs_toolkit_startup, ITs_toolkit_cleanup},
        {"ITcToolkitWrapActorConstraint", ITcToolkitWrapActorConstraint, ITs_toolkit_startup, ITs_toolkit_cleanup},
        {"ITcToolkitMoveActorConstraint", ITcToolkitMoveActorConstraint, ITs_toolkit_startup, ITs_toolkit_cleanup},
-    {NULL, NULL}
+       {NULL, NULL}
 };
 
 #endif // __TCT_DALI_TOOLKIT_NATIVE_H__

diff --git a/src/itc/dali-toolkit/tct-dali-toolkit-native_tv.h b/src/itc/dali-toolkit/tct-dali-toolkit-native_tv.h
index 7b972b1..a5c0e12 100755 (executable)
--- a/src/itc/dali-toolkit/tct-dali-toolkit-native_tv.h
+++ b/src/itc/dali-toolkit/tct-dali-toolkit-native_tv.h
@@ -303,6 +303,7 @@ extern int ITcTableViewResize(void);
 extern int ITcTableViewSetGetRelativeWidthHeight(void);
 extern int ITcTableViewSetGetFitFixedWidthHeight(void);
 extern int ITcTableViewSetGetCellPadding(void);
+extern int ITcTableViewChildProperties(void);
 extern int ITcTextFieldDownCast(void);
 extern int ITcTextFieldAssignment(void);
 extern int ITcTextFieldCopy(void);
@@ -543,6 +544,7 @@ testcase tc_array[] = {
        {"ITcTableViewSetGetRelativeWidthHeight", ITcTableViewSetGetRelativeWidthHeight, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTableViewSetGetFitFixedWidthHeight", ITcTableViewSetGetFitFixedWidthHeight, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTableViewSetGetCellPadding", ITcTableViewSetGetCellPadding, ITs_table_view_startup, ITs_table_view_cleanup},
+       {"ITcTableViewChildProperties", ITcTableViewChildProperties, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTextFieldDownCast", ITcTextFieldDownCast, ITs_text_field_startup, ITs_text_field_cleanup},
        {"ITcTextFieldAssignment", ITcTextFieldAssignment, ITs_text_field_startup, ITs_text_field_cleanup},
        {"ITcTextFieldCopy", ITcTextFieldCopy, ITs_text_field_startup, ITs_text_field_cleanup},
@@ -554,7 +556,7 @@ testcase tc_array[] = {
        {"ITcToolkitIsHorizontal", ITcToolkitIsHorizontal, ITs_toolkit_startup, ITs_toolkit_cleanup},
        {"ITcToolkitWrapActorConstraint", ITcToolkitWrapActorConstraint, ITs_toolkit_startup, ITs_toolkit_cleanup},
        {"ITcToolkitMoveActorConstraint", ITcToolkitMoveActorConstraint, ITs_toolkit_startup, ITs_toolkit_cleanup},
-    {NULL, NULL}
+       {NULL, NULL}
 };
 
 #endif // __TCT_DALI_TOOLKIT_NATIVE_H__

diff --git a/src/itc/dali-toolkit/tct-dali-toolkit-native_wearable.h b/src/itc/dali-toolkit/tct-dali-toolkit-native_wearable.h
index 7b972b1..a5c0e12 100755 (executable)
--- a/src/itc/dali-toolkit/tct-dali-toolkit-native_wearable.h
+++ b/src/itc/dali-toolkit/tct-dali-toolkit-native_wearable.h
@@ -303,6 +303,7 @@ extern int ITcTableViewResize(void);
 extern int ITcTableViewSetGetRelativeWidthHeight(void);
 extern int ITcTableViewSetGetFitFixedWidthHeight(void);
 extern int ITcTableViewSetGetCellPadding(void);
+extern int ITcTableViewChildProperties(void);
 extern int ITcTextFieldDownCast(void);
 extern int ITcTextFieldAssignment(void);
 extern int ITcTextFieldCopy(void);
@@ -543,6 +544,7 @@ testcase tc_array[] = {
        {"ITcTableViewSetGetRelativeWidthHeight", ITcTableViewSetGetRelativeWidthHeight, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTableViewSetGetFitFixedWidthHeight", ITcTableViewSetGetFitFixedWidthHeight, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTableViewSetGetCellPadding", ITcTableViewSetGetCellPadding, ITs_table_view_startup, ITs_table_view_cleanup},
+       {"ITcTableViewChildProperties", ITcTableViewChildProperties, ITs_table_view_startup, ITs_table_view_cleanup},
        {"ITcTextFieldDownCast", ITcTextFieldDownCast, ITs_text_field_startup, ITs_text_field_cleanup},
        {"ITcTextFieldAssignment", ITcTextFieldAssignment, ITs_text_field_startup, ITs_text_field_cleanup},
        {"ITcTextFieldCopy", ITcTextFieldCopy, ITs_text_field_startup, ITs_text_field_cleanup},
@@ -554,7 +556,7 @@ testcase tc_array[] = {
        {"ITcToolkitIsHorizontal", ITcToolkitIsHorizontal, ITs_toolkit_startup, ITs_toolkit_cleanup},
        {"ITcToolkitWrapActorConstraint", ITcToolkitWrapActorConstraint, ITs_toolkit_startup, ITs_toolkit_cleanup},
        {"ITcToolkitMoveActorConstraint", ITcToolkitMoveActorConstraint, ITs_toolkit_startup, ITs_toolkit_cleanup},
-    {NULL, NULL}
+       {NULL, NULL}
 };
 
 #endif // __TCT_DALI_TOOLKIT_NATIVE_H__