[UTC][dali-toolkit][NON-ACR][Addition of missing dali-toolkit testcases]

This patch includes missing APIs.

Depends upon:I03d63e06a4db02bc8f8e902657b5c37095703edb

Change-Id: Id5f1f651df07a37afc1c449e77b77dae579cebbb
Signed-off-by: puru <puru.dharma@samsung.com>

diff --git a/src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp b/src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp
index 5089ad9..2296b70 100755 (executable)
--- a/src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp
+++ b/src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp
@@ -171,7 +171,7 @@ void ImageViewNewWithUrlP()
 
 void ImageViewNewWithUrlAndSizeP()
 {
-  ImageView imageview = ImageView::New(TEST_IMAGE_FILE_NAME);
+  ImageView imageview = ImageView::New(TEST_IMAGE_FILE_NAME, ImageDimensions( 34, 34 ));
   DALI_CHECK_FAIL(!imageview, "ImageView::New(const std::string&, int) is failed.");
 
   DaliLog::PrintPass();

diff --git a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-landscape-view.cpp b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-landscape-view.cpp
index c74c023..b343dc5 100755 (executable)
--- a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-landscape-view.cpp
+++ b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-landscape-view.cpp
@@ -55,20 +55,20 @@ namespace
     PAGE_TURN_LANDSCAPE_VIEW_SET_GET_P,
   };
 
-  struct PageTureView_TestApp : public ConnectionTracker
+  struct PageTurnLandscapeView_TestApp : public ConnectionTracker
   {
-    PageTureView_TestApp( Application& app, int test_case )
+    PageTurnLandscapeView_TestApp( Application& app, int test_case )
       : mApplication( app ),
       mTestCase( test_case )
     {
-      mApplication.InitSignal().Connect( this, &PageTureView_TestApp::OnInit );
+      mApplication.InitSignal().Connect( this, &PageTurnLandscapeView_TestApp::OnInit );
     }
 
     void OnInit(Application& app)
     {
       ExcuteTest();
       mTimer = Timer::New( INTERVAL );
-      mTimer.TickSignal().Connect( this, &PageTureView_TestApp::Tick );
+      mTimer.TickSignal().Connect( this, &PageTurnLandscapeView_TestApp::Tick );
       mTimer.Start();
     }
 
@@ -164,8 +164,8 @@ namespace
 
 void PageTurnLandscapeViewConstructorP(void)
 {
-  PageTurnView landscapeView;
-  DALI_CHECK_FAIL(landscapeView,  "PageTurnView Default Contructor is failed for landscape view.");
+  PageTurnLandscapeView landscapeView;
+  DALI_CHECK_FAIL(landscapeView,  "PageTurnLandscapeView Default Contructor is failed for landscape view.");
 
   DaliLog::PrintPass();
 }
@@ -181,7 +181,7 @@ void PageTurnLandscapeViewNewP()
   gObjectCreatedCallBack = false;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
 
-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+  PageTurnLandscapeView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
   DALI_CHECK_FAIL(!landscapeView,  "PageTurnLandscapeView::New() is failed.");
   DALI_CHECK_FAIL(!gObjectCreatedCallBack,  "Registry ObjectCreatedSignal() does call for PageTurnLandscapeView.");
 
@@ -199,11 +199,11 @@ void PageTurnLandscapeViewCopyConstructorP()
   gObjectCreatedCallBack = false;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
 
-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+  PageTurnLandscapeView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
   DALI_CHECK_FAIL(!landscapeView,  "PageTurnLandscapeView::New() is failed.");
   DALI_CHECK_FAIL(!gObjectCreatedCallBack,  "Registry ObjectCreatedSignal() does call for PageTurnLandscapeView.");
 
-  PageTurnView viewCopy( landscapeView );
+  PageTurnLandscapeView viewCopy( landscapeView );
   DALI_CHECK_FAIL(!viewCopy,  "LandscapeView copy constructor is failed.");
 
   DaliLog::PrintPass();
@@ -219,13 +219,13 @@ void PageTurnLandscapeViewOperatorAssignmentP()
   gObjectCreatedCallBack = false;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
 
-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+  PageTurnLandscapeView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
   DALI_CHECK_FAIL(!landscapeView,  "PageTurnLandscapeView::New() is failed.");
   DALI_CHECK_FAIL(!gObjectCreatedCallBack,  "Registry ObjectCreatedSignal() does call for PageTurnLandscapeView.");
 
-  PageTurnView assignView;
+  PageTurnLandscapeView assignView;
   assignView = landscapeView;
-  DALI_CHECK_FAIL(assignView != landscapeView,  "PageTurnView::Assignment Operator is failed for landscape view.");
+  DALI_CHECK_FAIL(assignView != landscapeView,  "PageTurnLandscapeView::Assignment Operator is failed for landscape view.");
 
   DaliLog::PrintPass();
 
@@ -241,14 +241,14 @@ void PageTurnLandscapeViewDownCastP()
   gObjectCreatedCallBack = false;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
 
-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+  PageTurnLandscapeView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
   DALI_CHECK_FAIL(!landscapeView,  "PageTurnLandscapeView::New() is failed.");
   DALI_CHECK_FAIL(!gObjectCreatedCallBack,  "Registry ObjectCreatedSignal() does call for PageTurnLandscapeView.");
 
   Handle handleView;
   handleView = landscapeView;
-  PageTurnView downCastView = PageTurnView::DownCast( handleView );
-  DALI_CHECK_FAIL(!downCastView,  "PageTurnView::DownCast() is failed for landscape view.");
+  PageTurnLandscapeView downCastView = PageTurnLandscapeView::DownCast( handleView );
+  DALI_CHECK_FAIL(!downCastView,  "PageTurnLandscapeView::DownCast() is failed for landscape view.");
 
   DaliLog::PrintPass();
 }
