[UTC/ITC][dali-toolkit][ACR-1435][Remove and replace TCs for deprecated API] 13/212313/4
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 19 Aug 2019 10:45:29 +0000 (19:45 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 23 Aug 2019 07:30:08 +0000 (16:30 +0900)
Change-Id: I215c81c423a0478d9dfcd8a314d1c5d4c0cc19e9
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
16 files changed:
src/itc/dali-toolkit/button/ITs-button.cpp
src/itc/dali-toolkit/control/ITs-control.cpp
src/itc/dali-toolkit/image-view/ITs-image-view.cpp
src/itc/dali-toolkit/push-button/ITs-push-button.cpp
src/itc/dali-toolkit/radio-button/ITs-radio-button.cpp
src/itc/dali-toolkit/tct-dali-toolkit-native_mobile.h
src/itc/dali-toolkit/tct-dali-toolkit-native_tizeniot.h
src/itc/dali-toolkit/tct-dali-toolkit-native_wearable.h
src/utc/dali-toolkit/button/utc-dali-button.cpp
src/utc/dali-toolkit/control-impl/utc-dali-control-impl.cpp
src/utc/dali-toolkit/control/utc-dali-control.cpp
src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp
src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp
src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h
src/utc/dali-toolkit/tct-dali-toolkit-core_tizeniot.h
src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h

index 8c1268a90a0c54775444998511942e107d8205cc..251a581e8c292fe1a83155d67727f3a7d8542e76 100755 (executable)
@@ -40,7 +40,7 @@ static bool g_bButtonSelectedState = false;
 bool CbButtonSelected( Button button )
 {
   LOG_I("Callback for button selection is called.");
-  g_bButtonSelectedState = button.IsSelected();
+  g_bButtonSelectedState = button.GetProperty<bool>( Button::Property::SELECTED );
   return true;
 }
 
@@ -52,13 +52,11 @@ bool CbButtonSelected( Button button )
  */
 
 void ButtonDowncast();
-void ButtonSetGetAnimationTime();
 void ButtonAssignmentOperator();
 void ButtonCopyConstructor();
 void ButtonSetIsDisabled();
 void ButtonSetGetLabelText();
 void ButtonSetIsSelected();
-void ButtonSetSelectedImage();
 void ButtonDisabledProperty();
 void ButtonSetDisabledWithDifferentStates01();
 void ButtonSetDisabledWithDifferentStates02();
@@ -72,13 +70,11 @@ namespace
        enum TEST_CASES_LIST_BUTTON
        {
                BUTTON_DOWNCAST,
-               BUTTON_SET_GET_ANIMATION_TIME,
                BUTTON_ASSIGNMENT_OPERATOR,
                BUTTON_COPY_CONSTRUCTOR,
                BUTTON_SET_IS_DISABLED,
                BUTTON_SET_GET_LABEL_TEXT,
                BUTTON_SET_IS_SELECTED,
-               BUTTON_SET_SELECTED_IMAGE,
                BUTTON_DISABLED_PROPERTY,
                BUTTON_SET_DISABLED_WITH_DIFFERENT_STATES_01,
                BUTTON_SET_DISABLED_WITH_DIFFERENT_STATES_02,
@@ -117,11 +113,7 @@ namespace
                                case BUTTON_DOWNCAST:
                                ButtonDowncast();
                                break;
-                               
-                               case BUTTON_SET_GET_ANIMATION_TIME:
-                               ButtonSetGetAnimationTime();
-                               break;
-                               
+
                                case BUTTON_ASSIGNMENT_OPERATOR:
                                ButtonAssignmentOperator();
                                break;
@@ -141,10 +133,6 @@ namespace
                                case BUTTON_SET_IS_SELECTED:
                                ButtonSetIsSelected();
                                break;
-                               
-                               case BUTTON_SET_SELECTED_IMAGE:
-                               ButtonSetSelectedImage();
-                               break;
 
                                case BUTTON_DISABLED_PROPERTY:
                                ButtonDisabledProperty();
@@ -208,22 +196,6 @@ void ButtonDowncast()
        DaliLog::PrintPass();
 }
 
-void ButtonSetGetAnimationTime()
-{
-       float fsetAnimationTime = 4.00f;
-       float fGetAnimationTime = 0.0f;
-       
-       Button button = PushButton::New();
-       DALI_CHECK_INSTANCE(button,"PushButton::New() is failed to create valid button object ");
-       
-       button.SetAnimationTime(fsetAnimationTime);
-               
-       fGetAnimationTime = button.GetAnimationTime();
-       DALI_CHECK_FAIL(fGetAnimationTime != fsetAnimationTime, "GetAnimationTime is mismatched with the SetAnimationTime value");              
-       
-       DaliLog::PrintPass();
-}
-
 void ButtonAssignmentOperator()
 {
        Button button = PushButton::New();
@@ -256,16 +228,16 @@ void ButtonSetIsDisabled()
        DALI_CHECK_INSTANCE(button,"PushButton::New() is failed to create valid button object ");
        
        Stage::GetCurrent().Add( button );
-       button.SetDisabled( bSetDisable );
+       button.SetProperty( Button::Property::DISABLED, bSetDisable );
 
-       bIsDisable = button.IsDisabled();
-       DALI_CHECK_FAIL(bSetDisable != bIsDisable, "SetDisabled and IsDisable value doest not match properly");
+       bIsDisable = button.GetProperty<bool>( Button::Property::DISABLED );
+       DALI_CHECK_FAIL( bSetDisable != bIsDisable, "Button::Property::DISABLED does not work properly" );
        bSetDisable = true ;
        
-       button.SetDisabled( bSetDisable );
+       button.SetProperty( Button::Property::DISABLED, bSetDisable );
        
-       bIsDisable = button.IsDisabled();
-       DALI_CHECK_FAIL(bSetDisable != bIsDisable, "SetDisabled and IsDisable value doest not match properly");
+       bIsDisable = button.GetProperty<bool>( Button::Property::DISABLED );
+       DALI_CHECK_FAIL( bSetDisable != bIsDisable, "Button::Property::DISABLED does not work properly");
        
        Stage::GetCurrent().Remove( button );
        DaliLog::PrintPass();
@@ -281,10 +253,18 @@ void ButtonSetGetLabelText()
        DALI_CHECK_INSTANCE(button,"PushButton::New() is failed to create valid button object ");
        
        Stage::GetCurrent().Add( button );
-       button.SetLabelText( strSetLabelText );
+       button.SetProperty( Button::Property::LABEL, strSetLabelText );
        
-       strGetlabelText = button.GetLabelText();
-       DALI_CHECK_FAIL( strSetLabelText != strSetLabelText,"SetlabelText and GetLabelText value does not match" );
+       Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL );
+       Property::Map *labelProperty = value.GetMap();
+
+    if ( labelProperty )
+    {
+      Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
+      value->Get( strGetlabelText );
+    }
+
+       DALI_CHECK_FAIL( strSetLabelText != strGetlabelText,"Button::Property::LABEL does not work" );
        
        Stage::GetCurrent().Remove( button );
        DaliLog::PrintPass();
@@ -301,87 +281,23 @@ void ButtonSetIsSelected()
        DALI_CHECK_INSTANCE(button,"PushButton::New() is failed to create valid button object ");
        
        Stage::GetCurrent().Add( button );
-       button.SetTogglableButton( bSetTogglable );
+       
+       button.SetProperty( Button::Property::TOGGLABLE, bSetTogglable );
        button.StateChangedSignal().Connect( &CbButtonSelected );
        
-       bIsTogglable = button.IsTogglableButton();
-       DALI_CHECK_FAIL(bSetTogglable != bIsTogglable, "SetTogglableButton and IsTogglableButton value does not match properly");
+       bIsTogglable = button.GetProperty<bool>( Button::Property::TOGGLABLE );
+       DALI_CHECK_FAIL( bSetTogglable != bIsTogglable, "Button::Property::TOGGLABLE does not work properly" );
        
-       button.SetSelected( bSetSelected );
-       bIsSetSelected = button.IsSelected();
+       button.SetProperty( Button::Property::SELECTED, bSetSelected );
+       bIsSetSelected = button.GetProperty<bool>( Button::Property::SELECTED );
        
-       DALI_CHECK_FAIL(bSetSelected != bIsSetSelected, "SetSelected and IsSelected value does not match properly");
+       DALI_CHECK_FAIL( bSetSelected != bIsSetSelected, "Button::Property::SELECTED does not work properly");
        DALI_CHECK_FAIL(!g_bButtonSelectedState, "CbButtonSelected callback  is not called properly");
        
        Stage::GetCurrent().Remove( button );
        DaliLog::PrintPass();
 }
 
-void ButtonSetSelectedImage()
-{
-       string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE);
-       if(strActualPathOne=="")
-       {
-               LOG_E( "Unable to get resource path from app data directory." );
-               test_return_value=1;
-               return;
-       }
-       //SetDisabledSelectedImage
-       PushButton pushButton = PushButton::New();
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-       try
-       {
-               pushButton.SetDisabledSelectedImage( strActualPathOne );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetDisabledSelectedImage with image is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return;
-       }
-       //SetSelectedImage
-       Image imgset ;
-       imgset = ResourceImage::New( strActualPathOne);
-       DALI_CHECK_FAIL(!imgset, "ResourceImage::New() is failed");
-       Button pushButtonA = PushButton::New();
-       DALI_CHECK_FAIL(!pushButtonA,  "Button::New() is failed .");
-
-       Button pushButtonB = PushButton::New();
-       DALI_CHECK_FAIL(!pushButtonB,  "Button::New() is failed .");
-       
-       pushButtonA.SetSelectedImage( imgset ); 
-       Image imgGet = ImageView::DownCast(pushButtonA.GetSelectedImage()).GetImage();
-       DALI_CHECK_FAIL(imgGet != imgset ,  "Set/GetSelectedImage are mismatch.");
-       
-       try
-       {
-               pushButtonB.SetSelectedImage( strActualPathOne );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetSelectedImage with image is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return;
-       }
-       //SetUnselectedImage
-       Button pushButtonC = PushButton::New();
-       try
-       {
-               pushButtonC.SetUnselectedImage( strActualPathOne );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetUnselectedImage with image is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return;
-       }
-       strActualPathOne.clear();
-       DaliLog::PrintPass();
-}
 
 void ButtonDisabledProperty()
 {
@@ -466,8 +382,8 @@ void ButtonAutoRepeatingProperty()
        button.SetProperty( button.GetPropertyIndex("autoRepeating"), true );
        DALI_CHECK_FAIL( button.GetProperty<bool>( button.GetPropertyIndex("autoRepeating")) != true, "GetAutoRepeating Property is failed." );
 
-       button.SetAutoRepeating( false );
-       DALI_CHECK_FAIL( button.IsAutoRepeating(), "SetAutoRepeating() is failed." );
+       button.SetProperty( Button::Property::AUTO_REPEATING, false);
+       DALI_CHECK_FAIL( button.GetProperty<bool>( Button::Property::AUTO_REPEATING ), "Button::Property::AUTO_REPEATING is failed." );
 
        DaliLog::PrintPass();
 }
@@ -539,37 +455,6 @@ int ITcButtonDowncast(void)
     return test_return_value;
 }
 
-//& purpose: Sets and Gets the Animation Time.
-//& type auto
-
-/**
-* @testcase                    ITcButtonSetGetAnimationTime
-* @since_tizen                 2.4
-* @type                                Positive
-* @description                 Sets and Gets the Animation Time.
-* @scenario                            Creates A Button instance. \n
-*                                              Sets the button Animation Time. \n
-*                                              Gets the Button Animation Time. \n
-*                                              Check that the Set and Get value. \n 
-* @apicovered                  Button::New(), SetAnimationTime, GetAnimationTime
-* @passcase                            If Sets and Gets the button Animation Time properly.
-* @failcase                            If fails to Set and Get the button  Animation Time.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcButtonSetGetAnimationTime(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       Button_TestApp testApp( application, BUTTON_SET_GET_ANIMATION_TIME );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
 //& purpose: Button Assignment Operator is checked.
 //& type auto 
 /**
@@ -641,9 +526,9 @@ int ITcButtonCopyConstructor(void)
 *                                              Sets the SetDisable property true. \n
 *                                              Checks the buttons current property by IsDisable api. \n
 *                                              Checks that they are equal or not. \n
-* @apicovered                  Button::New(),SetDisabled , IsDisabled
-* @passcase                            If SetDisabled and IsDisable value match properly.
-* @failcase                            If fails to match SetDisabled and IsDisable value  properly.
+* @apicovered                  Button::New(), Button::Property::DISABLED
+* @passcase                            If Button::Property::DISABLED works properly.
+* @failcase                            If fails not to work Button::Property::DISABLED properly.
 * @precondition                        NA
 * @postcondition               NA
 */
@@ -669,12 +554,12 @@ int ITcButtonSetIsDisabled(void)
 * @description                 Sets and Checks the button label text.
 * @scenario                            Creates A Button instance. \n
 *                                              Adds the button to the stage. \n
-*                                              Sets the SetLabelText with string. \n
-*                                              Checks the buttons current property by GetlabelText api. \n
+*                                              Sets the LabelText with string. \n
+*                                              Checks the buttons current property by Toolkit::Button::Property::LABEL. \n
 *                                              Checks that the string are equal or not. \n
-* @apicovered                  Button::New(), SetLabelText, GetlabelText
-* @passcase                            If SetLabelText and GetlabelText value match properly.
-* @failcase                            If fails to match SetLabelText and GetlabelText value  properly.
+* @apicovered                  Button::New(), Button::Property::LABEL
+* @passcase                            If Button::Property::LABEL is not working properly.
+* @failcase                            If fails to work Button::Property::LABEL properly.
 * @precondition                        NA
 * @postcondition               NA
 */
@@ -704,13 +589,13 @@ int ITcButtonSetGetLabelText(void)
 *                                              Connects the stateChangedsignal of the button. \n 
 *                                              Checks the buttons togglable property. \n
 *                                              Sets the selected property true. \n
-*                                              Checks the buttons current property by IsSelected api. \n
+*                                              Checks the buttons current property by Button::Property::SELECTED property. \n
 *                                              Checks that they are equal or not. \n
 *                                              Check the callback value of statechangedSignal. \n
-* @apicovered                  Button::New(),SetSelected , IsSelected , StateChangedSignal, SetTogglableButton , IsTogglableButton
+* @apicovered                  Button::New(),Button::Property::SELECTED, StateChangedSignal, Button::Property::TOGGLABLE
 * @passcase                            If all the conditions pass properly.
 * @failcase                            If any condition fails to give proper value.
-* @precondition                        SetTogglableButton must be set to true
+* @precondition                        Button::Property::TOGGLABLE must be set to true
 * @postcondition               NA
 */
 
@@ -725,36 +610,7 @@ int ITcButtonSetIsSelected(void)
 
     return test_return_value;
 }
-//& purpose: Sets and Checks the button  selected or unselected.
-//& type auto 
-/**
-* @testcase                    ITcButtonSetSelectedImage
-* @since_tizen                 3.0
-* @type                                Positive
-* @description                 Sets and Checks the button  selected or unselected.
-* @scenario                            Creates a Button instance. \n
-*                                              Adds the button to the stage. \n
-*                                              Set Disabled Selected Image. \n
-*                                              Set Selected Image. \n 
-*                                              Set Unselected Image.
-* @apicovered                  Button::New(),SetDisabledSelectedImage(),SetSelectedImage(),SetUnselectedImage()
-* @passcase                            If all the conditions pass properly.
-* @failcase                            If any condition fails to give proper value.
-* @precondition                        NA
-* @postcondition               NA
-*/
 
-int ITcButtonSetSelectedImage(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       Button_TestApp testApp( application, BUTTON_SET_SELECTED_IMAGE );
-       application.MainLoop();
-
-    return test_return_value;
-}
 
 //& purpose: To set and get the button as disabled.
 //& type auto
@@ -845,7 +701,7 @@ int ITcButtonSetDisabledWithDifferentStates02(void)
 * @type                                Positive
 * @description                 Sets and Gets the button set as auto repeating property.
 * @scenario                            To set and get the button auto repeating property.
-* @apicovered                  SetProperty(), GetProperty(), GetPropertyIndex(), IsAutoRepeating(), SetAutoRepeating()
+* @apicovered                  SetProperty(), GetProperty(), GetPropertyIndex(), Button::Property::AUTO_REPEATING
 * @passcase                            Set and get APIs for auto repeating property works properly
 * @failcase                            Set and get APIs for auto repeating property does not works properly
 * @precondition                        NA
index 33b48cf1688d48acdd0faf7079295a76efbad159..17d4d89c4296a0ef6a793cece1f4bec8491e3447 100755 (executable)
@@ -183,15 +183,18 @@ void ControlClearBackground()
        Control control = Control::New();
        DALI_CHECK_FAIL( !control, "Control::New() is failed.");
        
-       control.SetBackgroundColor(Color::MAGENTA);
-       Vector4 vec4GetBackgroundColor = control.GetBackgroundColor();  
-       DALI_CHECK_FAIL( vec4GetBackgroundColor != Color::MAGENTA, "Control::SetBackground() is failed." );
-       
+       control.SetBackgroundColor( Color::MAGENTA );
+       Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
+       Property::Map* resultMap = propValue.GetMap();
+       DALI_CHECK_FAIL( resultMap->Find( ColorVisual::Property::MIX_COLOR ) == NULL, "Control::SetBackgroundColor() is failed." );
+
+       Vector4 color;
+       resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get( color );
+       DALI_CHECK_FAIL( color != Color::MAGENTA, "Control Background Color is not MAGENTA." );
+
        control.ClearBackground();
