[UTC][dali-toolkit][ACR-1436][Add dali button visual properties]

Change-Id: I3774a0dcf45fcc3e0bfeae3f0c5bf24ed2cee031
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/src/utc/dali-toolkit/button/utc-dali-button.cpp b/src/utc/dali-toolkit/button/utc-dali-button.cpp
index 124d273e6f68b1304d3cac6e9b79d441f5f629b0..bf057237a32ddd0ab750d243b461b6cf437d33a0 100755 (executable)
--- a/src/utc/dali-toolkit/button/utc-dali-button.cpp
+++ b/src/utc/dali-toolkit/button/utc-dali-button.cpp
@@ -63,6 +63,14 @@ void ButtonAutoRepeatingPropertyP();
 void ButtonInitialAutoRepeatingDelayPropertyP();
 void ButtonNextAutoRepeatingDelayPropertyP();
 void ButtonTogglablePropertyP();
+void ButtonSetUnselectedVisualP();
+void ButtonSetSelectedVisualP();
+void ButtonSetDisabledSelectedVisualP();
+void ButtonSetDisabledUnselectedVisualP();
+void ButtonSetUnselectedBackgroundVisualP();
+void ButtonSetSelectedBackgroundVisualP();
+void ButtonSetDisabledUnselectedBackgroundVisualP();
+void ButtonSetDisabledSelectedBackgroundVisualP();
 
 namespace
 {
@@ -86,7 +94,15 @@ namespace
     BUTTON_AUTO_REPEATING_PROPERTY_P,
     BUTTON_INITIAL_AUTO_REPEATING_DELAY_PROPERTY_P,
     BUTTON_NEXT_AUTO_REPEATING_DELAY_PROPERTY_P,
-    BUTTON_TOGGLABLE_PROPERTY_P
+    BUTTON_TOGGLABLE_PROPERTY_P,
+    BUTTON_SET_UNSELECTED_VISUAL_P,
+    BUTTON_SET_SELECTED_VISUAL_P,
+    BUTTON_SET_DISABLED_SELECTED_VISUAL_P,
+    BUTTON_SET_DISABLED_UNSELECTED_VISUAL_P,
+    BUTTON_SET_UNSELECTED_BACKGROUND_VISUAL_P,
+    BUTTON_SET_SELECTED_BACKGROUND_VISUAL_P,
+    BUTTON_SET_DISABLED_UNSELECTED_BACKGROUND_VISUAL_P,
+    BUTTON_SET_DISABLED_SELECTED_BACKGROUND_VISUAL_P
   };
 
   struct Button_TestApp : public ConnectionTracker
@@ -192,6 +208,38 @@ namespace
         case BUTTON_TOGGLABLE_PROPERTY_P:
           ButtonTogglablePropertyP();
           break;
+
+        case BUTTON_SET_UNSELECTED_VISUAL_P:
+          ButtonSetUnselectedVisualP();
+          break;
+
+        case BUTTON_SET_SELECTED_VISUAL_P:
+          ButtonSetSelectedVisualP();
+          break;
+
+        case BUTTON_SET_DISABLED_SELECTED_VISUAL_P:
+          ButtonSetDisabledSelectedVisualP();
+          break;
+
+        case BUTTON_SET_DISABLED_UNSELECTED_VISUAL_P:
+          ButtonSetDisabledUnselectedVisualP();
+          break;
+
+        case BUTTON_SET_UNSELECTED_BACKGROUND_VISUAL_P:
+          ButtonSetUnselectedBackgroundVisualP();
+          break;
+
+        case BUTTON_SET_SELECTED_BACKGROUND_VISUAL_P:
+          ButtonSetSelectedBackgroundVisualP();
+          break;
+
+        case BUTTON_SET_DISABLED_UNSELECTED_BACKGROUND_VISUAL_P:
+          ButtonSetDisabledUnselectedBackgroundVisualP();
+          break;
+
+        case BUTTON_SET_DISABLED_SELECTED_BACKGROUND_VISUAL_P:
+          ButtonSetDisabledSelectedBackgroundVisualP();
+          break;
       }
     }
 
@@ -543,6 +591,230 @@ void ButtonTogglablePropertyP()
   DaliLog::PrintPass();
 }
 