@@ -257,11 +257,11 @@ void PageTurnLandscapeViewDownCastN()
 {
   BaseHandle unInitializedObject;
 
-  PageTurnView landscapeView1 = PageTurnView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(landscapeView1, "PageTurnView handle is not empty." );
+  PageTurnLandscapeView landscapeView1 = PageTurnLandscapeView::DownCast( unInitializedObject );
+  DALI_CHECK_FAIL(landscapeView1, "PageTurnLandscapeView handle is not empty." );
 
-  PageTurnView landscapeView2 = DownCast< PageTurnView >( unInitializedObject );
-  DALI_CHECK_FAIL(landscapeView2, "PageTurnView handle is not empty." );
+  PageTurnLandscapeView landscapeView2 = DownCast< PageTurnLandscapeView >( unInitializedObject );
+  DALI_CHECK_FAIL(landscapeView2, "PageTurnLandscapeView handle is not empty." );
 
   DaliLog::PrintPass();
 
@@ -320,7 +320,7 @@ int UtcDaliPageTurnLandscapeViewConstructorP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTureView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_CONSTRUCTOR_P );
+  PageTurnLandscapeView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_CONSTRUCTOR_P );
   application.MainLoop();
 
   return test_return_value;
@@ -337,7 +337,7 @@ int UtcDaliPageTurnLandscapeViewNewP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTureView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_NEW_P );
+  PageTurnLandscapeView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_NEW_P );
   application.MainLoop();
 
   return test_return_value;
@@ -354,7 +354,7 @@ int UtcDaliPageTurnLandscapeViewCopyConstructorP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTureView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_COPY_CONSTRUCTOR_P );
+  PageTurnLandscapeView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_COPY_CONSTRUCTOR_P );
   application.MainLoop();
 
   return test_return_value;
@@ -371,7 +371,7 @@ int UtcDaliPageTurnLandscapeViewOperatorAssignmentP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTureView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_OPERATOR_ASSIGNMENT_P );
+  PageTurnLandscapeView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_OPERATOR_ASSIGNMENT_P );
   application.MainLoop();
 
   return test_return_value;
@@ -388,7 +388,7 @@ int UtcDaliPageTurnLandscapeViewDowncastP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTureView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_DOWNCAST_P );
+  PageTurnLandscapeView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_DOWNCAST_P );
   application.MainLoop();
 
   return test_return_value;
@@ -405,7 +405,7 @@ int UtcDaliPageTurnLandscapeViewDowncastN(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTureView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_DOWNCAST_N );
+  PageTurnLandscapeView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_DOWNCAST_N );
   application.MainLoop();
 
   return test_return_value;
@@ -422,7 +422,7 @@ int UtcDaliPageTurnLandscapeViewSetGetP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTureView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_SET_GET_P );
+  PageTurnLandscapeView_TestApp testApp( application, PAGE_TURN_LANDSCAPE_VIEW_SET_GET_P );
   application.MainLoop();
 
   return test_return_value;