-       Vector4 vec4GetBackgroundColor2 = control.GetBackgroundColor();
-       
-       DALI_CHECK_FAIL( vec4GetBackgroundColor == vec4GetBackgroundColor2, "Control::ClearBackground() is failed." );
-       
+       DALI_CHECK_FAIL( control.GetRendererCount() != 0u, "Control::ClearBackground() is failed." );
+       
        DaliLog::PrintPass();
 }
 
@@ -374,29 +377,21 @@ void ControlSetGetStyleName()
 
 void ControlSetBackgroundImageColor()
 {
-       string strActualPathOne=getResourceFullPath(CONTROL_IMAGE_NAME);
-       if(strActualPathOne=="")
-       {
-               LOG_E( "Unable to get resource path from app data directory." );
-               test_return_value=1;
-               return;
-       }
-
        Control control = Control::New();
-       DALI_CHECK_FAIL(!control, "Control::New() is failed." );
-
-       DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::TRANSPARENT, "Control New instance Background Color is not Transparent." );
-
-       Image image = ResourceImage::New(strActualPathOne);
-       control.SetBackgroundImage( image );
+       DALI_CHECK_FAIL( !control, "Control::New() is failed." );
 
        control.SetBackgroundColor( Color::GREEN );
-       DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::GREEN, "Control Background Color is not GREEN." );
+       Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
+       Property::Map* resultMap = propValue.GetMap();
+       DALI_CHECK_FAIL( resultMap->Find( ColorVisual::Property::MIX_COLOR ) == NULL, "Control::SetBackgroundColor() is failed." );
+
+       Vector4 color;
+       resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get( color );
+       DALI_CHECK_FAIL( color != Color::GREEN, "Control Background Color is not GREEN." );
 
        control.ClearBackground();
-       DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::TRANSPARENT, "Control Background Color is not TRANSPARENT after Clear." );
-       
-       strActualPathOne.clear();
+       DALI_CHECK_FAIL( control.GetRendererCount() != 0u, "Control::ClearBackground() is failed." );
+
        DaliLog::PrintPass();
 }
 
@@ -457,7 +452,7 @@ void ControlKeyInputFocusLostSignal()
 *                                              Check if the Background is set or not \n
 *                       Clear the backgorund of control handle \n
 *                       In this condition get the background color and compare with previous background color MAGENTA
-* @apicovered                  Control::New(), Control::ClearBackground(), Control::SetBackgroundColor(), Control::GetBackgroundColor()
+* @apicovered                  Control::New(), Control::ClearBackground(), Control::SetBackgroundColor(), Control::Property::BACKGROUND
 * @passcase                            if vec4GetBackgroundColor and vec4GetBackgroundColor2 do not matches, i.e. background is cleared properly
 * @failcase                            if vec4GetBackgroundColor and vec4GetBackgroundColor2 matches, i.e. background is not cleared properly
 * @precondition                        NA
@@ -777,7 +772,7 @@ int ITcControlSetGetStyleName(void)
 *                                                      Set a Image to Background Image of control and check the background color is white or not for image. \n
 *                                                      Set Background color to Green and Check is it cnage the Control Background to Green or Not.  \n
 *                                                      Finally clear background and make Control background again to Transparent.
-* @apicovered                          Control::New, SetBackgroundImage, GetBackgroundColor, ClearBackground
+* @apicovered                          Control::New, ClearBackground, Control::Property::BACKGROUND
 * @passcase                                    If Set Background Image or color can change control background
 * @failcase                                    If Set Background Image or color can not change control background.
 * @precondition                                NA
index 21253cd521ba310bf8f95d30026ad2f5eb6e2bd3..d43c08975dfdce4ec9228769e141eecaab31f195 100755 (executable)
@@ -348,12 +348,9 @@ void ImageViewSetGetProperty()
        DALI_CHECK_FAIL( !imageViewDown, "ImageView::DownCast() is failed." );
 
        
-       Image imageBackground = CreateBufferImageForImageView( g_widthBackground, g_heightBackground, Vector4(1.f, 1.f, 1.f, 1.f) );
        Image image = CreateBufferImageForImageView( g_width, g_height, Vector4(1.f, 1.f, 1.f, 1.f) );
 
        g_imageView = ImageView::New();
-       g_imageView.SetBackgroundImage( imageBackground );
-       
        g_imageView.SetImage( image );
        Image getImage=g_imageView.GetImage();
        DALI_CHECK_FAIL( !getImage, "ImageView::GetImage() is failed to get Image." );
index aadb6e3bca8827b1755a80e7e2d6c45be24dee90..5063647fd4da9da2b034ceab594c70d62d8e7ca5 100755 (executable)
@@ -39,15 +39,6 @@ void PushButtonDowncast();
 void PushButtonSetIsAutoRepeating();
 void PushButtonSetGetNextAutoRepeatingDelay();
 void PushButtonAssignmentOperator();
-void PushButtonSetBackgroundImageWithImage();
-void PushButtonSetGetButtonImageWithActor();
-void PushButtonSetBackgroundImageWithActor();
-void PushButtonSetSelectedImageWithImage();
-void PushButtonSetSelectedBackgroundImageWithImage();
-void PushButtonSetDisabledBackgroundImageWithImage();
-void PushButtonSetDisabledImageWithImage();
-void PushButtonSetDisabledBackgroundImageWithActor();
-void PushButtonSetSelectedImageWithActor();
 
 namespace
 {
@@ -58,16 +49,7 @@ namespace
                PUSH_BUTTON_SET_IS_AUTO_REPEATING,
                PUSH_BUTTON_COPY_CONSTRUCTOR_CREATE_SOLID_COLOR_ACTOR,
                PUSH_BUTTON_SET_GET_NEXT_AUTO_REPEATING_DELAY,
-               PUSH_BUTTON_ASSIGNMENT_OPERATOR,
-               PUSH_BUTTON_SET_BACKGROUND_IMAGE_WITH_IMAGE,
-               PUSH_BUTTON_SET_GET_BUTTON_IMAGE_WITH_ACTOR,
-               PUSH_BUTTON_SET_BACKGROUND_IMAGE_WITH_ACTOR,
-               PUSH_BUTTON_SET_SELECTED_IMAGE_WITH_IMAGE,
-               PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_WITH_IMAGE,
-               PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_WITH_IMAGE,
-               PUSH_BUTTON_SET_DISABLED_IMAGE_WITH_IMAGE,
-               PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_WITH_ACTOR,
-               PUSH_BUTTON_SET_SELECTED_IMAGE_WITH_ACTOR
+               PUSH_BUTTON_ASSIGNMENT_OPERATOR
        };
 
        struct PushButton_TestApp : public ConnectionTracker
@@ -117,42 +99,7 @@ namespace
                          case PUSH_BUTTON_ASSIGNMENT_OPERATOR:
                          PushButtonAssignmentOperator();
                          break;
-                         
-                         case PUSH_BUTTON_SET_BACKGROUND_IMAGE_WITH_IMAGE:
-                         PushButtonSetBackgroundImageWithImage();
-                         break;
-                         
-                         case PUSH_BUTTON_SET_GET_BUTTON_IMAGE_WITH_ACTOR:
-                         PushButtonSetGetButtonImageWithActor();
-                         break;
-                         
-                         case PUSH_BUTTON_SET_BACKGROUND_IMAGE_WITH_ACTOR:
-                         PushButtonSetBackgroundImageWithActor();
-                         break;
-                         
-                         case PUSH_BUTTON_SET_SELECTED_IMAGE_WITH_IMAGE:
-                         PushButtonSetSelectedImageWithImage();
-                         break;
-                         
-                         case PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_WITH_IMAGE:
-                         PushButtonSetSelectedBackgroundImageWithImage();
-                         break;
-                         
-                         case PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_WITH_IMAGE:
-                         PushButtonSetDisabledBackgroundImageWithImage();
-                         break;
-                         
-                         case PUSH_BUTTON_SET_DISABLED_IMAGE_WITH_IMAGE:
-                         PushButtonSetDisabledImageWithImage();
-                         break;
-                         
-                         case PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_WITH_ACTOR:
-                         PushButtonSetDisabledBackgroundImageWithActor();
-                         break;
-                         
-                         case PUSH_BUTTON_SET_SELECTED_IMAGE_WITH_ACTOR:
-                         PushButtonSetSelectedImageWithActor();
-                         break;
+
                  }
          }
 
@@ -180,14 +127,14 @@ void PushButtonSetGetInitialAutoRepeatingDelay()
        PushButton pushButton = PushButton::New();
        
        DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
+
+       pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsRepeating );
+
+       pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, fSetAutoRepeat );
        
-       pushButton.SetAutoRepeating(bIsRepeating);
-       
-       pushButton.SetInitialAutoRepeatingDelay(fSetAutoRepeat);
-       
-       fGetInitRepeatTime = pushButton.GetInitialAutoRepeatingDelay();
+       fGetInitRepeatTime = pushButton.GetProperty<float>( Button::Property::INITIAL_AUTO_REPEATING_DELAY );
        
-       DALI_CHECK_FAIL(fGetInitRepeatTime != fSetAutoRepeat,  " SetInitialAutoRepeatingDelay and GetInitialAutoRepeatingDelay is not match properly .");       
+       DALI_CHECK_FAIL( fGetInitRepeatTime != fSetAutoRepeat, "Button::Property::INITIAL_AUTO_REPEATING_DELAY is not match properly .");
        
        DaliLog::PrintPass();
 }
@@ -213,17 +160,17 @@ void PushButtonSetIsAutoRepeating()
 {
        bool bAutoRepeatCheck = false ;
        bool bIsAutoRepeat = true;
-       
+
        PushButton pushButton = PushButton::New();
-       
+
        DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
 
-       pushButton.SetAutoRepeating(bIsAutoRepeat);
-                   
-       bAutoRepeatCheck = pushButton.IsAutoRepeating();
-               
-       DALI_CHECK_FAIL(!bAutoRepeatCheck,  "SetAutoRepeating and IsAutoRepeating is not working properly");    
-                                 
+       pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsAutoRepeat );
+
+       bAutoRepeatCheck = pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING );
+
+       DALI_CHECK_FAIL( !bAutoRepeatCheck,  "Button::Property::AUTO_REPEATING is not working properly");
+
        DaliLog::PrintPass();
 }
 
@@ -234,18 +181,18 @@ void PushButtonSetGetNextAutoRepeatingDelay()
        bool bIsRepeating = true   ;
        
        PushButton pushButton = PushButton::New();
+
+       DALI_CHECK_FAIL( !pushButton,  "PushButton::New() is failed ." );
+
+       pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsRepeating );
+
+       DALI_CHECK_FAIL( !pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), "Button::Property::AUTO_REPEATING is failed." );
+
+       pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, fSetNextAutoRepeat );
+
+       fGetNextRepeatTime = pushButton.GetProperty<float>( Button::Property::NEXT_AUTO_REPEATING_DELAY );
        
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-       
-       pushButton.SetAutoRepeating(bIsRepeating);
-       
-       DALI_CHECK_FAIL(!pushButton.IsAutoRepeating(),  " SetAutoRepeating is failed.");
-               
-       pushButton.SetNextAutoRepeatingDelay(fSetNextAutoRepeat);
-               
-       fGetNextRepeatTime = pushButton.GetNextAutoRepeatingDelay();
-       
-       DALI_CHECK_FAIL(fGetNextRepeatTime != fSetNextAutoRepeat,  "SetNextAutoRepeatingDelay and GetNextAutoRepeatingDelay is not match properly.");   
+       DALI_CHECK_FAIL( fGetNextRepeatTime != fSetNextAutoRepeat, "Button::Property::NEXT_AUTO_REPEATING_DELAY is not match properly.");       
                          
        DaliLog::PrintPass();   
 }
@@ -263,301 +210,6 @@ void PushButtonAssignmentOperator()
        DaliLog::PrintPass();
 }
 