+void ButtonSetUnselectedVisualP()
+{
+  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.SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, 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 ButtonSetSelectedVisualP()
+{
+  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.SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, 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 ButtonSetDisabledSelectedVisualP()
+{
+  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.SetProperty( Toolkit::Button::Property::DISABLED_SELECTED_VISUAL, 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 ButtonSetDisabledUnselectedVisualP()
+{
+  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.SetProperty( Toolkit::Button::Property::DISABLED_UNSELECTED_VISUAL, 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 ButtonSetUnselectedBackgroundVisualP()
+{
+  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.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, 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 ButtonSetSelectedBackgroundVisualP()
+{
+  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.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, 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 ButtonSetDisabledUnselectedBackgroundVisualP()
+{
+  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.SetProperty( Toolkit::Button::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, 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 ButtonSetDisabledSelectedBackgroundVisualP()
+{
+  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.SetProperty( Toolkit::Button::Property::DISABLED_SELECTED_BACKGROUND_VISUAL, 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();
+}
+
 /**
  * End of TC Logic Implementation Area.
  **/
@@ -889,3 +1161,147 @@ int UtcDaliButtonTogglablePropertyP(void)
 
   return test_return_value;
 }
+
+/**
+ * @testcase            UtcDaliButtonSetUnselectedVisualP
+ * @since_tizen         5.5
+ * @description         Sets the unselected button foreground/icon visual
+ */
+
+int UtcDaliButtonSetUnselectedVisualP(void)
+{
+  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
+
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Button_TestApp testApp( application, BUTTON_SET_UNSELECTED_VISUAL_P );
+  application.MainLoop();
+
+  return test_return_value;
+}
+
+/**
+ * @testcase            UtcDaliButtonSetSelectedVisualP
+ * @since_tizen         5.5
+ * @description         Sets the selected button foreground/icon visual
+ */
+
+int UtcDaliButtonSetSelectedVisualP(void)
+{
+  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
+
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Button_TestApp testApp( application, BUTTON_SET_SELECTED_VISUAL_P );
+  application.MainLoop();
+
+  return test_return_value;
+}
+
+/**
+ * @testcase            UtcDaliButtonSetDisabledSelectedVisualP
+ * @since_tizen         5.5
+ * @description         Sets the disabled selected state foreground/icon button visual
+ */
+
+int UtcDaliButtonSetDisabledSelectedVisualP(void)
+{
+  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
+
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Button_TestApp testApp( application, BUTTON_SET_DISABLED_SELECTED_VISUAL_P );
+  application.MainLoop();
+
+  return test_return_value;
+}
+
+/**
+ * @testcase            UtcDaliButtonSetDisabledUnselectedVisualP
+ * @since_tizen         5.5
+ * @description         Sets the disabled unselected state foreground/icon visual
+ */
+
+int UtcDaliButtonSetDisabledUnselectedVisualP(void)
+{
+  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
+
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Button_TestApp testApp( application, BUTTON_SET_DISABLED_UNSELECTED_VISUAL_P );
+  application.MainLoop();
+
+  return test_return_value;
+}
+
+/**
+ * @testcase            UtcDaliButtonSetUnselectedBackgroundVisualP
+ * @since_tizen         5.5
+ * @description         Sets the disabled in the unselected state background, button visual
+ */
+
+int UtcDaliButtonSetUnselectedBackgroundVisualP(void)
+{
+  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
+
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Button_TestApp testApp( application, BUTTON_SET_UNSELECTED_BACKGROUND_VISUAL_P );
+  application.MainLoop();
+
+  return test_return_value;
+}
+
+/**
+ * @testcase            UtcDaliButtonSetSelectedBackgroundVisualP
+ * @since_tizen         5.5
+ * @description         Sets the selected background button visual
+ */
+
+int UtcDaliButtonSetSelectedBackgroundVisualP(void)
+{
+  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
+
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Button_TestApp testApp( application, BUTTON_SET_SELECTED_BACKGROUND_VISUAL_P );
+  application.MainLoop();
+
+  return test_return_value;
+}
+
+/**
+ * @testcase            UtcDaliButtonSetDisabledUnselectedBackgroundVisualP
+ * @since_tizen         5.5
+ * @description         Sets the disabled while unselected background button visual
+ */
+
+int UtcDaliButtonSetDisabledUnselectedBackgroundVisualP(void)
+{
+  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
+
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Button_TestApp testApp( application, BUTTON_SET_DISABLED_UNSELECTED_BACKGROUND_VISUAL_P );
+  application.MainLoop();
+
+  return test_return_value;
+}
+
+/**
+ * @testcase            UtcDaliButtonSetDisabledSelectedBackgroundVisualP
+ * @since_tizen         5.5
+ * @description         Sets the disabled while selected background button visual
+ */
+
+int UtcDaliButtonSetDisabledSelectedBackgroundVisualP(void)
+{
+  DaliLog::PrintExecStarted( SUITE_NAME, __FUNCTION__ );
+
+  Application application = Application::New( &gArgc, &gArgv );
+  CHECK_GL;
+  Button_TestApp testApp( application, BUTTON_SET_DISABLED_SELECTED_BACKGROUND_VISUAL_P );
+  application.MainLoop();
+
+  return test_return_value;
+}

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 7489ab7078b5917c2def01845a6f5fe8b74907bd..da8d1507603bed3e345768a47a458535e693d3e2 100755 (executable)
--- a/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h
+++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_mobile.h
@@ -170,6 +170,14 @@ extern int UtcDaliButtonAutoRepeatingPropertyP(void);
 extern int UtcDaliButtonInitialAutoRepeatingDelayPropertyP(void);
 extern int UtcDaliButtonNextAutoRepeatingDelayPropertyP(void);
 extern int UtcDaliButtonTogglablePropertyP(void);
+extern int UtcDaliButtonSetUnselectedVisualP(void);
+extern int UtcDaliButtonSetSelectedVisualP(void);
+extern int UtcDaliButtonSetDisabledSelectedVisualP(void);
+extern int UtcDaliButtonSetDisabledUnselectedVisualP(void);
+extern int UtcDaliButtonSetUnselectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetSelectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetDisabledUnselectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetDisabledSelectedBackgroundVisualP(void);
 extern int UtcDaliItemFactoryConstructorP(void);
 extern int UtcDaliItemFactoryNewP(void);
 extern int UtcDaliItemFactoryOperatorAssignmentP(void);
@@ -670,6 +678,14 @@ testcase tc_array[] = {
        {"UtcDaliButtonInitialAutoRepeatingDelayPropertyP",UtcDaliButtonInitialAutoRepeatingDelayPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonNextAutoRepeatingDelayPropertyP",UtcDaliButtonNextAutoRepeatingDelayPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonTogglablePropertyP",UtcDaliButtonTogglablePropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetUnselectedVisualP",UtcDaliButtonSetUnselectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetSelectedVisualP",UtcDaliButtonSetSelectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledSelectedVisualP",UtcDaliButtonSetDisabledSelectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledUnselectedVisualP",UtcDaliButtonSetDisabledUnselectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetUnselectedBackgroundVisualP",UtcDaliButtonSetUnselectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetSelectedBackgroundVisualP",UtcDaliButtonSetSelectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledUnselectedBackgroundVisualP",UtcDaliButtonSetDisabledUnselectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledSelectedBackgroundVisualP",UtcDaliButtonSetDisabledSelectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliItemFactoryConstructorP",UtcDaliItemFactoryConstructorP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_cleanup},
        {"UtcDaliItemFactoryNewP",UtcDaliItemFactoryNewP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_cleanup},
        {"UtcDaliItemFactoryOperatorAssignmentP",UtcDaliItemFactoryOperatorAssignmentP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_cleanup},

diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core_tizeniot.h b/src/utc/dali-toolkit/tct-dali-toolkit-core_tizeniot.h
index 2d20424ca7fb85bb88963fd214fd43fc1605db9d..43593fe9f18be25929205cc4e2918d2c66f24483 100755 (executable)
--- a/src/utc/dali-toolkit/tct-dali-toolkit-core_tizeniot.h
+++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_tizeniot.h
@@ -170,6 +170,14 @@ extern int UtcDaliButtonAutoRepeatingPropertyP(void);
 extern int UtcDaliButtonInitialAutoRepeatingDelayPropertyP(void);
 extern int UtcDaliButtonNextAutoRepeatingDelayPropertyP(void);
 extern int UtcDaliButtonTogglablePropertyP(void);
+extern int UtcDaliButtonSetUnselectedVisualP(void);
+extern int UtcDaliButtonSetSelectedVisualP(void);
+extern int UtcDaliButtonSetDisabledSelectedVisualP(void);
+extern int UtcDaliButtonSetDisabledUnselectedVisualP(void);
+extern int UtcDaliButtonSetUnselectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetSelectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetDisabledUnselectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetDisabledSelectedBackgroundVisualP(void);
 extern int UtcDaliItemFactoryConstructorP(void);
 extern int UtcDaliItemFactoryNewP(void);
 extern int UtcDaliItemFactoryOperatorAssignmentP(void);
@@ -666,6 +674,14 @@ testcase tc_array[] = {
        {"UtcDaliButtonInitialAutoRepeatingDelayPropertyP",UtcDaliButtonInitialAutoRepeatingDelayPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonNextAutoRepeatingDelayPropertyP",UtcDaliButtonNextAutoRepeatingDelayPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonTogglablePropertyP",UtcDaliButtonTogglablePropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetUnselectedVisualP",UtcDaliButtonSetUnselectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetSelectedVisualP",UtcDaliButtonSetSelectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledSelectedVisualP",UtcDaliButtonSetDisabledSelectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledUnselectedVisualP",UtcDaliButtonSetDisabledUnselectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetUnselectedBackgroundVisualP",UtcDaliButtonSetUnselectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetSelectedBackgroundVisualP",UtcDaliButtonSetSelectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledUnselectedBackgroundVisualP",UtcDaliButtonSetDisabledUnselectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledSelectedBackgroundVisualP",UtcDaliButtonSetDisabledSelectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliItemFactoryConstructorP",UtcDaliItemFactoryConstructorP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_cleanup},
        {"UtcDaliItemFactoryNewP",UtcDaliItemFactoryNewP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_cleanup},
        {"UtcDaliItemFactoryOperatorAssignmentP",UtcDaliItemFactoryOperatorAssignmentP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_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 7489ab7078b5917c2def01845a6f5fe8b74907bd..da8d1507603bed3e345768a47a458535e693d3e2 100755 (executable)
--- a/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h
+++ b/src/utc/dali-toolkit/tct-dali-toolkit-core_wearable.h
@@ -170,6 +170,14 @@ extern int UtcDaliButtonAutoRepeatingPropertyP(void);
 extern int UtcDaliButtonInitialAutoRepeatingDelayPropertyP(void);
 extern int UtcDaliButtonNextAutoRepeatingDelayPropertyP(void);
 extern int UtcDaliButtonTogglablePropertyP(void);
+extern int UtcDaliButtonSetUnselectedVisualP(void);
+extern int UtcDaliButtonSetSelectedVisualP(void);
+extern int UtcDaliButtonSetDisabledSelectedVisualP(void);
+extern int UtcDaliButtonSetDisabledUnselectedVisualP(void);
+extern int UtcDaliButtonSetUnselectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetSelectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetDisabledUnselectedBackgroundVisualP(void);
+extern int UtcDaliButtonSetDisabledSelectedBackgroundVisualP(void);
 extern int UtcDaliItemFactoryConstructorP(void);
 extern int UtcDaliItemFactoryNewP(void);
 extern int UtcDaliItemFactoryOperatorAssignmentP(void);
@@ -670,6 +678,14 @@ testcase tc_array[] = {
        {"UtcDaliButtonInitialAutoRepeatingDelayPropertyP",UtcDaliButtonInitialAutoRepeatingDelayPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonNextAutoRepeatingDelayPropertyP",UtcDaliButtonNextAutoRepeatingDelayPropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliButtonTogglablePropertyP",UtcDaliButtonTogglablePropertyP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetUnselectedVisualP",UtcDaliButtonSetUnselectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetSelectedVisualP",UtcDaliButtonSetSelectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledSelectedVisualP",UtcDaliButtonSetDisabledSelectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledUnselectedVisualP",UtcDaliButtonSetDisabledUnselectedVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetUnselectedBackgroundVisualP",UtcDaliButtonSetUnselectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetSelectedBackgroundVisualP",UtcDaliButtonSetSelectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledUnselectedBackgroundVisualP",UtcDaliButtonSetDisabledUnselectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
+       {"UtcDaliButtonSetDisabledSelectedBackgroundVisualP",UtcDaliButtonSetDisabledSelectedBackgroundVisualP,utc_Dali_Button_startup,utc_Dali_Button_cleanup},
        {"UtcDaliItemFactoryConstructorP",UtcDaliItemFactoryConstructorP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_cleanup},
        {"UtcDaliItemFactoryNewP",UtcDaliItemFactoryNewP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_cleanup},
        {"UtcDaliItemFactoryOperatorAssignmentP",UtcDaliItemFactoryOperatorAssignmentP,utc_Dali_ItemFactory_startup,utc_Dali_ItemFactory_cleanup},