diff --git a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-portrait-view.cpp b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-portrait-view.cpp
index aea2861..747bc16 100755 (executable)
--- a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-portrait-view.cpp
+++ b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-portrait-view.cpp
@@ -55,20 +55,20 @@ namespace
     PAGE_TURN_PORTRAIT_VIEW_SET_GET_P,
   };
 
-  struct PageTurnView_TestApp : public ConnectionTracker
+  struct PageTurnPortraitView_TestApp : public ConnectionTracker
   {
-    PageTurnView_TestApp( Application& app, int test_case )
+    PageTurnPortraitView_TestApp( Application& app, int test_case )
       : mApplication( app ),
       mTestCase( test_case )
     {
-      mApplication.InitSignal().Connect( this, &PageTurnView_TestApp::OnInit );
+      mApplication.InitSignal().Connect( this, &PageTurnPortraitView_TestApp::OnInit );
     }
 
     void OnInit(Application& app)
     {
       ExcuteTest();
       mTimer = Timer::New( INTERVAL );
-      mTimer.TickSignal().Connect( this, &PageTurnView_TestApp::Tick );
+      mTimer.TickSignal().Connect( this, &PageTurnPortraitView_TestApp::Tick );
       mTimer.Start();
     }
 
@@ -164,7 +164,7 @@ namespace
 
 void PageTurnPortraitViewConstructorP(void)
 {
-  PageTurnView portraitView;
+  PageTurnPortraitView portraitView;
   DALI_CHECK_FAIL(portraitView,  "PageTurnView Default Contructor is failed for portrait view.");
 
   DaliLog::PrintPass();
@@ -181,7 +181,7 @@ void PageTurnPortraitViewNewP()
   gObjectCreatedCallBack = false;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
 
-  PageTurnView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+  PageTurnPortraitView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
   DALI_CHECK_FAIL(!portraitView,  "PageTurnPortraitView::New() is failed.");
   DALI_CHECK_FAIL(!gObjectCreatedCallBack,  "Registry ObjectCreatedSignal() does call for PageTurnPortraitView.");
 
@@ -199,11 +199,11 @@ void PageTurnPortraitViewCopyConstructorP()
   gObjectCreatedCallBack = false;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
 
-  PageTurnView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+  PageTurnPortraitView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
   DALI_CHECK_FAIL(!portraitView,  "PageTurnPortraitView::New() is failed.");
   DALI_CHECK_FAIL(!gObjectCreatedCallBack,  "Registry ObjectCreatedSignal() does call for PageTurnPortraitView.");
 
-  PageTurnView viewCopy( portraitView );
+  PageTurnPortraitView viewCopy( portraitView );
   DALI_CHECK_FAIL(!viewCopy,  "PortraitView copy constructor is failed.");
 
   DaliLog::PrintPass();
@@ -219,13 +219,13 @@ void PageTurnPortraitViewOperatorAssignmentP()
   gObjectCreatedCallBack = false;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
 
-  PageTurnView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+  PageTurnPortraitView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
   DALI_CHECK_FAIL(!portraitView,  "PageTurnPortraitView::New() is failed.");
   DALI_CHECK_FAIL(!gObjectCreatedCallBack,  "Registry ObjectCreatedSignal() does call for PageTurnPortraitView.");
 
-  PageTurnView assignView;
+  PageTurnPortraitView assignView;
   assignView = portraitView;
-  DALI_CHECK_FAIL(assignView != portraitView,  "PageTurnView::Assignment Operator is failed for portrait view.");
+  DALI_CHECK_FAIL(assignView != portraitView,  "PageTurnPortraitView::Assignment Operator is failed for portrait view.");
 
   DaliLog::PrintPass();
 
@@ -241,14 +241,14 @@ void PageTurnPortraitViewDownCastP()
   gObjectCreatedCallBack = false;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
 
-  PageTurnView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+  PageTurnPortraitView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
   DALI_CHECK_FAIL(!portraitView,  "PageTurnPortraitView::New() is failed.");
   DALI_CHECK_FAIL(!gObjectCreatedCallBack,  "Registry ObjectCreatedSignal() does call for PageTurnPortraitView.");
 
   Handle handleView;
   handleView = portraitView;
-  PageTurnView downCastView = PageTurnView::DownCast( handleView );
-  DALI_CHECK_FAIL(!downCastView,  "PageTurnView::DownCast() is failed for portrait view.");
+  PageTurnPortraitView downCastView = PageTurnPortraitView::DownCast( handleView );
+  DALI_CHECK_FAIL(!downCastView,  "PageTurnPortraitView::DownCast() is failed for portrait view.");
 
   DaliLog::PrintPass();
 }
@@ -257,11 +257,11 @@ void PageTurnPortraitViewDownCastN()
 {
   BaseHandle unInitializedObject;
 
-  PageTurnView portraitView1 = PageTurnView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(portraitView1, "PageTurnView handle is not empty." );
+  PageTurnPortraitView portraitView1 = PageTurnPortraitView::DownCast( unInitializedObject );
+  DALI_CHECK_FAIL(portraitView1, "PageTurnPortraitView handle is not empty." );
 
-  PageTurnView portraitView2 = DownCast< PageTurnView >( unInitializedObject );
-  DALI_CHECK_FAIL(portraitView2, "PageTurnView handle is not empty." );
+  PageTurnPortraitView portraitView2 = DownCast< PageTurnPortraitView >( unInitializedObject );
+  DALI_CHECK_FAIL(portraitView2, "PageTurnPortraitView handle is not empty." );
 
   DaliLog::PrintPass();
 
@@ -322,7 +322,7 @@ int UtcDaliPageTurnPortraitViewConstructorP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTurnView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_CONSTRUCTOR_P );
+  PageTurnPortraitView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_CONSTRUCTOR_P );
   application.MainLoop();
 
   return test_return_value;