-void PushButtonSetBackgroundImageWithImage()
-{
-       string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-       if(strActualPathOne=="")
-       {
-               LOG_E( "Unable to get resource path from app data directory." );
-               test_return_value=1;
-               return;
-       }
-
-       PushButton pushButton = PushButton::New();
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-       
-       try
-       {
-               pushButton.SetBackgroundImage( strActualPathOne );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetBackgroundImage with image is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return; 
-       }
-       strActualPathOne.clear();
-       DaliLog::PrintPass();
-}
-
-void PushButtonSetGetButtonImageWithActor()
-{
-       Image imgset ;
-       DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-       
-       ImageView imgViewSet = ImageView::New(imgset);
-       DALI_CHECK_FAIL(!imgViewSet,  "ImageView::New() is failed .");
-       
-       Vector3 vectfGetImgSize;
-       PushButton pushButton = PushButton::New();
-       Stage::GetCurrent().Add( pushButton );
-       
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-       
-       pushButton.SetButtonImage( imgViewSet );
-       
-       ImageView imageView = ImageView::DownCast( pushButton.GetButtonImage() );
-       DALI_CHECK_FAIL(!imageView, "GetSelectedImage is failed.");
-
-       ResourceImage resourceImage = ResourceImage::DownCast( imgset );
-       DALI_CHECK_FAIL(!resourceImage, "DownCast to ResourceImage is failed.");
-
-       Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-       Property::Map map;
-       value.Get( map );
-       DALI_CHECK_FAIL( map.Empty(), "Map is empty." );
-       DALI_CHECK_FAIL( map[ "filename" ].Get<std::string>() != resourceImage.GetUrl(), "SetSelectedImage and GetSelectedImage is not Matched properly." );
-       DaliLog::PrintPass();
-}
-
-void PushButtonSetBackgroundImageWithActor()
-{
-       Image imgset ;
-       DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-       ImageView imgViewSet = ImageView::New(imgset);
-       
-       DALI_CHECK_FAIL(!imgViewSet,  "ImageView::New() is failed .");
-       
-       PushButton pushButton = PushButton::New();
-       Stage::GetCurrent().Add( pushButton );
-       
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-       
-       pushButton.SetBackgroundImage( imgViewSet );
-       try
-       {
-               pushButton.SetBackgroundImage( imgViewSet );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetBackgroundImage with actor is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return; 
-       }
-               
-       DaliLog::PrintPass();
-}
-
-void PushButtonSetSelectedImageWithImage()
-{
-       Image imgset ;
-       DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-       
-       PushButton pushButton = PushButton::New();
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-       
-       pushButton.SetSelectedImage( imgset );
-
-       ImageView imageView = ImageView::DownCast( pushButton.GetSelectedImage() );
-       DALI_CHECK_FAIL(!imageView, "GetSelectedImage is failed.");
-
-       ResourceImage resourceImage = ResourceImage::DownCast( imgset );
-       DALI_CHECK_FAIL(!resourceImage, "DownCast to ResourceImage is failed.");
-
-       Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-       Property::Map map;
-       value.Get( map );
-       DALI_CHECK_FAIL( map.Empty(), "Map is empty." );
-       DALI_CHECK_FAIL( map[ "filename" ].Get<std::string>() != resourceImage.GetUrl(), "SetSelectedImage and GetSelectedImage is not Matched properly." );
-
-       DaliLog::PrintPass();
-}
-
-void PushButtonSetSelectedBackgroundImageWithImage()
-{
-       string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-       if(strActualPathOne=="")
-       {
-               LOG_E( "Unable to get resource path from app data directory." );
-               test_return_value=1;
-               return;
-       }
-
-       PushButton pushButton = PushButton::New();
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-       try
-       {
-               pushButton.SetSelectedBackgroundImage( strActualPathOne );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetSelectedBackgroundImage with image is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return; 
-       }
-       strActualPathOne.clear();       
-       DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledBackgroundImageWithImage()
-{
-       string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-       if(strActualPathOne=="")
-       {
-               LOG_E( "Unable to get resource path from app data directory." );
-               test_return_value=1;
-               return;
-       }
-
-       PushButton pushButton = PushButton::New();
-       
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-               
-       
-       try
-       {
-               pushButton.SetDisabledBackgroundImage( strActualPathOne );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetDisabledBackgroundImage with image is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return; 
-       }
-       strActualPathOne.clear();
-       DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledImageWithImage()
-{
-       string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-       if(strActualPathOne=="")
-       {
-               LOG_E( "Unable to get resource path from app data directory." );
-               test_return_value=1;
-               return;
-       }
-
-       PushButton pushButton = PushButton::New();
-       DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-       
-       try
-       {
-               pushButton.SetDisabledImage( strActualPathOne );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetDisabledImage with image is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return;
-       }
-       
-       PushButton pushButtonA = PushButton::New();
-       DALI_CHECK_FAIL(!pushButtonA,  "PushButton::New() is failed .");
-
-       try
-       {
-               pushButtonA.SetDisabledSelectedImage( strActualPathOne );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetDisabledSelectedImage with image is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return;
-       }
-       Image imgset ;
-       DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-       Actor imgActorSet = ImageView::New(imgset);
-       DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
-
-       PushButton pushButtonB = PushButton::New();
-       DALI_CHECK_FAIL(!pushButtonB, "PushButton::New() is failed .");
-
-       try
-       {
-               pushButtonB.SetDisabledSelectedImage( imgActorSet );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetDisabledSelectedImage with actor is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return;
-       }
-       strActualPathOne.clear();
-       DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledBackgroundImageWithActor()
-{
-       Image imgset ;
-       
-       DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-       
-       ImageView imgViewSet = ImageView::New(imgset);
-       
-       DALI_CHECK_FAIL(!imgViewSet,  "ImageView::New() is failed .");
-                               
-       PushButton pushButton = PushButton::New();
-                       
-       DALI_CHECK_FAIL(!pushButton, "PushButton::New() is failed .");
-                       
-       pushButton.SetDisabledBackgroundImage( imgViewSet );
-       try
-       {
-               pushButton.SetDisabledBackgroundImage( imgViewSet );
-       }
-       catch(DaliException& de)
-       {
-               LOG_E("SetDisabledBackgroundImage with actor is failed.");
-               DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-               test_return_value=1;
-               return; 
-       }               
-                                       
-       DaliLog::PrintPass();
-}
-
-void PushButtonSetSelectedImageWithActor()
-{
-       Image imgset ;
-       
-       DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-       
-       ImageView imgViewSet = ImageView::New(imgset);
-       
-       DALI_CHECK_FAIL(!imgViewSet,  "ImageView::New() is failed .");
-                               
-       PushButton pushButton = PushButton::New();
-                       
-       DALI_CHECK_FAIL(!pushButton, "PushButton::New() is failed .");
-                       
-       pushButton.SetSelectedImage( imgViewSet );
-       
-       ImageView imageView = ImageView::DownCast( pushButton.GetSelectedImage() );
-       DALI_CHECK_FAIL(!imageView, "GetSelectedImage is failed.");
-
-       ResourceImage resourceImage = ResourceImage::DownCast( imgset );
-       DALI_CHECK_FAIL(!resourceImage, "DownCast to ResourceImage is failed.");
-
-       Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
-       Property::Map map;
-       value.Get( map );
-       DALI_CHECK_FAIL( map.Empty(), "Map is empty." );
-       DALI_CHECK_FAIL( map[ "filename" ].Get<std::string>() != resourceImage.GetUrl(), "SetSelectedImage and GetSelectedImage is not Matched properly." );
-       
-       DaliLog::PrintPass();
-}
 
 /**
  * End of TC Logic Implementation Area.
@@ -576,7 +228,7 @@ void PushButtonSetSelectedImageWithActor()
 *                                              Set auto repeating to true\n
 *                                              Sets the initial autorepeating delay.\n
 *                                              Checks the set initial auto repeating delay get or not\n
-* @apicovered                  PushButton::New(), SetInitialAutoRepeatingDelay,GetInitialAutoRepeatingDelay,SetAutoRepeating
+* @apicovered                  PushButton::New(),Button::Property::INITIAL_AUTO_REPEATING_DELAY,Button::Property::AUTO_REPEATING
 * @passcase                            If Sets the initial autorepeating delay successfully .
 * @failcase                            If Fail to Set the initial autorepeating delay property.
 * @precondition                        NA
@@ -633,7 +285,7 @@ int ITcPushButtonDowncast(void)
 * @scenario                            Add button to popup\n
 *                                              Sets the autorepeating property. successfully\n
 *                                              Checks the Auto repeating delay\n
-* @apicovered                  PushButton::New(), SetAutoRepeating,IsAutoRepeating
+* @apicovered                  PushButton::New(), Button::Property::AUTO_REPEATING
 * @passcase                            If Sets the autorepeating property successfully .
 * @failcase                            If Fail to Sets the autorepeating property.
 * @precondition                        NA
@@ -663,7 +315,7 @@ int ITcPushButtonSetIsAutoRepeating(void)
 *                                              Set auto repeting to true\n
 *                                              Sets the Next autorepeating delay.\n
 *                                              Checks the set Next auto repeating delay get or not\n
-* @apicovered                  PushButton::New(), SetNextAutoRepeatingDelay,GetNextAutoRepeatingDelay,SetAutoRepeating
+* @apicovered                  PushButton::New(), Button::Property::NEXT_AUTO_REPEATING_DELAY,Button::Property::AUTO_REPEATING
 * @passcase                            If Sets and Gets the Next autorepeating delay successfully .
 * @failcase                            If Fail to Set and Get the Next autorepeating delay property.
 * @precondition                        NA
@@ -709,270 +361,6 @@ int ITcPushButtonAssignmentOperator(void)
     return test_return_value;
 }
 
-
-//& purpose: Sets and gets the background image.
-//& type: auto
-/**
-* @testcase                    ITcPushButtonSetBackgroundImageWithImage
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets the background image. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the background image. \n
-* @apicovered                  PushButton::New(),SetBackgroundImage
-* @passcase                            If Sets the background image successfully.
-* @failcase                            If Fails to Setthe background image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-int ITcPushButtonSetBackgroundImageWithImage(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_BACKGROUND_IMAGE_WITH_IMAGE );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
-//& purpose: Sets and Get  the button image with Actor.
-//& type: auto
-
-/**
-* @testcase                    ITcPushButtonSetGetButtonImageWithActor
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets the button image. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the button image.\n
-*                                              Gets the button image. \n
-* @apicovered                  PushButton::New(),SetButtonImage,GetButtonImage
-* @passcase                            If Sets the button image successfully.
-* @failcase                            If Fail to Sets the button image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcPushButtonSetGetButtonImageWithActor(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_GET_BUTTON_IMAGE_WITH_ACTOR );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
-//& purpose: Sets and gets the background image with Actor.
-//& type: auto
-
-/**
-* @testcase                    ITcPushButtonSetBackgroundImageWithActor
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets the background image. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the background image. \n
-* @apicovered                  PushButton::New(),SetBackgroundImage,GetBackgroundImage
-* @passcase                            If Sets the background image successfully.
-* @failcase                            If Fails to Setthe background image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcPushButtonSetBackgroundImageWithActor(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_BACKGROUND_IMAGE_WITH_ACTOR );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
-//& purpose: Sets and Get  the button selected image with image.
-//& type: auto
-
-/**
-* @testcase                    ITcPushButtonSetSelectedImageWithImage
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets and Get  the button selected image with image. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the button selected image.\n
-*                                              Gets the button selected image. \n      
-* @apicovered                  PushButton::New(),SetSelectedImage,GetSelectedImage
-* @passcase                            If Sets the button selected image successfully.
-* @failcase                            If Fail to Set the button selected  image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcPushButtonSetSelectedImageWithImage(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_SELECTED_IMAGE_WITH_IMAGE );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
-//& purpose: Sets and Get  the button selected background image with image.
-//& type: auto
-
-/**
-* @testcase                    ITcPushButtonSetSelectedBackgroundImageWithImage
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets and Get  the button selected background image with image. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the button selected background image.\n    
-* @apicovered                  PushButton::New(),SetSelectedBackgroundImage
-* @passcase                            If Sets the button selected background image successfully.
-* @failcase                            If Fail to Set the button selected background image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcPushButtonSetSelectedBackgroundImageWithImage(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_WITH_IMAGE );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
-//& purpose: Sets and Get  the button disabled background image with image.
-//& type: auto
-
-/**
-* @testcase                    ITcPushButtonSetDisabledBackgroundImageWithImage
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets and Get  the button disabled image with image. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the button disabled background image.\n
-*                                              Gets the button disabled background  image. \n  
-* @apicovered                  PushButton::New(),SetDisabledBackgroundImage
-* @passcase                            If Sets the button disabled background image successfully.
-* @failcase                            If Fail to Set the button disabled background image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcPushButtonSetDisabledBackgroundImageWithImage(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_WITH_IMAGE );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
-//& purpose: Sets and Get  the button disabled  image with image.
-//& type: auto
-
-/**
-* @testcase                    ITcPushButtonSetDisabledImageWithImage
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets and Get  the button disabled image with image. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the button disabled  image.\n
-* @apicovered                  PushButton::New(),SetDisabledImage,GetDisabledImage,SetDisabledSelectedImage
-* @passcase                            If Sets the button disabled  image successfully.
-* @failcase                            If Fail to Set the button disabled  image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcPushButtonSetDisabledImageWithImage(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_IMAGE_WITH_IMAGE );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
-//& purpose: Sets and Get  the button disabled background image with actor.
-//& type: auto
-
-/**
-* @testcase                    ITcPushButtonSetDisabledBackgroundImageWithActor
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets and Get  the button disabled background image with actor. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the button disabled background  image.\n
-* @apicovered                  PushButton::New(),SetDisabledBackgroundImage
-* @passcase                            If Sets the button disabled background  image successfully.
-* @failcase                            If Fail to Set the button disabled  background image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcPushButtonSetDisabledBackgroundImageWithActor(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_WITH_ACTOR );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
-//& purpose: Sets and Get  the button selected  image with actor.
-//& type: auto
-
-/**
-* @testcase                    ITcPushButtonSetSelectedImageWithActor
-* @since_tizen                         2.4
-* @type                                Positive
-* @description                 Sets and Get  the button selected  image with actor. 
-* @scenario                            Create a PushButton instance; \n
-*                                              Sets the button selected   image.\n
-*                                              Gets the button selected    image. \n   
-* @apicovered                  PushButton::New(),SetSelectedImage,GetSelectedImage
-* @passcase                            If Sets the button selected   image successfully.
-* @failcase                            If Fail to Set the button selected   image.
-* @precondition                        NA
-* @postcondition               NA
-*/
-
-int ITcPushButtonSetSelectedImageWithActor(void)
-{
-       DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-       Application application = Application::New( &gArgc, &gArgv );
-       CHECK_OPEN_GL(SUITE_NAME,__LINE__)
-       PushButton_TestApp testApp( application, PUSH_BUTTON_SET_SELECTED_IMAGE_WITH_ACTOR );
-       application.MainLoop();
-
-    return test_return_value;
-}
-
 /** @} */ // end of itc-push-button-testcases
 /** @} */ // end of itc-push-button
 /** @} */ // end of itc-dali-toolkit
index 980cb1e252f7413092489e0c2da6d56799d13d1d..4259dba06d2a1172958133f86985473662a97970 100755 (executable)
@@ -166,18 +166,18 @@ void RadioButtonSelected()
        RadioButton radioButton = RadioButton::New(SRT_LABEL);
        DALI_CHECK_FAIL(!radioButton, "RadioButton::New(const std::string& label) is failed" );
        
-       bool bDefaultTRadioButton = radioButton.IsSelected();
+       bool bDefaultTRadioButton = radioButton.GetProperty<bool>( Button::Property::SELECTED );
        DALI_CHECK_FAIL(bDefaultTRadioButton != false, "RadioButton state should be Selected by default but this RadioButton is not selected ");
                
-       radioButton.SetSelected( !bSetSelected );
+       radioButton.SetProperty( Button::Property::SELECTED, !bSetSelected );
        
-       bGetSelected = radioButton.IsSelected();
-       DALI_CHECK_FAIL( bGetSelected, "radioButton.SetSelected() is failed to set false" );
+       bGetSelected = radioButton.GetProperty<bool>( Button::Property::SELECTED );
+       DALI_CHECK_FAIL( bGetSelected, "Button::Property::SELECTED is failed to set false" );
        
-       radioButton.SetSelected( bSetSelected );
+       radioButton.SetProperty( Button::Property::SELECTED, bSetSelected );
 
-       bGetSelected = radioButton.IsSelected();
-       DALI_CHECK_FAIL( !bGetSelected, "radioButton.SetSelected() is failed to set true" );
+       bGetSelected = radioButton.GetProperty<bool>( Button::Property::SELECTED );
+       DALI_CHECK_FAIL( !bGetSelected, "Button::Property::SELECTED is failed to set true" );
        
        DaliLog::PrintPass();
        
@@ -192,15 +192,29 @@ void RadioButtonSetGetLabelText()
        RadioButton radioButton = RadioButton::New(STR_ONE);
        DALI_CHECK_FAIL(!radioButton, "RadioButton::New() is failed" );
        
-       strGetLabelTextOne = radioButton.GetLabelText();
-       DALI_CHECK_FAIL(STR_ONE != strGetLabelTextOne, "Retrieved label text using GetLabelText() api doesn't match with set label text." );
+       Property::Value value = radioButton.GetProperty( Toolkit::Button::Property::LABEL );
+       Property::Map *labelProperty = value.GetMap();
+    if ( labelProperty )
+    {
+      Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
+      value->Get( strGetLabelTextOne );
+    }
+
+       DALI_CHECK_FAIL(STR_ONE != strGetLabelTextOne, "Retrieved label text using Toolkit::Button::Property::LABEL doesn't match with set label text." );
        
        RadioButton radioButtonTwo = RadioButton::New();
        DALI_CHECK_FAIL(!radioButtonTwo, "RadioButton::New() is failed" );
-       radioButtonTwo.SetLabelText(SRT_TWO);
+       radioButtonTwo.SetProperty( Button::Property::LABEL, SRT_TWO );
        
-       strGetLabelTextTwo = radioButtonTwo.GetLabelText();
-       DALI_CHECK_FAIL(SRT_TWO != strGetLabelTextTwo, "Retrieved label text using GetLabelText() api doesn't match label text set by SetLabelText() api");
+       value = radioButtonTwo.GetProperty( Toolkit::Button::Property::LABEL );
+       labelProperty = value.GetMap();
+       if ( labelProperty )
+    {
+      Property::Value* value1 = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
+      value1->Get( strGetLabelTextTwo );
+    }
+
+       DALI_CHECK_FAIL(SRT_TWO != strGetLabelTextTwo, "Retrieved label text using Toolkit::Button::Property::LABEL doesn't match label text");
        
        DaliLog::PrintPass();
 }
@@ -344,9 +358,9 @@ int ITcRadioButtonSelected(void)
 *                                              Set label text to the new radio button \n
 *                                      Get the label text of the new radio button \n
 *                                              Check if the label text is matched to the set label text \n  
-* @apicovered                  RadioButton::New(),radioButton::GetLabelText(), radioButton::SetLabelText() 
-* @passcase                            If GetLabelText and SetLabelText is matched.
-* @failcase                            If fails to match GetLabelText and SetLabelText.
+* @apicovered                  RadioButton::New(),Button::Property::LABEL
+* @passcase                            If Button::Property::LABEL is working.
+* @failcase                            If fails to work Button::Property::LABEL.
 * @precondition                        NA
 * @postcondition               NA
 */
index 0f8162688110e83763aa4ba1c916ed1aff375b8d..ab8bf6458f012db9931dc779493322ed0233da79 100755 (executable)
@@ -112,13 +112,11 @@ extern int ITcAlignmentSetGetAlignmentType(void);
 extern int ITcAlignmentSetGetScaling(void);
 extern int ITcAlignmentSetGetPadding(void);
 extern int ITcButtonDowncast(void);
-extern int ITcButtonSetGetAnimationTime(void);
 extern int ITcButtonAssignmentOperator(void);
 extern int ITcButtonCopyConstructor(void);
 extern int ITcButtonSetIsDisabled(void);
 extern int ITcButtonSetGetLabelText(void);
 extern int ITcButtonSetIsSelected(void);
-extern int ITcButtonSetSelectedImage(void);
 extern int ITcButtonDisabledProperty(void);
 extern int ITcButtonSetDisabledWithDifferentStates01(void);
 extern int ITcButtonSetDisabledWithDifferentStates02(void);
@@ -237,15 +235,6 @@ extern int ITcPushButtonDowncast(void);
 extern int ITcPushButtonSetIsAutoRepeating(void);
 extern int ITcPushButtonSetGetNextAutoRepeatingDelay(void);
 extern int ITcPushButtonAssignmentOperator(void);
-extern int ITcPushButtonSetBackgroundImageWithImage(void);
-extern int ITcPushButtonSetGetButtonImageWithActor(void);
-extern int ITcPushButtonSetBackgroundImageWithActor(void);
-extern int ITcPushButtonSetSelectedImageWithImage(void);
-extern int ITcPushButtonSetSelectedBackgroundImageWithImage(void);
-extern int ITcPushButtonSetDisabledBackgroundImageWithImage(void);
-extern int ITcPushButtonSetDisabledImageWithImage(void);
-extern int ITcPushButtonSetDisabledBackgroundImageWithActor(void);
-extern int ITcPushButtonSetSelectedImageWithActor(void);
 extern int ITcRadioButtonDownCast(void);
 extern int ITcRadioButtonCopyConstructor(void);
 extern int ITcRadioButtonAssignmentOperator(void);
@@ -399,13 +388,11 @@ testcase tc_array[] = {
        {"ITcAlignmentSetGetScaling",ITcAlignmentSetGetScaling,ITs_alignment_startup,ITs_alignment_cleanup},
        {"ITcAlignmentSetGetPadding",ITcAlignmentSetGetPadding,ITs_alignment_startup,ITs_alignment_cleanup},
        {"ITcButtonDowncast",ITcButtonDowncast,ITs_button_startup,ITs_button_cleanup},
-       {"ITcButtonSetGetAnimationTime",ITcButtonSetGetAnimationTime,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonAssignmentOperator",ITcButtonAssignmentOperator,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonCopyConstructor",ITcButtonCopyConstructor,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetIsDisabled",ITcButtonSetIsDisabled,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetGetLabelText",ITcButtonSetGetLabelText,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetIsSelected",ITcButtonSetIsSelected,ITs_button_startup,ITs_button_cleanup},
-       {"ITcButtonSetSelectedImage",ITcButtonSetSelectedImage,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonDisabledProperty",ITcButtonDisabledProperty,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetDisabledWithDifferentStates01",ITcButtonSetDisabledWithDifferentStates01,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetDisabledWithDifferentStates02",ITcButtonSetDisabledWithDifferentStates02,ITs_button_startup,ITs_button_cleanup},
@@ -524,15 +511,6 @@ testcase tc_array[] = {
        {"ITcPushButtonSetIsAutoRepeating",ITcPushButtonSetIsAutoRepeating,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcPushButtonSetGetNextAutoRepeatingDelay",ITcPushButtonSetGetNextAutoRepeatingDelay,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcPushButtonAssignmentOperator",ITcPushButtonAssignmentOperator,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetBackgroundImageWithImage",ITcPushButtonSetBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetGetButtonImageWithActor",ITcPushButtonSetGetButtonImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetBackgroundImageWithActor",ITcPushButtonSetBackgroundImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedImageWithImage",ITcPushButtonSetSelectedImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedBackgroundImageWithImage",ITcPushButtonSetSelectedBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledBackgroundImageWithImage",ITcPushButtonSetDisabledBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledImageWithImage",ITcPushButtonSetDisabledImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledBackgroundImageWithActor",ITcPushButtonSetDisabledBackgroundImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedImageWithActor",ITcPushButtonSetSelectedImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcRadioButtonDownCast",ITcRadioButtonDownCast,ITs_radio_button_startup,ITs_radio_button_cleanup},
        {"ITcRadioButtonCopyConstructor",ITcRadioButtonCopyConstructor,ITs_radio_button_startup,ITs_radio_button_cleanup},
        {"ITcRadioButtonAssignmentOperator",ITcRadioButtonAssignmentOperator,ITs_radio_button_startup,ITs_radio_button_cleanup},
index f42893780fc4b3416c26649263ef0f07251c4229..3bb0f6b7d80e1c48cb39759186e2a10a0643e591 100755 (executable)
@@ -112,13 +112,11 @@ extern int ITcAlignmentSetGetAlignmentType(void);
 extern int ITcAlignmentSetGetScaling(void);
 extern int ITcAlignmentSetGetPadding(void);
 extern int ITcButtonDowncast(void);
-extern int ITcButtonSetGetAnimationTime(void);
 extern int ITcButtonAssignmentOperator(void);
 extern int ITcButtonCopyConstructor(void);
 extern int ITcButtonSetIsDisabled(void);
 extern int ITcButtonSetGetLabelText(void);
 extern int ITcButtonSetIsSelected(void);
-extern int ITcButtonSetSelectedImage(void);
 extern int ITcButtonDisabledProperty(void);
 extern int ITcButtonSetDisabledWithDifferentStates01(void);
 extern int ITcButtonSetDisabledWithDifferentStates02(void);
@@ -236,15 +234,6 @@ extern int ITcPushButtonDowncast(void);
 extern int ITcPushButtonSetIsAutoRepeating(void);
 extern int ITcPushButtonSetGetNextAutoRepeatingDelay(void);
 extern int ITcPushButtonAssignmentOperator(void);
-extern int ITcPushButtonSetBackgroundImageWithImage(void);
-extern int ITcPushButtonSetGetButtonImageWithActor(void);
-extern int ITcPushButtonSetBackgroundImageWithActor(void);
-extern int ITcPushButtonSetSelectedImageWithImage(void);
-extern int ITcPushButtonSetSelectedBackgroundImageWithImage(void);
-extern int ITcPushButtonSetDisabledBackgroundImageWithImage(void);
-extern int ITcPushButtonSetDisabledImageWithImage(void);
-extern int ITcPushButtonSetDisabledBackgroundImageWithActor(void);
-extern int ITcPushButtonSetSelectedImageWithActor(void);
 extern int ITcRadioButtonDownCast(void);
 extern int ITcRadioButtonCopyConstructor(void);
 extern int ITcRadioButtonAssignmentOperator(void);
@@ -391,13 +380,11 @@ testcase tc_array[] = {
        {"ITcAlignmentSetGetScaling",ITcAlignmentSetGetScaling,ITs_alignment_startup,ITs_alignment_cleanup},
        {"ITcAlignmentSetGetPadding",ITcAlignmentSetGetPadding,ITs_alignment_startup,ITs_alignment_cleanup},
        {"ITcButtonDowncast",ITcButtonDowncast,ITs_button_startup,ITs_button_cleanup},
-       {"ITcButtonSetGetAnimationTime",ITcButtonSetGetAnimationTime,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonAssignmentOperator",ITcButtonAssignmentOperator,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonCopyConstructor",ITcButtonCopyConstructor,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetIsDisabled",ITcButtonSetIsDisabled,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetGetLabelText",ITcButtonSetGetLabelText,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetIsSelected",ITcButtonSetIsSelected,ITs_button_startup,ITs_button_cleanup},
-       {"ITcButtonSetSelectedImage",ITcButtonSetSelectedImage,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonDisabledProperty",ITcButtonDisabledProperty,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetDisabledWithDifferentStates01",ITcButtonSetDisabledWithDifferentStates01,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetDisabledWithDifferentStates02",ITcButtonSetDisabledWithDifferentStates02,ITs_button_startup,ITs_button_cleanup},
@@ -515,15 +502,6 @@ testcase tc_array[] = {
        {"ITcPushButtonSetIsAutoRepeating",ITcPushButtonSetIsAutoRepeating,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcPushButtonSetGetNextAutoRepeatingDelay",ITcPushButtonSetGetNextAutoRepeatingDelay,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcPushButtonAssignmentOperator",ITcPushButtonAssignmentOperator,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetBackgroundImageWithImage",ITcPushButtonSetBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetGetButtonImageWithActor",ITcPushButtonSetGetButtonImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetBackgroundImageWithActor",ITcPushButtonSetBackgroundImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedImageWithImage",ITcPushButtonSetSelectedImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedBackgroundImageWithImage",ITcPushButtonSetSelectedBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledBackgroundImageWithImage",ITcPushButtonSetDisabledBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledImageWithImage",ITcPushButtonSetDisabledImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledBackgroundImageWithActor",ITcPushButtonSetDisabledBackgroundImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedImageWithActor",ITcPushButtonSetSelectedImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcRadioButtonDownCast",ITcRadioButtonDownCast,ITs_radio_button_startup,ITs_radio_button_cleanup},
        {"ITcRadioButtonCopyConstructor",ITcRadioButtonCopyConstructor,ITs_radio_button_startup,ITs_radio_button_cleanup},
        {"ITcRadioButtonAssignmentOperator",ITcRadioButtonAssignmentOperator,ITs_radio_button_startup,ITs_radio_button_cleanup},
index 7a0576baa4aacb78b4622487b13751275ca530b2..db9dcf8aa60bd54f9f40bb3ad3d5f5cfe5576a3a 100755 (executable)
@@ -112,13 +112,11 @@ extern int ITcAlignmentSetGetAlignmentType(void);
 extern int ITcAlignmentSetGetScaling(void);
 extern int ITcAlignmentSetGetPadding(void);
 extern int ITcButtonDowncast(void);
-extern int ITcButtonSetGetAnimationTime(void);
 extern int ITcButtonAssignmentOperator(void);
 extern int ITcButtonCopyConstructor(void);
 extern int ITcButtonSetIsDisabled(void);
 extern int ITcButtonSetGetLabelText(void);
 extern int ITcButtonSetIsSelected(void);
-extern int ITcButtonSetSelectedImage(void);
 extern int ITcButtonDisabledProperty(void);
 extern int ITcButtonSetDisabledWithDifferentStates01(void);
 extern int ITcButtonSetDisabledWithDifferentStates02(void);
@@ -237,15 +235,6 @@ extern int ITcPushButtonDowncast(void);
 extern int ITcPushButtonSetIsAutoRepeating(void);
 extern int ITcPushButtonSetGetNextAutoRepeatingDelay(void);
 extern int ITcPushButtonAssignmentOperator(void);
-extern int ITcPushButtonSetBackgroundImageWithImage(void);
-extern int ITcPushButtonSetGetButtonImageWithActor(void);
-extern int ITcPushButtonSetBackgroundImageWithActor(void);
-extern int ITcPushButtonSetSelectedImageWithImage(void);
-extern int ITcPushButtonSetSelectedBackgroundImageWithImage(void);
-extern int ITcPushButtonSetDisabledBackgroundImageWithImage(void);
-extern int ITcPushButtonSetDisabledImageWithImage(void);
-extern int ITcPushButtonSetDisabledBackgroundImageWithActor(void);
-extern int ITcPushButtonSetSelectedImageWithActor(void);
 extern int ITcRadioButtonDownCast(void);
 extern int ITcRadioButtonCopyConstructor(void);
 extern int ITcRadioButtonAssignmentOperator(void);
@@ -399,13 +388,11 @@ testcase tc_array[] = {
        {"ITcAlignmentSetGetScaling",ITcAlignmentSetGetScaling,ITs_alignment_startup,ITs_alignment_cleanup},
        {"ITcAlignmentSetGetPadding",ITcAlignmentSetGetPadding,ITs_alignment_startup,ITs_alignment_cleanup},
        {"ITcButtonDowncast",ITcButtonDowncast,ITs_button_startup,ITs_button_cleanup},
-       {"ITcButtonSetGetAnimationTime",ITcButtonSetGetAnimationTime,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonAssignmentOperator",ITcButtonAssignmentOperator,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonCopyConstructor",ITcButtonCopyConstructor,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetIsDisabled",ITcButtonSetIsDisabled,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetGetLabelText",ITcButtonSetGetLabelText,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetIsSelected",ITcButtonSetIsSelected,ITs_button_startup,ITs_button_cleanup},
-       {"ITcButtonSetSelectedImage",ITcButtonSetSelectedImage,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonDisabledProperty",ITcButtonDisabledProperty,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetDisabledWithDifferentStates01",ITcButtonSetDisabledWithDifferentStates01,ITs_button_startup,ITs_button_cleanup},
        {"ITcButtonSetDisabledWithDifferentStates02",ITcButtonSetDisabledWithDifferentStates02,ITs_button_startup,ITs_button_cleanup},
@@ -524,15 +511,6 @@ testcase tc_array[] = {
        {"ITcPushButtonSetIsAutoRepeating",ITcPushButtonSetIsAutoRepeating,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcPushButtonSetGetNextAutoRepeatingDelay",ITcPushButtonSetGetNextAutoRepeatingDelay,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcPushButtonAssignmentOperator",ITcPushButtonAssignmentOperator,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetBackgroundImageWithImage",ITcPushButtonSetBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetGetButtonImageWithActor",ITcPushButtonSetGetButtonImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetBackgroundImageWithActor",ITcPushButtonSetBackgroundImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedImageWithImage",ITcPushButtonSetSelectedImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedBackgroundImageWithImage",ITcPushButtonSetSelectedBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledBackgroundImageWithImage",ITcPushButtonSetDisabledBackgroundImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledImageWithImage",ITcPushButtonSetDisabledImageWithImage,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetDisabledBackgroundImageWithActor",ITcPushButtonSetDisabledBackgroundImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
-       {"ITcPushButtonSetSelectedImageWithActor",ITcPushButtonSetSelectedImageWithActor,ITs_push_button_startup,ITs_push_button_cleanup},
        {"ITcRadioButtonDownCast",ITcRadioButtonDownCast,ITs_radio_button_startup,ITs_radio_button_cleanup},
        {"ITcRadioButtonCopyConstructor",ITcRadioButtonCopyConstructor,ITs_radio_button_startup,ITs_radio_button_cleanup},
        {"ITcRadioButtonAssignmentOperator",ITcRadioButtonAssignmentOperator,ITs_radio_button_startup,ITs_radio_button_cleanup},
index ec9fdf8aeef5060570b8cce22ff45e024a813cb2..124d273e6f68b1304d3cac6e9b79d441f5f629b0 100755 (executable)
@@ -40,7 +40,7 @@ static bool g_bButtonSelectedState = false;
 bool CbButtonSelected( Button button )
 {
   LOG_I("Callback for button selection is called.");
-  g_bButtonSelectedState = button.IsSelected();
+  g_bButtonSelectedState = button.GetProperty<bool>( Button::Property::SELECTED );
   return true;
 }
 
@@ -55,17 +55,7 @@ void ButtonSetGetInitialAutoRepeatingDelayP();
 void ButtonSetGetNextAutoRepeatingDelayP();
 void ButtonSetIsTogglableButtonP();
 void ButtonSetIsSelectedP();
-void ButtonSetGetAnimationTimeP();
-void ButtonSetGetLabelTextP();
-void ButtonSetUnselectedImageP();
-void ButtonSetBackgroundImageP();
-void ButtonSetGetSelectedImageP();
-void ButtonSetSelectedBackgroundImageP();
-void ButtonSetDisabledBackgroundImageP();
-void ButtonSetDisabledImageP();
-void ButtonSetDisabledSelectedImageP();
 void ButtonSetGetLabelP();
-void ButtonSetGetButtonImageP();
 void ButtonDisabledPropertyP();
 void ButtonSetDisabledWithDifferentStates01P();
 void ButtonSetDisabledWithDifferentStates02P();
@@ -89,17 +79,7 @@ namespace
     BUTTON_SET_GET_NEXT_AUTO_REPEATING_DELAY_P,
     BUTTON_SET_IS_TOGGLABLE_BUTTON_P,
     BUTTON_SET_IS_SELECTED_P,
-    BUTTON_SET_GET_ANIMATION_TIME_P,
-    BUTTON_SET_GET_LABEL_TEXT_P,
-    BUTTON_SET_UNSELECTED_IMAGE_P,
-    BUTTON_SET_BACKGROUND_IMAGE_P,
-    BUTTON_SET_GET_SELECTED_IMAGE_P,
-    BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P,
-    BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P,
-    BUTTON_SET_DISABLED_IMAGE_P,
-    BUTTON_SET_DISABLED_SELECTED_IMAGE_P,
     BUTTON_SET_GET_LABEL_P,
-    BUTTON_SET_GET_BUTTON_IMAGE_P,
     BUTTON_DISABLED_PROPERTY_P,
     BUTTON_SET_DISABLED_WITH_DIFFERENT_STATES_01_P,
     BUTTON_SET_DISABLED_WITH_DIFFERENT_STATES_02_P,
@@ -181,50 +161,10 @@ namespace
           ButtonSetIsSelectedP();
           break;
 
-        case BUTTON_SET_GET_ANIMATION_TIME_P:
-          ButtonSetGetAnimationTimeP();
-          break;
-
-        case BUTTON_SET_GET_LABEL_TEXT_P:
-          ButtonSetGetLabelTextP();
-          break;
-
-        case BUTTON_SET_UNSELECTED_IMAGE_P:
-          ButtonSetUnselectedImageP();
-          break;
-
-        case BUTTON_SET_BACKGROUND_IMAGE_P:
-          ButtonSetBackgroundImageP();
-          break;
-
-        case BUTTON_SET_GET_SELECTED_IMAGE_P:
-          ButtonSetGetSelectedImageP();
-          break;
-
-        case BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P:
-          ButtonSetSelectedBackgroundImageP();
-          break;
-
-        case BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P:
-          ButtonSetDisabledBackgroundImageP();
-          break;
-
-        case BUTTON_SET_DISABLED_IMAGE_P:
-          ButtonSetDisabledImageP();
-          break;
-
-        case BUTTON_SET_DISABLED_SELECTED_IMAGE_P:
-          ButtonSetDisabledSelectedImageP();
-          break;
-
         case BUTTON_SET_GET_LABEL_P:
           ButtonSetGetLabelP();
           break;
 
-        case BUTTON_SET_GET_BUTTON_IMAGE_P:
-          ButtonSetGetButtonImageP();
-          break;
-
         case BUTTON_DISABLED_PROPERTY_P:
           ButtonDisabledPropertyP();
           break;
@@ -341,16 +281,16 @@ void ButtonSetIsDisabledP()
   DALI_CHECK_FAIL(!button,"PushButton::New() is failed to create valid button object ");
 
   Stage::GetCurrent().Add( button );
-  button.SetDisabled( bSetDisable );
+  button.SetProperty( Button::Property::DISABLED, bSetDisable );
 
-  bIsDisable = button.IsDisabled();
-  DALI_CHECK_FAIL(bSetDisable != bIsDisable, "SetDisabled and IsDisable value doest not match properly");
+  bIsDisable = button.GetProperty<bool>( Button::Property::DISABLED );
+  DALI_CHECK_FAIL( bSetDisable != bIsDisable, "Button::Property::DISABLED does not work properly");
   bSetDisable = true ;
 
-  button.SetDisabled( bSetDisable );
+  button.SetProperty( Button::Property::DISABLED, bSetDisable );
 
-  bIsDisable = button.IsDisabled();
-  DALI_CHECK_FAIL(bSetDisable != bIsDisable, "SetDisabled and IsDisable value doest not match properly");
+  bIsDisable = button.GetProperty<bool>( Button::Property::DISABLED );
+  DALI_CHECK_FAIL( bSetDisable != bIsDisable, "Button::Property::DISABLED does not work properly");
 
   Stage::GetCurrent().Remove( button );
   DaliLog::PrintPass();
@@ -366,11 +306,11 @@ void ButtonSetIsAutoRepeatingP()
 
   DALI_CHECK_FAIL(!pushButton,  "Button::New() is failed .");
 
-  pushButton.SetAutoRepeating(bIsAutoRepeat);
+  pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsAutoRepeat );
 
-  bAutoRepeatCheck = pushButton.IsAutoRepeating();
+  bAutoRepeatCheck = pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING );
 
-  DALI_CHECK_FAIL(!bAutoRepeatCheck,  "SetAutoRepeating and IsAutoRepeating is not working properly");
+  DALI_CHECK_FAIL( !bAutoRepeatCheck,  "Button::Property::AUTO_REPEATING is not working properly" );
 
   DaliLog::PrintPass();
 }
@@ -385,13 +325,13 @@ void ButtonSetGetInitialAutoRepeatingDelayP()
 
   DALI_CHECK_FAIL(!pushButton,  "Button::New() is failed .");
 
-  pushButton.SetAutoRepeating(bIsRepeating);
+  pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsRepeating );
 
-  pushButton.SetInitialAutoRepeatingDelay(fSetAutoRepeat);
-
-  fGetInitRepeatTime = pushButton.GetInitialAutoRepeatingDelay();
-
-  DALI_CHECK_FAIL(fGetInitRepeatTime != fSetAutoRepeat,  " SetInitialAutoRepeatingDelay and GetInitialAutoRepeatingDelay is not match properly .");
+  pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, fSetAutoRepeat );
+       
+       fGetInitRepeatTime = pushButton.GetProperty<float>( Button::Property::INITIAL_AUTO_REPEATING_DELAY );
+       
+  DALI_CHECK_FAIL( fGetInitRepeatTime != fSetAutoRepeat, "Button::Property::INITIAL_AUTO_REPEATING_DELAY is not match properly .");
 
   DaliLog::PrintPass();
 }
@@ -406,15 +346,15 @@ void ButtonSetGetNextAutoRepeatingDelayP()
 
   DALI_CHECK_FAIL(!pushButton,  "Button::New() is failed .");
 
-  pushButton.SetAutoRepeating(bIsRepeating);
+  pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsRepeating );
 
-  DALI_CHECK_FAIL(!pushButton.IsAutoRepeating(),  " SetAutoRepeating is failed.");
+  DALI_CHECK_FAIL( !pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), "Button::Property::AUTO_REPEATING is failed." );
 
-  pushButton.SetNextAutoRepeatingDelay(fSetNextAutoRepeat);
+       pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, fSetNextAutoRepeat );
 
-  fGetNextRepeatTime = pushButton.GetNextAutoRepeatingDelay();
+       fGetNextRepeatTime = pushButton.GetProperty<float>( Button::Property::NEXT_AUTO_REPEATING_DELAY );
 
-  DALI_CHECK_FAIL(fGetNextRepeatTime != fSetNextAutoRepeat,  "SetNextAutoRepeatingDelay and GetNextAutoRepeatingDelay is not match properly.");
+  DALI_CHECK_FAIL( fGetNextRepeatTime != fSetNextAutoRepeat, "Button::Property::NEXT_AUTO_REPEATING_DELAY is not match properly.");
 
   DaliLog::PrintPass();
 }
@@ -430,16 +370,16 @@ void ButtonSetIsSelectedP()
   DALI_CHECK_FAIL(!button,"Button::New() is failed to create valid button object ");
 
   Stage::GetCurrent().Add( button );
-  button.SetTogglableButton( bSetTogglable );
+  button.SetProperty( Button::Property::TOGGLABLE, bSetTogglable );
   button.StateChangedSignal().Connect( &CbButtonSelected );
 
-  bIsTogglable = button.IsTogglableButton();
-  DALI_CHECK_FAIL(bSetTogglable != bIsTogglable, "SetTogglableButton and IsTogglableButton value does not match properly");
+  bIsTogglable = button.GetProperty<bool>( Button::Property::TOGGLABLE );
+  DALI_CHECK_FAIL( bSetTogglable != bIsTogglable, "SetTogglableButton and IsTogglableButton value does not match properly");
 
-  button.SetSelected( bSetSelected );
-  bIsSetSelected = button.IsSelected();
+  button.SetProperty( Button::Property::SELECTED, bSetSelected );
+  bIsSetSelected = button.GetProperty<bool>( Button::Property::SELECTED );
 
-  DALI_CHECK_FAIL(bSetSelected != bIsSetSelected, "SetSelected and IsSelected value does not match properly");
+  DALI_CHECK_FAIL(bSetSelected != bIsSetSelected, "Button::Property::SELECTED does not work properly");
   DALI_CHECK_FAIL(!g_bButtonSelectedState, "CbButtonSelected callback  is not called properly");
 
   Stage::GetCurrent().Remove( button );
@@ -465,265 +405,6 @@ void ButtonSetIsTogglableButtonP()
   DaliLog::PrintPass();
 }
 
-void ButtonSetGetAnimationTimeP()
-{
-  float fsetAnimationTime = 4.00f;
-  float fGetAnimationTime = 0.0f;
-
-  Button button = PushButton::New();
-  DALI_CHECK_FAIL(!button,"Button::New() is failed to create valid button object ");
-
-  button.SetAnimationTime(fsetAnimationTime);
-
-  fGetAnimationTime = button.GetAnimationTime();
-  DALI_CHECK_FAIL(fGetAnimationTime != fsetAnimationTime, "GetAnimationTime is mismatched with the SetAnimationTime value");
-
-  DaliLog::PrintPass();
-}
-
-void ButtonSetGetLabelTextP()
-{
-  string strSetLabelText( "Happy" );
-  string strSetLabelText1( "Happy1" );
-  string strGetlabelText;
-
-  Button button = PushButton::New();
-  DALI_CHECK_FAIL(!button,"Button::New() is failed to create valid button object ");
-
-  Stage::GetCurrent().Add( button );
-  button.SetLabelText( strSetLabelText );
-
-  strGetlabelText = button.GetLabelText();
-  DALI_CHECK_FAIL( strSetLabelText != strGetlabelText,"SetlabelText and GetLabelText value does not match" );
-
-  TextLabel textLabel1 = TextLabel::New( strSetLabelText1 );
-  button.SetLabel( textLabel1 );
-
-  strGetlabelText = button.GetLabelText();
-  DALI_CHECK_FAIL( strSetLabelText1 != strGetlabelText,"SetlabelText and GetLabelText value does not match" );
-
-  Stage::GetCurrent().Remove( button );
-  DaliLog::PrintPass();
-}
-
-void ButtonSetUnselectedImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
-
-  Button pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "Button::New() is failed .");
-
-  try
-  {
-    pushButton.SetUnselectedImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetUnselectedImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value=1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void ButtonSetBackgroundImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
-
-  Button pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "Button::New() is failed .");
-
-  try
-  {
-    pushButton.SetBackgroundImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetBackgroundImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value=1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void ButtonSetSelectedBackgroundImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
-
-  Button pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "Button::New() is failed .");
-
-  try
-  {
-    pushButton.SetSelectedBackgroundImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetSelectedBackgroundImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value=1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-
-void ButtonSetDisabledBackgroundImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
-
-  PushButton pushButton = PushButton::New();
-
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-
-  try
-  {
-    pushButton.SetDisabledBackgroundImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledBackgroundImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value=1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void ButtonSetDisabledImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
-
-  Button pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "Button::New() is failed .");
-
-  try
-  {
-    pushButton.SetDisabledImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value=1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void ButtonSetDisabledSelectedImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  try
-  {
-    pushButton.SetDisabledSelectedImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledSelectedImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value=1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void ButtonSetGetSelectedImageP()
-{
-  Image imgset ;
-
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
-
-  imgset = ResourceImage::New( strActualPathOne);
-  if(!imgset)
-  {
-    LOG_E( "PushButtonCreateImage is failed.");
-    strActualPathOne.clear();
-  }
-
-  Button pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "Button::New() is failed .");
-
-  Button pushButton1 = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton1,  "Button::New() is failed .");
-
-  pushButton.SetSelectedImage( imgset );
-
-
-  Image imgGetImage = ImageView::DownCast(pushButton.GetSelectedImage()).GetImage();
-  DALI_CHECK_FAIL(imgGetImage != imgset ,  "SetSelectedImage and GetSelectedImage  is not Matched properly.");
-
-  try
-  {
-    pushButton1.SetSelectedImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetSelectedImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value=1;
-    return;
-  }
-
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
 void ButtonSetGetLabelP()
 {
   string strGetlabelText;
@@ -733,43 +414,19 @@ void ButtonSetGetLabelP()
   DALI_CHECK_FAIL(!button,"Button::New() is failed to create valid button object ");
 
   Stage::GetCurrent().Add( button );
-  button.SetLabelText( strSetLabelText );
-
-  strGetlabelText = button.GetLabelText();
-  DALI_CHECK_FAIL( strSetLabelText != strSetLabelText,"Setlabel and GetLabel value does not match" );
-
-  Stage::GetCurrent().Remove( button );
-  DaliLog::PrintPass();
-}
-
-void ButtonSetGetButtonImageP()
-{
-  Image imgset ;
-
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
+  button.SetProperty( Button::Property::LABEL, strSetLabelText );
 
-  imgset = ResourceImage::New( strActualPathOne);
-  if(!imgset)
+  Property::Value value = button.GetProperty( Toolkit::Button::Property::LABEL );
+       Property::Map *labelProperty = value.GetMap();
+  if ( labelProperty )
   {
-    LOG_E( "PushButtonCreateImage is failed.");
-    strActualPathOne.clear();
+    Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
+    value->Get( strGetlabelText );
   }
 
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  pushButton.SetButtonImage( imgset );
+  DALI_CHECK_FAIL( strSetLabelText != strGetlabelText, "Toolkit::Button::Property::LABEL does not work" );
 
-  Image imgGetImage = ImageView::DownCast(pushButton.GetButtonImage()).GetImage();
-  DALI_CHECK_FAIL(imgGetImage != imgset ,  "SetButtonImage and GetButtonImage  is not Matched properly.");
-
-  strActualPathOne.clear();
+  Stage::GetCurrent().Remove( button );
   DaliLog::PrintPass();
 }
 
@@ -805,7 +462,7 @@ void ButtonSetDisabledWithDifferentStates01P()
 
   button.SetProperty( Button::Property::SELECTED, !SELECTED );
 
-  bool isSelected = button.GetProperty<bool>( Button::Property::SELECTED ) ;
+  bool isSelected = button.GetProperty<bool>( Button::Property::SELECTED );
 
   DALI_CHECK_FAIL( isSelected != SELECTED, "Set DISABLED property and Get SELECTED Property is failed." );
 
@@ -847,8 +504,8 @@ void ButtonAutoRepeatingPropertyP()
   button.SetProperty( button.GetPropertyIndex("autoRepeating"), true );
   DALI_CHECK_FAIL( button.GetProperty<bool>( button.GetPropertyIndex("autoRepeating")) != true, "Get AutoRepeating Property is failed." );
 
-  button.SetAutoRepeating( false );
-  DALI_CHECK_FAIL( button.IsAutoRepeating(), "SetAutoRepeating() is failed." );
+  button.SetProperty( Button::Property::AUTO_REPEATING, false );
+  DALI_CHECK_FAIL( button.GetProperty<bool>( Button::Property::AUTO_REPEATING ), "Button::Property::AUTO_REPEATING is failed." );
 
   DaliLog::PrintPass();
 }
@@ -1090,168 +747,6 @@ int UtcDaliButtonSetIsTogglableButtonP(void)
   return test_return_value;
 }
 
-/**
- * @testcase            UtcDaliButtonSetGetAnimationTimeP
- * @since_tizen         2.4
- * @description         Sets and Gets the Animation Time.
- */
-
-int UtcDaliButtonSetGetAnimationTimeP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_GET_ANIMATION_TIME_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliButtonSetGetLabelTextP
- * @since_tizen         2.4
- * @description         Sets and Checks the button label text.
- */
-
-int UtcDaliButtonSetGetLabelTextP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_GET_LABEL_TEXT_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliButtonSetUnselectedImageP
- * @since_tizen         2.4
- * @description         Unselects the selected image
- */
-
-int UtcDaliButtonSetUnselectedImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_UNSELECTED_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliButtonSetBackgroundImageP
- * @since_tizen         2.4
- * @description         Sets and gets the background image.
- */
-
-int UtcDaliButtonSetBackgroundImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_BACKGROUND_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliButtonSetGetSelectedImageP
- * @since_tizen         2.4
- * @description         Unselect the button selected image with image.
- */
-
-int UtcDaliButtonSetGetSelectedImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_GET_SELECTED_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliButtonSetSelectedBackgroundImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button selected background image with image.
- */
-
-int UtcDaliButtonSetSelectedBackgroundImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliButtonSetDisabledBackgroundImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled background image with image.
- */
-
-int UtcDaliButtonSetDisabledBackgroundImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliButtonSetDisabledImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled  image with image.
- */
-
-int UtcDaliButtonSetDisabledImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_DISABLED_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliButtonSetDisabledSelectedImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled selected image with image.
- */
-
-int UtcDaliButtonSetDisabledSelectedImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_DISABLED_SELECTED_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
 /**
  * @testcase            UtcDaliButtonSetGetLabelP
  * @since_tizen         2.4
@@ -1270,24 +765,6 @@ int UtcDaliButtonSetGetLabelP(void)
   return test_return_value;
 }
 
-/**
- * @testcase            UtcDaliButtonSetGetButtonImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button image with image.
- */
-
-int UtcDaliButtonSetGetButtonImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Button_TestApp testApp( application, BUTTON_SET_GET_BUTTON_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
 /**
  * @testcase            UtcDaliButtonDisabledPropertyP
  * @description         Sets and Gets the button as disabled.
index e99cb7f5b43f7bbfb4737184735bba639b9216c7..f1b72dc1c34ab8fbb164e8bf81f82925339458ad 100755 (executable)
@@ -56,13 +56,11 @@ void ControlImplGetLongPressGestureDetectorP();
 void ControlImplGetPanGestureDetectorP();
 void ControlImplGetPinchGestureDetectorP();
 void ControlImplGetTapGestureDetectorP();
-void ControlImplClearBackgroundP();
 void ControlImplClearKeyInputFocusP();
 void ControlImplSetAndHasKeyInputFocusP();
 void ControlImplKeyInputFocusGainedSignalP();
 void ControlImplKeyInputFocusLostSignalP();
 void ControlImplSetGetStyleNameP();
-void ControlImplSetGetBackgroundImageColorP();
 void ControlImplKeyEventSignalP();
 void ControlImplGetControlExtensionP();
 void ControlImplGetNextKeyboardFocusableActorP();
@@ -102,13 +100,11 @@ namespace
     CONTROL_IMPL_GET_PAN_GESTURE_DETECTOR_P,
     CONTROL_IMPL_GET_TAP_GESTURE_DETECTOR_P,
     CONTROL_IMPL_GET_LONG_PRESS_GESTURE_DETECTOR_P,
-    CONTROL_IMPL_CLEAR_BACKGROUND_P,
     CONTROL_IMPL_CLEAR_KEY_INPUT_FOCUS_P,
     CONTROL_IMPL_SET_AND_HAS_KEY_INPUT_FOCUS_P,
     CONTROL_IMPL_KEY_INPUT_FOCUS_GAINED_SIGNAL_P,
     CONTROL_IMPL_KEY_INPUT_FOCUS_LOST_SIGNAL_P,
     CONTROL_IMPL_SET_GET_STYLE_NAME_P,
-    CONTROL_IMPL_SET_GET_BACKGROUND_IMAGE_COLOR_P,
     CONTROL_IMPL_KEY_EVENT_SIGNAL_P,
     CONTROL_IMPL_GET_CONTROL_EXTENSION_P,
     CONTROL_IMPL_GET_NEXT_KEYBOARD_FOCUSABLE_ACTOR_P,
@@ -187,9 +183,6 @@ namespace
         case CONTROL_IMPL_GET_LONG_PRESS_GESTURE_DETECTOR_P:
           ControlImplGetLongPressGestureDetectorP();
           break;
-        case CONTROL_IMPL_CLEAR_BACKGROUND_P:
-          ControlImplClearBackgroundP();
-          break;
         case CONTROL_IMPL_CLEAR_KEY_INPUT_FOCUS_P:
           ControlImplClearKeyInputFocusP();
           break;
@@ -205,9 +198,6 @@ namespace
         case CONTROL_IMPL_SET_GET_STYLE_NAME_P:
           ControlImplSetGetStyleNameP();
           break;
-        case CONTROL_IMPL_SET_GET_BACKGROUND_IMAGE_COLOR_P:
-          ControlImplSetGetBackgroundImageColorP();
-          break;
         case CONTROL_IMPL_KEY_EVENT_SIGNAL_P:
           ControlImplKeyEventSignalP();
           break;
@@ -477,25 +467,6 @@ void ControlImplGetLongPressGestureDetectorP()
   DaliLog::PrintPass();
 }
 
-
-void ControlImplClearBackgroundP()
-{
-  DummyControl dummy = DummyControl::New();
-  DALI_CHECK_FAIL(!dummy, "Control::New() is not created.");
-
-  DummyControlImpl& control = static_cast<DummyControlImpl&>(dummy.GetImplementation());
-
-  control.SetBackgroundColor(Color::MAGENTA);
-  Vector4 vec4GetBackgroundColor = control.GetBackgroundColor();
-  DALI_CHECK_FAIL( vec4GetBackgroundColor != Color::MAGENTA, "ControlImpl::SetBackground() is failed." );
-
-  control.ClearBackground();
-  Vector4 vec4GetBackgroundColor2 = control.GetBackgroundColor();
-  DALI_CHECK_FAIL( vec4GetBackgroundColor == vec4GetBackgroundColor2, "ControlImpl::ClearBackground() is failed." );
-
-  DaliLog::PrintPass();
-}
-
 void ControlImplClearKeyInputFocusP()
 {
   bool bHasKeyFocus = false;
@@ -600,36 +571,6 @@ void ControlImplSetGetStyleNameP()
   DaliLog::PrintPass();
 }
 
-void ControlImplSetGetBackgroundImageColorP()
-{
-  string strActualPathOne = getResourceFullPath(CONTROL_IMAGE_NAME);
-  if( strActualPathOne == "" )
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value = 1;
-    return;
-  }
-
-  DummyControl dummy = DummyControl::New();
-  DALI_CHECK_FAIL(!dummy, "Control::New() is failed." );
-  DummyControlImpl& control = static_cast<DummyControlImpl&>(dummy.GetImplementation());
-
-  DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::TRANSPARENT, "Control New instance Background Color is not Transparent." );
-
-  Image image = ResourceImage::New(strActualPathOne);
-  control.SetBackgroundImage( image );
-  DALI_CHECK_FAIL( !dummy, "Control New instance Background image is not Set" );
-
-  control.SetBackgroundColor( Color::GREEN );
-  DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::GREEN, "Control Background Color is not GREEN." );
-
-  control.ClearBackground();
-  DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::TRANSPARENT, "Control Background Color is not TRANSPARENT after Clear." );
-  strActualPathOne.clear();
-
-  DaliLog::PrintPass();
-}
-
 void ControlImplKeyEventSignalP()
 {
   DummyControl dummy = DummyControl::New();
@@ -1256,24 +1197,6 @@ int UtcDaliControlImplGetLongPressGestureDetectorP(void)
   return test_return_value;
 }
 
-/**
- * @testcase            UtcDaliControlImplClearBackgroundP
- * @since_tizen         2.4
- * @description         Clears the background of control handle
- */
-
-int UtcDaliControlImplClearBackgroundP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Control_TestApp testApp( application, CONTROL_IMPL_CLEAR_BACKGROUND_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
 /**
  * @testcase            UtcDaliControlImplClearKeyInputFocusP
  * @since_tizen         2.4
@@ -1364,24 +1287,6 @@ int UtcDaliControlImplSetGetStyleNameP(void)
   return test_return_value;
 }
 
-/**
- * @testcase            UtcDaliControlImplSetGetBackgroundImageColorP
- * @since_tizen         2.4
- * @description         Checks whether Sets Background Color or Image can properly set the control Background color or not.
- */
-
-int UtcDaliControlImplSetGetBackgroundImageColorP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  Control_TestApp testApp( application, CONTROL_IMPL_SET_GET_BACKGROUND_IMAGE_COLOR_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
 /**
  * @testcase            UtcDaliControlImplKeyEventSignalP
  * @since_tizen         2.4
index b7f3f904faf3d0d4c7cddde352fec5f47aeb3ffb..32485c13befb27bfe5a7144bbd8dcc65f7cd54a6 100755 (executable)
@@ -396,30 +396,21 @@ void ControlSetGetStyleNameP()
 
 void ControlSetGetBackgroundImageColorP()
 {
-  string strActualPathOne=getResourceFullPath(CONTROL_IMAGE_NAME);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
-    return;
-  }
-
   Control control = Control::New();
-  DALI_CHECK_FAIL(!control, "Control::New() is failed." );
-
-  DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::TRANSPARENT, "Control New instance Background Color is not Transparent." );
-
-  Image image = ResourceImage::New(strActualPathOne);
-  control.SetBackgroundImage( image );
-  DALI_CHECK_FAIL( !control, "Control New instance Background image is not Set" );
+  DALI_CHECK_FAIL( !control, "Control::New() is failed." );
 
   control.SetBackgroundColor( Color::GREEN );
-  DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::GREEN, "Control Background Color is not GREEN." );
+  Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
+  Property::Map* resultMap = propValue.GetMap();
+  DALI_CHECK_FAIL( resultMap->Find( ColorVisual::Property::MIX_COLOR ) == NULL, "Control::SetBackgroundColor() is failed." );
+
+  Vector4 color;
+  resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get( color );
+  DALI_CHECK_FAIL( color != Color::GREEN, "Control Background Color is not GREEN." );
 
   control.ClearBackground();
-  DALI_CHECK_FAIL( control.GetBackgroundColor() != Color::TRANSPARENT, "Control Background Color is not TRANSPARENT after Clear." );
+  DALI_CHECK_FAIL( control.GetRendererCount() != 0u, "Control::ClearBackground() is failed." );
 
-  strActualPathOne.clear();
   DaliLog::PrintPass();
 }
 
@@ -428,14 +419,17 @@ void ControlClearBackgroundP()
   Control control = Control::New();
   DALI_CHECK_FAIL( !control, "Control::New() is failed.");
 
-  control.SetBackgroundColor(Color::MAGENTA);
-  Vector4 vec4GetBackgroundColor = control.GetBackgroundColor();
-  DALI_CHECK_FAIL( vec4GetBackgroundColor != Color::MAGENTA, "Control::SetBackground() is failed." );
+  control.SetBackgroundColor( Color::MAGENTA );
+  Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
+  Property::Map* resultMap = propValue.GetMap();
+  DALI_CHECK_FAIL( resultMap->Find( ColorVisual::Property::MIX_COLOR ) == NULL, "Control::SetBackgroundColor() is failed." );
 
-  control.ClearBackground();
-  Vector4 vec4GetBackgroundColor2 = control.GetBackgroundColor();
+  Vector4 color;
+  resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get( color );
+  DALI_CHECK_FAIL( color != Color::MAGENTA, "Control Background Color is not MAGENTA." );
 
-  DALI_CHECK_FAIL( vec4GetBackgroundColor == vec4GetBackgroundColor2, "Control::ClearBackground() is failed." );
+  control.ClearBackground();
+  DALI_CHECK_FAIL( control.GetRendererCount() != 0u, "Control::ClearBackground() is failed." );
 
   DaliLog::PrintPass();
 }
@@ -454,7 +448,6 @@ void ControlKeyEventSignalP()
   }
   catch(DaliException& de)
   {
-    LOG_E("SetDisabledSelectedImage with image is failed.");
     DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
     if( control )
     {
index ff29563d9f3f5069d8f7dd3fa7aa79bba124f973..c88ada1728498f6de32cf743e42aec36da94ad00 100755 (executable)
@@ -53,7 +53,6 @@ void ImageViewSetAndGetImageP();
 void ImageViewSetAndGetImageP2();
 void ImageViewSetAndGetImageP3();
 void ImageViewSetAndGetPropertyImage();
-void ImageViewSetAndGetPropertyResourceUrl();
 void ImageViewResourceReadySignalP();
 void ImageViewIsResourceReady( ImageView& imageView );
 void VTImageViewResourceReadySignalP();
@@ -78,7 +77,6 @@ namespace
     IMAGE_VIEW_SET_GET_IMAGE_P2,
     IMAGE_VIEW_SET_GET_IMAGE_P3,
     IMAGE_VIEW_SET_GET_PROPERTY_IMAGE,
-    IMAGE_VIEW_SET_GET_PROPERTY_RESOURCE_URL,
     IMAGE_VIEW_RESOURCE_READY_SIGNAL_P,
     IMAGE_VIEW_IS_RESOURCE_READY
   };
@@ -159,9 +157,6 @@ namespace
         case IMAGE_VIEW_SET_GET_PROPERTY_IMAGE:
           ImageViewSetAndGetPropertyImage();
           break;
-        case IMAGE_VIEW_SET_GET_PROPERTY_RESOURCE_URL:
-          ImageViewSetAndGetPropertyResourceUrl();
-          break;
         case IMAGE_VIEW_RESOURCE_READY_SIGNAL_P:
           ImageViewResourceReadySignalP();
           break;
@@ -331,17 +326,6 @@ void ImageViewSetAndGetPropertyImage()
   TestUrl( imageView, TEST_IMAGE_FILE_NAME );
 }
 
-void ImageViewSetAndGetPropertyResourceUrl()
-{
-  ImageView imageView = ImageView::New();
-  DALI_CHECK_FAIL( !(imageView.GetProperty( ImageView::Property::RESOURCE_URL ).Get< std::string >().empty()), "ImageView ResourceUrl is failed." );
-
-  imageView.SetProperty( ImageView::Property::RESOURCE_URL, "TestString" );
-  DALI_CHECK_FAIL( (imageView.GetProperty( ImageView::Property::RESOURCE_URL ).Get< std::string >()) != "TestString", "ImageView ResourceUrl is failed." );
-
-  DaliLog::PrintPass();
-}
-
 void ImageViewResourceReadySignalP()
 {
   ImageView imageView = ImageView::New( TEST_IMAGE_FILE_NAME );
@@ -608,23 +592,6 @@ int UtcDaliImageViewSetGetPropertyImage(void)
   return test_return_value;
 }
 
-/**
- * @testcase            UtcDaliImageViewSetGetPropertyResourceUrl
- * @since_tizen         2.4
- * @description         Checks set and get property ResourceUrl
- */
-int UtcDaliImageViewSetGetPropertyResourceUrl(void)
-{
-  DaliLog::PrintExecStarted(SUITE_NAME, __FUNCTION__);
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  ImageView_TestApp testApp( application, IMAGE_VIEW_SET_GET_PROPERTY_RESOURCE_URL);
-  application.MainLoop();
-
-  return test_return_value;
-}
-
 /**
  * @testcase            UtcDaliImageViewResourceReadySignalP
  * @since_tizen         4.0
index 0a4125712161e7f584fa4a27a21fb60ace66b7b0..76414157f61b87f78b22f30feba5eff297e9ab84 100755 (executable)
@@ -35,20 +35,6 @@ void PushButtonNewP();
 void PushButtonOperatorAssignmentP();
 void PushButtonDowncastP();
 void PushButtonDowncastN();
-void PushButtonSetGetButtonImageP();
-void PushButtonSetGetButtonImageP2();
-void PushButtonSetBackgroundImageP();
-void PushButtonSetBackgroundImageP2();
-void PushButtonSetSelectedImageP();
-void PushButtonSetSelectedImageP2();
-void PushButtonSetSelectedBackgroundImageP();
-void PushButtonSetSelectedBackgroundImageP2();
-void PushButtonSetDisabledBackgroundImageP();
-void PushButtonSetDisabledBackgroundImageP2();
-void PushButtonSetDisabledImageP();
-void PushButtonSetDisabledImageP2();
-void PushButtonSetDisabledSelectedImageP();
-void PushButtonSetDisabledSelectedImageP2();
 void PushButtonSetGetInitialAutoRepeatingDelayP();
 void PushButtonSetIsAutoRepeatingP();
 void PushButtonSetGetNextAutoRepeatingDelayP();
@@ -66,20 +52,6 @@ namespace
     PUSH_BUTTON_OPERATOR_ASSIGNMENT_P,
     PUSH_BUTTON_DOWNCAST_P,
     PUSH_BUTTON_DOWNCAST_N,
-    PUSH_BUTTON_SET_GET_BUTTON_IMAGE_P,
-    PUSH_BUTTON_SET_GET_BUTTON_IMAGE_P2,
-    PUSH_BUTTON_SET_BACKGROUND_IMAGE_P,
-    PUSH_BUTTON_SET_BACKGROUND_IMAGE_P2,
-    PUSH_BUTTON_SET_SELECTED_IMAGE_P,
-    PUSH_BUTTON_SET_SELECTED_IMAGE_P2,
-    PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P,
-    PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P2,
-    PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P,
-    PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P2,
-    PUSH_BUTTON_SET_DISABLED_IMAGE_P,
-    PUSH_BUTTON_SET_DISABLED_IMAGE_P2,
-    PUSH_BUTTON_SET_DISABLED_SELECTED_IMAGE_P,
-    PUSH_BUTTON_SET_DISABLED_SELECTED_IMAGE_P2,
     PUSH_BUTTON_SET_GET_INITIAL_AUTO_REPEATING_DELAY_P,
     PUSH_BUTTON_SET_IS_AUTO_REPEATING_P,
     PUSH_BUTTON_SET_GET_NEXT_AUTO_REPEATING_DELAY_P
@@ -137,62 +109,6 @@ namespace
           PushButtonDowncastP();
           break;
 
-        case PUSH_BUTTON_SET_GET_BUTTON_IMAGE_P:
-          PushButtonSetGetButtonImageP();
-          break;
-
-        case PUSH_BUTTON_SET_GET_BUTTON_IMAGE_P2:
-          PushButtonSetGetButtonImageP2();
-          break;
-
-        case PUSH_BUTTON_SET_BACKGROUND_IMAGE_P:
-          PushButtonSetBackgroundImageP();
-          break;
-
-        case PUSH_BUTTON_SET_BACKGROUND_IMAGE_P2:
-          PushButtonSetBackgroundImageP2();
-          break;
-
-        case PUSH_BUTTON_SET_SELECTED_IMAGE_P:
-          PushButtonSetSelectedImageP();
-          break;
-
-        case PUSH_BUTTON_SET_SELECTED_IMAGE_P2:
-          PushButtonSetSelectedImageP2();
-          break;
-
-        case PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P:
-          PushButtonSetSelectedBackgroundImageP();
-          break;
-
-        case PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P2:
-          PushButtonSetSelectedBackgroundImageP2();
-          break;
-
-        case PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P:
-          PushButtonSetDisabledBackgroundImageP();
-          break;
-
-        case PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P2:
-          PushButtonSetDisabledBackgroundImageP2();
-          break;
-
-        case PUSH_BUTTON_SET_DISABLED_IMAGE_P:
-          PushButtonSetDisabledImageP();
-          break;
-
-        case PUSH_BUTTON_SET_DISABLED_IMAGE_P2:
-          PushButtonSetDisabledImageP2();
-          break;
-
-        case PUSH_BUTTON_SET_DISABLED_SELECTED_IMAGE_P:
-          PushButtonSetDisabledSelectedImageP();
-          break;
-
-        case PUSH_BUTTON_SET_DISABLED_SELECTED_IMAGE_P2:
-          PushButtonSetDisabledSelectedImageP2();
-          break;
-
         case PUSH_BUTTON_SET_GET_INITIAL_AUTO_REPEATING_DELAY_P:
           PushButtonSetGetInitialAutoRepeatingDelayP();
           break;
@@ -253,8 +169,6 @@ void PushButtonCopyConstructorP()
 
   DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
 
-  pushButton.SetSelectedImage( imageActor );
-
   PushButton copyconstPushButton(pushButton);
   DALI_CHECK_FAIL(pushButton != copyconstPushButton,  "Copy Constructor do not work properly.");
 
@@ -315,362 +229,13 @@ void PushButtonSetGetInitialAutoRepeatingDelayP()
 
   DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
 
-  pushButton.SetAutoRepeating(bIsRepeating);
-
-  pushButton.SetInitialAutoRepeatingDelay(fSetAutoRepeat);
-
-  fGetInitRepeatTime = pushButton.GetInitialAutoRepeatingDelay();
-
-  DALI_CHECK_FAIL(fGetInitRepeatTime != fSetAutoRepeat,  " SetInitialAutoRepeatingDelay and GetInitialAutoRepeatingDelay is not match properly .");
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetGetButtonImageP()
-{
-  Image imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  pushButton.SetButtonImage( imgset );
-
-  Image imgGetImage = ImageView::DownCast(pushButton.GetButtonImage()).GetImage();
-  DALI_CHECK_FAIL(imgGetImage != imgset ,  "SetButtonImage and GetButtonImage  is not Matched properly.");
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetGetButtonImageP2()
-{
-  ResourceImage imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  Actor imgActorSet = ImageView::New(imgset);
-  DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
-
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
-
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  pushButton.SetButtonImage( imgActorSet );
-
-  ResourceImage imgGetImage = ResourceImage::DownCast( ImageView::DownCast(pushButton.GetButtonImage()).GetImage() );
-  DALI_CHECK_FAIL(imgGetImage.GetUrl() != imgset.GetUrl() ,  "SetButtonImage and GetButtonImage  is not Matched properly.");
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetBackgroundImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value = 1;
-    return;
-  }
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  try
-  {
-    pushButton.SetBackgroundImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetBackgroundImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-
-void PushButtonSetBackgroundImageP2()
-{
-  Image imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  Actor imgActorSet = ImageView::New(imgset);
-  DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
-
-  PushButton pushButton = PushButton::New();
-  Stage::GetCurrent().Add( pushButton );
-
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  try
-  {
-    pushButton.SetBackgroundImage( imgActorSet );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetBackgroundImage with actor is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-  Stage::GetCurrent().Remove( pushButton );
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetSelectedImageP()
-{
-  Image imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  pushButton.SetSelectedImage( imgset );
-
-  Image imgGetImage = ImageView::DownCast(pushButton.GetSelectedImage()).GetImage();
-  DALI_CHECK_FAIL(imgGetImage != imgset ,  "SetSelectedImage and GetSelectedImage  is not Matched properly.");
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetSelectedImageP2()
-{
-  ResourceImage imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  Actor imgActorSet = ImageView::New(imgset);
-  DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton, "PushButton::New() is failed .");
-
-  pushButton.SetSelectedImage( imgActorSet );
-  ResourceImage imgGetImage = ResourceImage::DownCast( ImageView::DownCast(pushButton.GetSelectedImage()).GetImage() );
-  DALI_CHECK_FAIL(imgGetImage.GetUrl() != imgset.GetUrl() ,  "SetSelectedImage and GetSelectedImage  is not Matched properly.");
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetSelectedBackgroundImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value = 1;
-    return;
-  }
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  try
-  {
-    pushButton.SetSelectedBackgroundImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetSelectedBackgroundImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetSelectedBackgroundImageP2()
-{
-  Image imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  Actor imgActorSet = ImageView::New(imgset);
-  DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-  Stage::GetCurrent().Add( pushButton );
-
-  try
-  {
-    pushButton.SetSelectedBackgroundImage( imgActorSet );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetSelectedBackgroundImage with actor is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-  Stage::GetCurrent().Remove( pushButton );
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledBackgroundImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value = 1;
-    return;
-  }
-
-  PushButton pushButton = PushButton::New();
-
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-
-  try
-  {
-    pushButton.SetDisabledBackgroundImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledBackgroundImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledBackgroundImageP2()
-{
-  Image imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  Actor imgActorSet = ImageView::New(imgset);
-  DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton, "PushButton::New() is failed .");
-
-  try
-  {
-    pushButton.SetDisabledBackgroundImage( imgActorSet );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledBackgroundImage with actor is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value = 1;
-    return;
-  }
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  try
-  {
-    pushButton.SetDisabledImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledImageP2()
-{
-  Image imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  Actor imgActorSet = ImageView::New(imgset);
-  DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton, "PushButton::New() is failed .");
-
-  try
-  {
-    pushButton.SetDisabledImage( imgActorSet );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledImage with actor is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledSelectedImageP()
-{
-  string strActualPathOne=getResourceFullPath(PUSH_BUTTON_IMAGE_ONE);
-  if(strActualPathOne=="")
-  {
-    LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value = 1;
-    return;
-  }
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
-
-  try
-  {
-    pushButton.SetDisabledSelectedImage( strActualPathOne );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledSelectedImage with image is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
-  strActualPathOne.clear();
-  DaliLog::PrintPass();
-}
-
-void PushButtonSetDisabledSelectedImageP2()
-{
-  Image imgset;
-  DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
-
-  Actor imgActorSet = ImageView::New(imgset);
-  DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
-
-  PushButton pushButton = PushButton::New();
-  DALI_CHECK_FAIL(!pushButton, "PushButton::New() is failed .");
+  pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsRepeating );
 
-  try
-  {
-    pushButton.SetDisabledSelectedImage( imgActorSet );
-  }
-  catch(DaliException& de)
-  {
-    LOG_E("SetDisabledSelectedImage with actor is failed.");
-    DaliLog::PrintV(LOG_ERROR, SUITE_NAME, "Dali Exception Thrown, location: %s, condition: %s, at [LINE: %d]", de.location, de.condition, __LINE__);
-    test_return_value = 1;
-    return;
-  }
+       pushButton.SetProperty( Button::Property::INITIAL_AUTO_REPEATING_DELAY, fSetAutoRepeat );
+       
+       fGetInitRepeatTime = pushButton.GetProperty<float>( Button::Property::INITIAL_AUTO_REPEATING_DELAY );
+       
+  DALI_CHECK_FAIL( fGetInitRepeatTime != fSetAutoRepeat, "Button::Property::INITIAL_AUTO_REPEATING_DELAY is not match properly .");
 
   DaliLog::PrintPass();
 }
@@ -684,11 +249,11 @@ void PushButtonSetIsAutoRepeatingP()
 
   DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
 
-  pushButton.SetAutoRepeating(bIsAutoRepeat);
+  pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsAutoRepeat );
 
-  bAutoRepeatCheck = pushButton.IsAutoRepeating();
+  bAutoRepeatCheck = pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING );
 
-  DALI_CHECK_FAIL(!bAutoRepeatCheck,  "SetAutoRepeating and IsAutoRepeating is not working properly");
+  DALI_CHECK_FAIL( !bAutoRepeatCheck,  "Button::Property::AUTO_REPEATING is not working properly" );
 
   DaliLog::PrintPass();
 }
@@ -704,15 +269,15 @@ void PushButtonSetGetNextAutoRepeatingDelayP()
 
   DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
 
-  pushButton.SetAutoRepeating(bIsRepeating);
+  pushButton.SetProperty( Button::Property::AUTO_REPEATING, bIsRepeating );
 
-  DALI_CHECK_FAIL(!pushButton.IsAutoRepeating(),  " SetAutoRepeating is failed.");
+       DALI_CHECK_FAIL( !pushButton.GetProperty<bool>( Button::Property::AUTO_REPEATING ), "Button::Property::AUTO_REPEATING is failed." );
 
-  pushButton.SetNextAutoRepeatingDelay(fSetNextAutoRepeat);
+       pushButton.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, fSetNextAutoRepeat );
 
-  fGetNextRepeatTime = pushButton.GetNextAutoRepeatingDelay();
+       fGetNextRepeatTime = pushButton.GetProperty<float>( Button::Property::NEXT_AUTO_REPEATING_DELAY );
 
-  DALI_CHECK_FAIL(fGetNextRepeatTime != fSetNextAutoRepeat,  "SetNextAutoRepeatingDelay and GetNextAutoRepeatingDelay is not match properly.");
+  DALI_CHECK_FAIL( fGetNextRepeatTime != fSetNextAutoRepeat, "Button::Property::NEXT_AUTO_REPEATING_DELAY is not match properly.");
 
   DaliLog::PrintPass();
 }
@@ -834,260 +399,6 @@ int UtcDaliPushButtonDowncastN(void)
   return test_return_value;
 }
 
-/**
- * @testcase            UtcDaliPushButtonSetGetButtonImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button image with image.
- */
-
-int UtcDaliPushButtonSetGetButtonImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_GET_BUTTON_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetGetButtonImageP2
- * @since_tizen         2.4
- * @description         Sets and Get  the button image with actor.
- */
-
-int UtcDaliPushButtonSetGetButtonImageP2(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_GET_BUTTON_IMAGE_P2 );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetSelectedBackgroundImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button selected background image with image.
- */
-
-int UtcDaliPushButtonSetSelectedBackgroundImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetSelectedBackgroundImageP2
- * @since_tizen         2.4
- * @description         Sets and Get  the button selected background image with actor image.
- */
-
-int UtcDaliPushButtonSetSelectedBackgroundImageP2(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P2 );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetBackgroundImageP
- * @since_tizen         2.4
- * @description         Sets and gets the background image.
- */
-
-int UtcDaliPushButtonSetBackgroundImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_BACKGROUND_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-
-
-/**
- * @testcase            UtcDaliPushButtonSetBackgroundImageP2
- * @since_tizen         2.4
- * @description         Sets and gets the background actor.
- */
-
-int UtcDaliPushButtonSetBackgroundImageP2(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_BACKGROUND_IMAGE_P2 );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetSelectedImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button selected image with image.
- */
-
-int UtcDaliPushButtonSetSelectedImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_SELECTED_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetSelectedImageP2
- * @since_tizen         2.4
- * @description         Sets and Get  the button selected image with actor.
- */
-
-int UtcDaliPushButtonSetSelectedImageP2(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_SELECTED_IMAGE_P2 );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetDisabledBackgroundImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled background image with image.
- */
-
-int UtcDaliPushButtonSetDisabledBackgroundImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetDisabledBackgroundImageP2
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled background image with actor.
- */
-
-int UtcDaliPushButtonSetDisabledBackgroundImageP2(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P2 );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetDisabledImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled  image with image.
- */
-
-int UtcDaliPushButtonSetDisabledImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetDisabledImageP2
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled  image with actor.
- */
-
-int UtcDaliPushButtonSetDisabledImageP2(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_IMAGE_P2 );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetDisabledSelectedImageP
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled selected image with image.
- */
-
-int UtcDaliPushButtonSetDisabledSelectedImageP(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_SELECTED_IMAGE_P );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
-/**
- * @testcase            UtcDaliPushButtonSetDisabledSelectedImageP2
- * @since_tizen         2.4
- * @description         Sets and Get  the button disabled selected image with actor.
- */
-
-int UtcDaliPushButtonSetDisabledSelectedImageP2(void)
-{
-  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
-
-  Application application = Application::New( &gArgc, &gArgv );
-  CHECK_GL;
-  PushButton_TestApp testApp( application, PUSH_BUTTON_SET_DISABLED_SELECTED_IMAGE_P2 );
-  application.MainLoop();
-
-  return test_return_value;
-}
-
 /**
  * @testcase            UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP
  * @since_tizen         2.4
index 6e66a426c78d4ad6cba2064acb7b75eac4200f97..7489ab7078b5917c2def01845a6f5fe8b74907bd 100755 (executable)
@@ -117,20 +117,6 @@ extern int UtcDaliPushButtonNewP(void);
 extern int UtcDaliPushButtonOperatorAssignmentP(void);
 extern int UtcDaliPushButtonDowncastP(void);
 extern int UtcDaliPushButtonDowncastN(void);
-extern int UtcDaliPushButtonSetGetButtonImageP(void);
-extern int UtcDaliPushButtonSetGetButtonImageP2(void);
-extern int UtcDaliPushButtonSetSelectedBackgroundImageP(void);
-extern int UtcDaliPushButtonSetSelectedBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetBackgroundImageP(void);
-extern int UtcDaliPushButtonSetBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetSelectedImageP(void);
-extern int UtcDaliPushButtonSetSelectedImageP2(void);
-extern int UtcDaliPushButtonSetDisabledBackgroundImageP(void);
-extern int UtcDaliPushButtonSetDisabledBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetDisabledImageP(void);
-extern int UtcDaliPushButtonSetDisabledImageP2(void);
-extern int UtcDaliPushButtonSetDisabledSelectedImageP(void);
-extern int UtcDaliPushButtonSetDisabledSelectedImageP2(void);
 extern int UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP(void);
 extern int UtcDaliPushButtonSetIsAutoRepeatingP(void);
 extern int UtcDaliPushButtonSetGetNextAutoRepeatingDelayP(void);
@@ -176,17 +162,7 @@ extern int UtcDaliButtonSetGetInitialAutoRepeatingDelayP(void);
 extern int UtcDaliButtonSetGetNextAutoRepeatingDelayP(void);
 extern int UtcDaliButtonSetIsSelectedP(void);
 extern int UtcDaliButtonSetIsTogglableButtonP(void);
-extern int UtcDaliButtonSetGetAnimationTimeP(void);
-extern int UtcDaliButtonSetGetLabelTextP(void);
-extern int UtcDaliButtonSetUnselectedImageP(void);
-extern int UtcDaliButtonSetBackgroundImageP(void);
-extern int UtcDaliButtonSetGetSelectedImageP(void);
-extern int UtcDaliButtonSetSelectedBackgroundImageP(void);
-extern int UtcDaliButtonSetDisabledBackgroundImageP(void);
-extern int UtcDaliButtonSetDisabledImageP(void);
-extern int UtcDaliButtonSetDisabledSelectedImageP(void);
 extern int UtcDaliButtonSetGetLabelP(void);
-extern int UtcDaliButtonSetGetButtonImageP(void);
 extern int UtcDaliButtonDisabledPropertyP(void);
 extern int UtcDaliButtonSetDisabledWithDifferentStates01P(void);
 extern int UtcDaliButtonSetDisabledWithDifferentStates02P(void);
@@ -286,7 +262,6 @@ extern int UtcDaliImageViewSetAndGetImageP(void);
 extern int UtcDaliImageViewSetAndGetImageP2(void);
 extern int UtcDaliImageViewSetAndGetImageP3(void);
 extern int UtcDaliImageViewSetGetPropertyImage(void);
-extern int UtcDaliImageViewSetGetPropertyResourceUrl(void);
 extern int UtcDaliImageViewResourceReadySignalP(void);
 extern int UtcDaliImageViewIsResourceReady(void);
 extern int UtcDaliAccessibilityManagerConstructorP(void);
@@ -505,13 +480,11 @@ extern int UtcDaliControlImplGetPinchGestureDetectorP(void);
 extern int UtcDaliControlImplGetPanGestureDetectorP(void);
 extern int UtcDaliControlImplGetTapGestureDetectorP(void);
 extern int UtcDaliControlImplGetLongPressGestureDetectorP(void);
-extern int UtcDaliControlImplClearBackgroundP(void);
 extern int UtcDaliControlImplClearKeyInputFocusP(void);
 extern int UtcDaliControlImplSetAndHasKeyInputFocusP(void);
 extern int UtcDaliControlImplKeyInputFocusGainedSignalP(void);
 extern int UtcDaliControlImplKeyInputFocusLostSignalP(void);
 extern int UtcDaliControlImplSetGetStyleNameP(void);
-extern int UtcDaliControlImplSetGetBackgroundImageColorP(void);
 extern int UtcDaliControlImplKeyEventSignalP(void);
 extern int UtcDaliControlImplGetControlExtensionP(void);
 extern int UtcDaliControlImplGetNextKeyboardFocusableActorP(void);
@@ -644,20 +617,6 @@ testcase tc_array[] = {
        {"UtcDaliPushButtonOperatorAssignmentP",UtcDaliPushButtonOperatorAssignmentP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonDowncastP",UtcDaliPushButtonDowncastP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonDowncastN",UtcDaliPushButtonDowncastN,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetGetButtonImageP",UtcDaliPushButtonSetGetButtonImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetGetButtonImageP2",UtcDaliPushButtonSetGetButtonImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedBackgroundImageP",UtcDaliPushButtonSetSelectedBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedBackgroundImageP2",UtcDaliPushButtonSetSelectedBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetBackgroundImageP",UtcDaliPushButtonSetBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetBackgroundImageP2",UtcDaliPushButtonSetBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedImageP",UtcDaliPushButtonSetSelectedImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedImageP2",UtcDaliPushButtonSetSelectedImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledBackgroundImageP",UtcDaliPushButtonSetDisabledBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledBackgroundImageP2",UtcDaliPushButtonSetDisabledBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledImageP",UtcDaliPushButtonSetDisabledImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledImageP2",UtcDaliPushButtonSetDisabledImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledSelectedImageP",UtcDaliPushButtonSetDisabledSelectedImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledSelectedImageP2",UtcDaliPushButtonSetDisabledSelectedImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP",UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetIsAutoRepeatingP",UtcDaliPushButtonSetIsAutoRepeatingP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetGetNextAutoRepeatingDelayP",UtcDaliPushButtonSetGetNextAutoRepeatingDelayP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
@@ -703,17 +662,7 @@ testcase tc_array[] = {
        {"UtcDaliButtonSetGetNextAutoRepeatingDelayP",UtcDaliButtonSetGetNextAutoRepeatingDelayP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetIsSelectedP",UtcDaliButtonSetIsSelectedP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetIsTogglableButtonP",UtcDaliButtonSetIsTogglableButtonP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetAnimationTimeP",UtcDaliButtonSetGetAnimationTimeP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetLabelTextP",UtcDaliButtonSetGetLabelTextP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetUnselectedImageP",UtcDaliButtonSetUnselectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetBackgroundImageP",UtcDaliButtonSetBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetSelectedImageP",UtcDaliButtonSetGetSelectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetSelectedBackgroundImageP",UtcDaliButtonSetSelectedBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledBackgroundImageP",UtcDaliButtonSetDisabledBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledImageP",UtcDaliButtonSetDisabledImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledSelectedImageP",UtcDaliButtonSetDisabledSelectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetGetLabelP",UtcDaliButtonSetGetLabelP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetButtonImageP",UtcDaliButtonSetGetButtonImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonDisabledPropertyP",UtcDaliButtonDisabledPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetDisabledWithDifferentStates01P",UtcDaliButtonSetDisabledWithDifferentStates01P,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetDisabledWithDifferentStates02P",UtcDaliButtonSetDisabledWithDifferentStates02P,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
@@ -813,7 +762,6 @@ testcase tc_array[] = {
        {"UtcDaliImageViewSetAndGetImageP2",UtcDaliImageViewSetAndGetImageP2,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewSetAndGetImageP3",UtcDaliImageViewSetAndGetImageP3,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewSetGetPropertyImage",UtcDaliImageViewSetGetPropertyImage,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
-       {"UtcDaliImageViewSetGetPropertyResourceUrl",UtcDaliImageViewSetGetPropertyResourceUrl,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewResourceReadySignalP",UtcDaliImageViewResourceReadySignalP,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewIsResourceReady",UtcDaliImageViewIsResourceReady,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliAccessibilityManagerConstructorP",UtcDaliAccessibilityManagerConstructorP,utc_Dali_AccessibilityManager_startup,utc_Dali_AccessibilityManager_cleanup},
@@ -1032,13 +980,11 @@ testcase tc_array[] = {
        {"UtcDaliControlImplGetPanGestureDetectorP",UtcDaliControlImplGetPanGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetTapGestureDetectorP",UtcDaliControlImplGetTapGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetLongPressGestureDetectorP",UtcDaliControlImplGetLongPressGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
-       {"UtcDaliControlImplClearBackgroundP",UtcDaliControlImplClearBackgroundP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplClearKeyInputFocusP",UtcDaliControlImplClearKeyInputFocusP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplSetAndHasKeyInputFocusP",UtcDaliControlImplSetAndHasKeyInputFocusP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyInputFocusGainedSignalP",UtcDaliControlImplKeyInputFocusGainedSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyInputFocusLostSignalP",UtcDaliControlImplKeyInputFocusLostSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplSetGetStyleNameP",UtcDaliControlImplSetGetStyleNameP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
-       {"UtcDaliControlImplSetGetBackgroundImageColorP",UtcDaliControlImplSetGetBackgroundImageColorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyEventSignalP",UtcDaliControlImplKeyEventSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetControlExtensionP",UtcDaliControlImplGetControlExtensionP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetNextKeyboardFocusableActorP",UtcDaliControlImplGetNextKeyboardFocusableActorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
index df26fbce84eb22adff8c2d2bfa217739cd498476..2d20424ca7fb85bb88963fd214fd43fc1605db9d 100755 (executable)
@@ -117,20 +117,6 @@ extern int UtcDaliPushButtonNewP(void);
 extern int UtcDaliPushButtonOperatorAssignmentP(void);
 extern int UtcDaliPushButtonDowncastP(void);
 extern int UtcDaliPushButtonDowncastN(void);
-extern int UtcDaliPushButtonSetGetButtonImageP(void);
-extern int UtcDaliPushButtonSetGetButtonImageP2(void);
-extern int UtcDaliPushButtonSetSelectedBackgroundImageP(void);
-extern int UtcDaliPushButtonSetSelectedBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetBackgroundImageP(void);
-extern int UtcDaliPushButtonSetBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetSelectedImageP(void);
-extern int UtcDaliPushButtonSetSelectedImageP2(void);
-extern int UtcDaliPushButtonSetDisabledBackgroundImageP(void);
-extern int UtcDaliPushButtonSetDisabledBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetDisabledImageP(void);
-extern int UtcDaliPushButtonSetDisabledImageP2(void);
-extern int UtcDaliPushButtonSetDisabledSelectedImageP(void);
-extern int UtcDaliPushButtonSetDisabledSelectedImageP2(void);
 extern int UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP(void);
 extern int UtcDaliPushButtonSetIsAutoRepeatingP(void);
 extern int UtcDaliPushButtonSetGetNextAutoRepeatingDelayP(void);
@@ -176,17 +162,7 @@ extern int UtcDaliButtonSetGetInitialAutoRepeatingDelayP(void);
 extern int UtcDaliButtonSetGetNextAutoRepeatingDelayP(void);
 extern int UtcDaliButtonSetIsSelectedP(void);
 extern int UtcDaliButtonSetIsTogglableButtonP(void);
-extern int UtcDaliButtonSetGetAnimationTimeP(void);
-extern int UtcDaliButtonSetGetLabelTextP(void);
-extern int UtcDaliButtonSetUnselectedImageP(void);
-extern int UtcDaliButtonSetBackgroundImageP(void);
-extern int UtcDaliButtonSetGetSelectedImageP(void);
-extern int UtcDaliButtonSetSelectedBackgroundImageP(void);
-extern int UtcDaliButtonSetDisabledBackgroundImageP(void);
-extern int UtcDaliButtonSetDisabledImageP(void);
-extern int UtcDaliButtonSetDisabledSelectedImageP(void);
 extern int UtcDaliButtonSetGetLabelP(void);
-extern int UtcDaliButtonSetGetButtonImageP(void);
 extern int UtcDaliButtonDisabledPropertyP(void);
 extern int UtcDaliButtonSetDisabledWithDifferentStates01P(void);
 extern int UtcDaliButtonSetDisabledWithDifferentStates02P(void);
@@ -286,7 +262,6 @@ extern int UtcDaliImageViewSetAndGetImageP(void);
 extern int UtcDaliImageViewSetAndGetImageP2(void);
 extern int UtcDaliImageViewSetAndGetImageP3(void);
 extern int UtcDaliImageViewSetGetPropertyImage(void);
-extern int UtcDaliImageViewSetGetPropertyResourceUrl(void);
 extern int UtcDaliImageViewResourceReadySignalP(void);
 extern int UtcDaliImageViewIsResourceReady(void);
 extern int UtcDaliAccessibilityManagerConstructorP(void);
@@ -505,13 +480,11 @@ extern int UtcDaliControlImplGetPinchGestureDetectorP(void);
 extern int UtcDaliControlImplGetPanGestureDetectorP(void);
 extern int UtcDaliControlImplGetTapGestureDetectorP(void);
 extern int UtcDaliControlImplGetLongPressGestureDetectorP(void);
-extern int UtcDaliControlImplClearBackgroundP(void);
 extern int UtcDaliControlImplClearKeyInputFocusP(void);
 extern int UtcDaliControlImplSetAndHasKeyInputFocusP(void);
 extern int UtcDaliControlImplKeyInputFocusGainedSignalP(void);
 extern int UtcDaliControlImplKeyInputFocusLostSignalP(void);
 extern int UtcDaliControlImplSetGetStyleNameP(void);
-extern int UtcDaliControlImplSetGetBackgroundImageColorP(void);
 extern int UtcDaliControlImplKeyEventSignalP(void);
 extern int UtcDaliControlImplGetControlExtensionP(void);
 extern int UtcDaliControlImplGetNextKeyboardFocusableActorP(void);
@@ -640,20 +613,6 @@ testcase tc_array[] = {
        {"UtcDaliPushButtonOperatorAssignmentP",UtcDaliPushButtonOperatorAssignmentP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonDowncastP",UtcDaliPushButtonDowncastP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonDowncastN",UtcDaliPushButtonDowncastN,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetGetButtonImageP",UtcDaliPushButtonSetGetButtonImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetGetButtonImageP2",UtcDaliPushButtonSetGetButtonImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedBackgroundImageP",UtcDaliPushButtonSetSelectedBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedBackgroundImageP2",UtcDaliPushButtonSetSelectedBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetBackgroundImageP",UtcDaliPushButtonSetBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetBackgroundImageP2",UtcDaliPushButtonSetBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedImageP",UtcDaliPushButtonSetSelectedImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedImageP2",UtcDaliPushButtonSetSelectedImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledBackgroundImageP",UtcDaliPushButtonSetDisabledBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledBackgroundImageP2",UtcDaliPushButtonSetDisabledBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledImageP",UtcDaliPushButtonSetDisabledImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledImageP2",UtcDaliPushButtonSetDisabledImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledSelectedImageP",UtcDaliPushButtonSetDisabledSelectedImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledSelectedImageP2",UtcDaliPushButtonSetDisabledSelectedImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP",UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetIsAutoRepeatingP",UtcDaliPushButtonSetIsAutoRepeatingP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetGetNextAutoRepeatingDelayP",UtcDaliPushButtonSetGetNextAutoRepeatingDelayP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
@@ -699,17 +658,7 @@ testcase tc_array[] = {
        {"UtcDaliButtonSetGetNextAutoRepeatingDelayP",UtcDaliButtonSetGetNextAutoRepeatingDelayP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetIsSelectedP",UtcDaliButtonSetIsSelectedP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetIsTogglableButtonP",UtcDaliButtonSetIsTogglableButtonP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetAnimationTimeP",UtcDaliButtonSetGetAnimationTimeP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetLabelTextP",UtcDaliButtonSetGetLabelTextP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetUnselectedImageP",UtcDaliButtonSetUnselectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetBackgroundImageP",UtcDaliButtonSetBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetSelectedImageP",UtcDaliButtonSetGetSelectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetSelectedBackgroundImageP",UtcDaliButtonSetSelectedBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledBackgroundImageP",UtcDaliButtonSetDisabledBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledImageP",UtcDaliButtonSetDisabledImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledSelectedImageP",UtcDaliButtonSetDisabledSelectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetGetLabelP",UtcDaliButtonSetGetLabelP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetButtonImageP",UtcDaliButtonSetGetButtonImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonDisabledPropertyP",UtcDaliButtonDisabledPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetDisabledWithDifferentStates01P",UtcDaliButtonSetDisabledWithDifferentStates01P,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetDisabledWithDifferentStates02P",UtcDaliButtonSetDisabledWithDifferentStates02P,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
@@ -809,7 +758,6 @@ testcase tc_array[] = {
        {"UtcDaliImageViewSetAndGetImageP2",UtcDaliImageViewSetAndGetImageP2,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewSetAndGetImageP3",UtcDaliImageViewSetAndGetImageP3,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewSetGetPropertyImage",UtcDaliImageViewSetGetPropertyImage,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
-       {"UtcDaliImageViewSetGetPropertyResourceUrl",UtcDaliImageViewSetGetPropertyResourceUrl,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewResourceReadySignalP",UtcDaliImageViewResourceReadySignalP,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewIsResourceReady",UtcDaliImageViewIsResourceReady,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliAccessibilityManagerConstructorP",UtcDaliAccessibilityManagerConstructorP,utc_Dali_AccessibilityManager_startup,utc_Dali_AccessibilityManager_cleanup},
@@ -1028,13 +976,11 @@ testcase tc_array[] = {
        {"UtcDaliControlImplGetPanGestureDetectorP",UtcDaliControlImplGetPanGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetTapGestureDetectorP",UtcDaliControlImplGetTapGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetLongPressGestureDetectorP",UtcDaliControlImplGetLongPressGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
-       {"UtcDaliControlImplClearBackgroundP",UtcDaliControlImplClearBackgroundP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplClearKeyInputFocusP",UtcDaliControlImplClearKeyInputFocusP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplSetAndHasKeyInputFocusP",UtcDaliControlImplSetAndHasKeyInputFocusP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyInputFocusGainedSignalP",UtcDaliControlImplKeyInputFocusGainedSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyInputFocusLostSignalP",UtcDaliControlImplKeyInputFocusLostSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplSetGetStyleNameP",UtcDaliControlImplSetGetStyleNameP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
-       {"UtcDaliControlImplSetGetBackgroundImageColorP",UtcDaliControlImplSetGetBackgroundImageColorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyEventSignalP",UtcDaliControlImplKeyEventSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetControlExtensionP",UtcDaliControlImplGetControlExtensionP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetNextKeyboardFocusableActorP",UtcDaliControlImplGetNextKeyboardFocusableActorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
index 6e66a426c78d4ad6cba2064acb7b75eac4200f97..7489ab7078b5917c2def01845a6f5fe8b74907bd 100755 (executable)
@@ -117,20 +117,6 @@ extern int UtcDaliPushButtonNewP(void);
 extern int UtcDaliPushButtonOperatorAssignmentP(void);
 extern int UtcDaliPushButtonDowncastP(void);
 extern int UtcDaliPushButtonDowncastN(void);
-extern int UtcDaliPushButtonSetGetButtonImageP(void);
-extern int UtcDaliPushButtonSetGetButtonImageP2(void);
-extern int UtcDaliPushButtonSetSelectedBackgroundImageP(void);
-extern int UtcDaliPushButtonSetSelectedBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetBackgroundImageP(void);
-extern int UtcDaliPushButtonSetBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetSelectedImageP(void);
-extern int UtcDaliPushButtonSetSelectedImageP2(void);
-extern int UtcDaliPushButtonSetDisabledBackgroundImageP(void);
-extern int UtcDaliPushButtonSetDisabledBackgroundImageP2(void);
-extern int UtcDaliPushButtonSetDisabledImageP(void);
-extern int UtcDaliPushButtonSetDisabledImageP2(void);
-extern int UtcDaliPushButtonSetDisabledSelectedImageP(void);
-extern int UtcDaliPushButtonSetDisabledSelectedImageP2(void);
 extern int UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP(void);
 extern int UtcDaliPushButtonSetIsAutoRepeatingP(void);
 extern int UtcDaliPushButtonSetGetNextAutoRepeatingDelayP(void);
@@ -176,17 +162,7 @@ extern int UtcDaliButtonSetGetInitialAutoRepeatingDelayP(void);
 extern int UtcDaliButtonSetGetNextAutoRepeatingDelayP(void);
 extern int UtcDaliButtonSetIsSelectedP(void);
 extern int UtcDaliButtonSetIsTogglableButtonP(void);
-extern int UtcDaliButtonSetGetAnimationTimeP(void);
-extern int UtcDaliButtonSetGetLabelTextP(void);
-extern int UtcDaliButtonSetUnselectedImageP(void);
-extern int UtcDaliButtonSetBackgroundImageP(void);
-extern int UtcDaliButtonSetGetSelectedImageP(void);
-extern int UtcDaliButtonSetSelectedBackgroundImageP(void);
-extern int UtcDaliButtonSetDisabledBackgroundImageP(void);
-extern int UtcDaliButtonSetDisabledImageP(void);
-extern int UtcDaliButtonSetDisabledSelectedImageP(void);
 extern int UtcDaliButtonSetGetLabelP(void);
-extern int UtcDaliButtonSetGetButtonImageP(void);
 extern int UtcDaliButtonDisabledPropertyP(void);
 extern int UtcDaliButtonSetDisabledWithDifferentStates01P(void);
 extern int UtcDaliButtonSetDisabledWithDifferentStates02P(void);
@@ -286,7 +262,6 @@ extern int UtcDaliImageViewSetAndGetImageP(void);
 extern int UtcDaliImageViewSetAndGetImageP2(void);
 extern int UtcDaliImageViewSetAndGetImageP3(void);
 extern int UtcDaliImageViewSetGetPropertyImage(void);
-extern int UtcDaliImageViewSetGetPropertyResourceUrl(void);
 extern int UtcDaliImageViewResourceReadySignalP(void);
 extern int UtcDaliImageViewIsResourceReady(void);
 extern int UtcDaliAccessibilityManagerConstructorP(void);
@@ -505,13 +480,11 @@ extern int UtcDaliControlImplGetPinchGestureDetectorP(void);
 extern int UtcDaliControlImplGetPanGestureDetectorP(void);
 extern int UtcDaliControlImplGetTapGestureDetectorP(void);
 extern int UtcDaliControlImplGetLongPressGestureDetectorP(void);
-extern int UtcDaliControlImplClearBackgroundP(void);
 extern int UtcDaliControlImplClearKeyInputFocusP(void);
 extern int UtcDaliControlImplSetAndHasKeyInputFocusP(void);
 extern int UtcDaliControlImplKeyInputFocusGainedSignalP(void);
 extern int UtcDaliControlImplKeyInputFocusLostSignalP(void);
 extern int UtcDaliControlImplSetGetStyleNameP(void);
-extern int UtcDaliControlImplSetGetBackgroundImageColorP(void);
 extern int UtcDaliControlImplKeyEventSignalP(void);
 extern int UtcDaliControlImplGetControlExtensionP(void);
 extern int UtcDaliControlImplGetNextKeyboardFocusableActorP(void);
@@ -644,20 +617,6 @@ testcase tc_array[] = {
        {"UtcDaliPushButtonOperatorAssignmentP",UtcDaliPushButtonOperatorAssignmentP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonDowncastP",UtcDaliPushButtonDowncastP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonDowncastN",UtcDaliPushButtonDowncastN,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetGetButtonImageP",UtcDaliPushButtonSetGetButtonImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetGetButtonImageP2",UtcDaliPushButtonSetGetButtonImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedBackgroundImageP",UtcDaliPushButtonSetSelectedBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedBackgroundImageP2",UtcDaliPushButtonSetSelectedBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetBackgroundImageP",UtcDaliPushButtonSetBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetBackgroundImageP2",UtcDaliPushButtonSetBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedImageP",UtcDaliPushButtonSetSelectedImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetSelectedImageP2",UtcDaliPushButtonSetSelectedImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledBackgroundImageP",UtcDaliPushButtonSetDisabledBackgroundImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledBackgroundImageP2",UtcDaliPushButtonSetDisabledBackgroundImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledImageP",UtcDaliPushButtonSetDisabledImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledImageP2",UtcDaliPushButtonSetDisabledImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledSelectedImageP",UtcDaliPushButtonSetDisabledSelectedImageP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
-       {"UtcDaliPushButtonSetDisabledSelectedImageP2",UtcDaliPushButtonSetDisabledSelectedImageP2,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP",UtcDaliPushButtonSetGetInitialAutoRepeatingDelayP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetIsAutoRepeatingP",UtcDaliPushButtonSetIsAutoRepeatingP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
        {"UtcDaliPushButtonSetGetNextAutoRepeatingDelayP",UtcDaliPushButtonSetGetNextAutoRepeatingDelayP,utc_Dali_PushButton_startup,utc_Dali_PushButton_cleanup},
@@ -703,17 +662,7 @@ testcase tc_array[] = {
        {"UtcDaliButtonSetGetNextAutoRepeatingDelayP",UtcDaliButtonSetGetNextAutoRepeatingDelayP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetIsSelectedP",UtcDaliButtonSetIsSelectedP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetIsTogglableButtonP",UtcDaliButtonSetIsTogglableButtonP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetAnimationTimeP",UtcDaliButtonSetGetAnimationTimeP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetLabelTextP",UtcDaliButtonSetGetLabelTextP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetUnselectedImageP",UtcDaliButtonSetUnselectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetBackgroundImageP",UtcDaliButtonSetBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetSelectedImageP",UtcDaliButtonSetGetSelectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetSelectedBackgroundImageP",UtcDaliButtonSetSelectedBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledBackgroundImageP",UtcDaliButtonSetDisabledBackgroundImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledImageP",UtcDaliButtonSetDisabledImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetDisabledSelectedImageP",UtcDaliButtonSetDisabledSelectedImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetGetLabelP",UtcDaliButtonSetGetLabelP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
-       {"UtcDaliButtonSetGetButtonImageP",UtcDaliButtonSetGetButtonImageP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonDisabledPropertyP",UtcDaliButtonDisabledPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetDisabledWithDifferentStates01P",UtcDaliButtonSetDisabledWithDifferentStates01P,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonSetDisabledWithDifferentStates02P",UtcDaliButtonSetDisabledWithDifferentStates02P,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
@@ -813,7 +762,6 @@ testcase tc_array[] = {
        {"UtcDaliImageViewSetAndGetImageP2",UtcDaliImageViewSetAndGetImageP2,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewSetAndGetImageP3",UtcDaliImageViewSetAndGetImageP3,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewSetGetPropertyImage",UtcDaliImageViewSetGetPropertyImage,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
-       {"UtcDaliImageViewSetGetPropertyResourceUrl",UtcDaliImageViewSetGetPropertyResourceUrl,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewResourceReadySignalP",UtcDaliImageViewResourceReadySignalP,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliImageViewIsResourceReady",UtcDaliImageViewIsResourceReady,utc_Dali_ImageView_startup,utc_Dali_ImageView_cleanup},
        {"UtcDaliAccessibilityManagerConstructorP",UtcDaliAccessibilityManagerConstructorP,utc_Dali_AccessibilityManager_startup,utc_Dali_AccessibilityManager_cleanup},
@@ -1032,13 +980,11 @@ testcase tc_array[] = {
        {"UtcDaliControlImplGetPanGestureDetectorP",UtcDaliControlImplGetPanGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetTapGestureDetectorP",UtcDaliControlImplGetTapGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetLongPressGestureDetectorP",UtcDaliControlImplGetLongPressGestureDetectorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
-       {"UtcDaliControlImplClearBackgroundP",UtcDaliControlImplClearBackgroundP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplClearKeyInputFocusP",UtcDaliControlImplClearKeyInputFocusP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplSetAndHasKeyInputFocusP",UtcDaliControlImplSetAndHasKeyInputFocusP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyInputFocusGainedSignalP",UtcDaliControlImplKeyInputFocusGainedSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyInputFocusLostSignalP",UtcDaliControlImplKeyInputFocusLostSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplSetGetStyleNameP",UtcDaliControlImplSetGetStyleNameP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
-       {"UtcDaliControlImplSetGetBackgroundImageColorP",UtcDaliControlImplSetGetBackgroundImageColorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplKeyEventSignalP",UtcDaliControlImplKeyEventSignalP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetControlExtensionP",UtcDaliControlImplGetControlExtensionP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},
        {"UtcDaliControlImplGetNextKeyboardFocusableActorP",UtcDaliControlImplGetNextKeyboardFocusableActorP,utc_Dali_ControlImpl_startup,utc_Dali_ControlImpl_cleanup},