@@ -339,7 +339,7 @@ int UtcDaliPageTurnPortraitViewNewP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTurnView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_NEW_P );
+  PageTurnPortraitView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_NEW_P );
   application.MainLoop();
 
   return test_return_value;
@@ -356,7 +356,7 @@ int UtcDaliPageTurnPortraitViewCopyConstructorP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTurnView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_COPY_CONSTRUCTOR_P );
+  PageTurnPortraitView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_COPY_CONSTRUCTOR_P );
   application.MainLoop();
 
   return test_return_value;
@@ -373,7 +373,7 @@ int UtcDaliPageTurnPortraitViewOperatorAssignmentP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTurnView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_OPERATOR_ASSIGNMENT_P );
+  PageTurnPortraitView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_OPERATOR_ASSIGNMENT_P );
   application.MainLoop();
 
   return test_return_value;
@@ -390,7 +390,7 @@ int UtcDaliPageTurnPortraitViewDowncastP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTurnView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_DOWNCAST_P );
+  PageTurnPortraitView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_DOWNCAST_P );
   application.MainLoop();
 
   return test_return_value;
@@ -407,7 +407,7 @@ int UtcDaliPageTurnPortraitViewDowncastN(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTurnView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_DOWNCAST_N );
+  PageTurnPortraitView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_DOWNCAST_N );
   application.MainLoop();
 
   return test_return_value;
@@ -425,7 +425,7 @@ int UtcDaliPageTurnPortraitViewSetGetP(void)
   DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
   Application application = Application::New( &gArgc, &gArgv );
   CHECK_GL;
-  PageTurnView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_SET_GET_P );
+  PageTurnPortraitView_TestApp testApp( application, PAGE_TURN_PORTRAIT_VIEW_SET_GET_P );
   application.MainLoop();
 
   return test_return_value;

diff --git a/src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp b/src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp
index 72fbbe3..bc5e774 100755 (executable)
--- a/src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp
+++ b/src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp
@@ -42,9 +42,11 @@ void PushButtonSetBackgroundImageP2();
 void PushButtonSetSelectedImageP();
 void PushButtonSetSelectedImageP2();
 void PushButtonSetSelectedBackgroundImageP();
+void PushButtonSetSelectedBackgroundImageP2();
 void PushButtonSetDisabledBackgroundImageP();
 void PushButtonSetDisabledBackgroundImageP2();
 void PushButtonSetDisabledImageP();
+void PushButtonSetDisabledImageP2();
 void PushButtonSetDisabledSelectedImageP();
 void PushButtonSetDisabledSelectedImageP2();
 void PushButtonSetGetInitialAutoRepeatingDelayP();
@@ -71,9 +73,11 @@ namespace
     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,
@@ -161,6 +165,10 @@ namespace
           PushButtonSetSelectedBackgroundImageP();
           break;
 
+        case PUSH_BUTTON_SET_SELECTED_BACKGROUND_IMAGE_P2:
+          PushButtonSetSelectedBackgroundImageP2();
+          break;
+
         case PUSH_BUTTON_SET_DISABLED_BACKGROUND_IMAGE_P:
           PushButtonSetDisabledBackgroundImageP();
           break;
@@ -173,6 +181,10 @@ namespace
           PushButtonSetDisabledImageP();
           break;
 
+        case PUSH_BUTTON_SET_DISABLED_IMAGE_P2:
+          PushButtonSetDisabledImageP2();
+          break;
+
         case PUSH_BUTTON_SET_DISABLED_SELECTED_IMAGE_P:
           PushButtonSetDisabledSelectedImageP();
           break;
@@ -231,7 +243,7 @@ void PushButtonCopyConstructorP()
 {
   bool bBorder = false;
   const unsigned int unBorderSize = 1u;
-  Image imgset ;
+  Image imgset;
   DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
 
   Actor imageActor = ImageView::New(imgset);
@@ -316,7 +328,7 @@ void PushButtonSetGetInitialAutoRepeatingDelayP()
 
 void PushButtonSetGetButtonImageP()
 {
-  Image imgset ;
+  Image imgset;
   DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
 
   PushButton pushButton = PushButton::New();
@@ -332,13 +344,12 @@ void PushButtonSetGetButtonImageP()
 
 void PushButtonSetGetButtonImageP2()
 {
-  Image imgset ;
+  Image imgset;
   DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
 
   Actor imgActorSet = ImageView::New(imgset);
   DALI_CHECK_FAIL(!imgActorSet,  "ImageView::New() is failed .");
 
-  Vector3 vectfGetImgSize;
   PushButton pushButton = PushButton::New();
   Stage::GetCurrent().Add( pushButton );
 
@@ -358,7 +369,7 @@ void PushButtonSetBackgroundImageP()
   if(strActualPathOne=="")
   {
     LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
+    test_return_value = 1;
     return;
   }
 
@@ -373,7 +384,7 @@ void PushButtonSetBackgroundImageP()
   {
     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;
+    test_return_value = 1;
     return;
   }
   strActualPathOne.clear();
@@ -383,11 +394,10 @@ void PushButtonSetBackgroundImageP()
 
 void PushButtonSetBackgroundImageP2()
 {
-  Image imgset ;
+  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();
@@ -395,7 +405,6 @@ void PushButtonSetBackgroundImageP2()
 
   DALI_CHECK_FAIL(!pushButton,  "PushButton::New() is failed .");
 
-  pushButton.SetBackgroundImage( imgActorSet );
   try
   {
     pushButton.SetBackgroundImage( imgActorSet );
@@ -404,16 +413,17 @@ void PushButtonSetBackgroundImageP2()
   {
     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;
+    test_return_value = 1;
     return;
   }
+  Stage::GetCurrent().Remove( pushButton );
 
   DaliLog::PrintPass();
 }
 
 void PushButtonSetSelectedImageP()
 {
-  Image imgset ;
+  Image imgset;
   DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
 
   PushButton pushButton = PushButton::New();
@@ -430,22 +440,17 @@ void PushButtonSetSelectedImageP()
 void PushButtonSetSelectedImageP2()
 {
 
-  Image imgset ;
-
+  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.SetSelectedImage( imgActorSet );
-
   Image imgGetImage = ImageView::DownCast(pushButton.GetSelectedImage()).GetImage();
-
   DALI_CHECK_FAIL(imgGetImage != imgset ,  "SetSelectedImage and GetSelectedImage  is not Matched properly.");
 
   DaliLog::PrintPass();
@@ -457,7 +462,7 @@ void PushButtonSetSelectedBackgroundImageP()
   if(strActualPathOne=="")
   {
     LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
+    test_return_value = 1;
     return;
   }
 
@@ -472,20 +477,48 @@ void PushButtonSetSelectedBackgroundImageP()
   {
     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;
+    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;
+    test_return_value = 1;
     return;
   }
 
@@ -502,7 +535,7 @@ void PushButtonSetDisabledBackgroundImageP()
   {
     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;
+    test_return_value = 1;
     return;
   }
   strActualPathOne.clear();
@@ -511,19 +544,15 @@ void PushButtonSetDisabledBackgroundImageP()
 
 void PushButtonSetDisabledBackgroundImageP2()
 {
-  Image imgset ;
-
+  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.SetDisabledBackgroundImage( imgActorSet );
   try
   {
     pushButton.SetDisabledBackgroundImage( imgActorSet );
@@ -532,7 +561,7 @@ void PushButtonSetDisabledBackgroundImageP2()
   {
     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;
+    test_return_value = 1;
     return;
   }
 
@@ -545,7 +574,7 @@ void PushButtonSetDisabledImageP()
   if(strActualPathOne=="")
   {
     LOG_E( "Unable to get resource path from app data directory." );
-    test_return_value=1;
+    test_return_value = 1;
     return;
   }
 
@@ -560,20 +589,46 @@ void PushButtonSetDisabledImageP()
   {
     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;
+    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;
+    test_return_value = 1;
     return;
   }
 
@@ -588,7 +643,7 @@ void PushButtonSetDisabledSelectedImageP()
   {
     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;
+    test_return_value = 1;
     return;
   }
   strActualPathOne.clear();
@@ -597,7 +652,7 @@ void PushButtonSetDisabledSelectedImageP()
 
 void PushButtonSetDisabledSelectedImageP2()
 {
-  Image imgset ;
+  Image imgset;
   DALI_CHECK_FAIL(!PushButtonCreateImage(imgset),  "PushButtonCreateImage is failed .");
 
   Actor imgActorSet = ImageView::New(imgset);
@@ -606,7 +661,6 @@ void PushButtonSetDisabledSelectedImageP2()
   PushButton pushButton = PushButton::New();
   DALI_CHECK_FAIL(!pushButton, "PushButton::New() is failed .");
 
-  pushButton.SetDisabledBackgroundImage( imgActorSet );
   try
   {
     pushButton.SetDisabledSelectedImage( imgActorSet );
@@ -615,7 +669,7 @@ void PushButtonSetDisabledSelectedImageP2()
   {
     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;
+    test_return_value = 1;
     return;
   }
 
@@ -835,7 +889,23 @@ int UtcDaliPushButtonSetSelectedBackgroundImageP(void)
   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
@@ -966,6 +1036,24 @@ int UtcDaliPushButtonSetDisabledImageP(void)
 }
 
 /**
+ * @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.
@@ -986,7 +1074,7 @@ int UtcDaliPushButtonSetDisabledSelectedImageP(void)
 /**
  * @testcase            UtcDaliPushButtonSetDisabledSelectedImageP2
  * @since_tizen         2.4
- * @description         Sets and Get  the button disabled selected image with image.
+ * @description         Sets and Get  the button disabled selected image with actor.
  */
 
 int UtcDaliPushButtonSetDisabledSelectedImageP2(void)

diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_common_iot.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_common_iot.h
index 4573036..241c17f 100755 (executable)
--- a/src/utc/dali-toolkit/tct-dali-toolkit-core_common_iot.h
+++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_common_iot.h
@@ -171,6 +171,7 @@ 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);
@@ -178,6 +179,7 @@ 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);
@@ -707,6 +709,7 @@ testcase tc_array[] = {
   {"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},
@@ -714,6 +717,7 @@ testcase tc_array[] = {
   {"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},

diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h
index 1ad229a..68dda34 100755 (executable)
--- a/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h
+++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h
@@ -171,6 +171,7 @@ 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);
@@ -178,6 +179,7 @@ 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);
@@ -707,6 +709,7 @@ testcase tc_array[] = {
   {"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},
@@ -714,6 +717,7 @@ testcase tc_array[] = {
   {"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},

diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h
index 4573036..241c17f 100755 (executable)
--- a/src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h
+++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_tv.h
@@ -171,6 +171,7 @@ 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);
@@ -178,6 +179,7 @@ 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);
@@ -707,6 +709,7 @@ testcase tc_array[] = {
   {"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},
@@ -714,6 +717,7 @@ testcase tc_array[] = {
   {"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},

diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h
index 4573036..241c17f 100755 (executable)
--- a/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h
+++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h
@@ -171,6 +171,7 @@ 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);
@@ -178,6 +179,7 @@ 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);
@@ -707,6 +709,7 @@ testcase tc_array[] = {
   {"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},
@@ -714,6 +717,7 @@ testcase tc_array[] = {
   {"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},