X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Button.cpp;h=b1c5386a202ac2beea4c1c5a3dc960f17755d4e7;hb=374298ffaa32c7c4bef9ba379d366e33588529c4;hp=73067bb638f382c10171ae919276abac4e3edbd3;hpb=7c1ca2d9ab3bc63f3dc164c4f5d4ea0d8bf5ba3e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index 73067bb..b1c5386 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -139,8 +139,6 @@ Dali::Integration::Point GetPointUpOutside()
   return point;
 }
 
-static float ANIMATION_TIME( 0.5f );
-
 } // namespace
 
 int UtcDaliButtonConstructorP(void)
@@ -277,7 +275,7 @@ int UtcDaliButtonSetDisabledWithDifferentStates02P(void)
   DALI_TEST_EQUALS( isSelected, SELECTED , TEST_LOCATION );
   tet_infoline("Set button to DISABLED = false whilst disabled and then set to unselected\n");
 
-  button.SetProperty( Button::Property::DISABLED, false );
+  button.SetProperty( Button::Property::DISABLED, false);
   button.SetProperty( Button::Property::SELECTED, !SELECTED );
 
   isSelected = button.GetProperty<bool>( Button::Property::SELECTED );
@@ -304,13 +302,13 @@ int UtcDaliButtonIsDisabledP(void)
 
   Button button = PushButton::New();
 
-  button.SetDisabled( true );
+  button.SetProperty( Button::Property::DISABLED, true);
 
-  DALI_TEST_CHECK( button.IsDisabled() );
+  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::DISABLED ), true, TEST_LOCATION );
 
-  button.SetDisabled( false );
+  button.SetProperty( Button::Property::DISABLED, false);
 
-  DALI_TEST_CHECK( !button.IsDisabled() );
+  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::DISABLED ), false, TEST_LOCATION );
   END_TEST;
 }
 
@@ -332,9 +330,6 @@ int UtcDaliButtonAutoRepeatingPropertyP(void)
 
   DALI_TEST_EQUALS( button.GetProperty<bool>( button.GetPropertyIndex("autoRepeating")), true, TEST_LOCATION );
 
-  button.SetAutoRepeating( false );
-
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
   END_TEST;
 }
 
@@ -344,13 +339,14 @@ int UtcDaliButtonIsAutoRepeatingP(void)
 
   Button button = PushButton::New();
 
-  button.SetAutoRepeating( true );
+  button.SetProperty( Button::Property::AUTO_REPEATING, true);
 
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
+  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::AUTO_REPEATING ), true, TEST_LOCATION );
 
-  button.SetAutoRepeating( false );
+  button.SetProperty( Button::Property::AUTO_REPEATING, false);
+
+  DALI_TEST_EQUALS( button.GetProperty<bool>( Button::Property::AUTO_REPEATING ), false, TEST_LOCATION );
 
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
   END_TEST;
 }
 
@@ -480,19 +476,6 @@ int UtcDaliButtonSelectedPropertyP(void)
   END_TEST;
 }
 
-int UtcDaliButtonSetAnimationTimeP(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliButtonSetAnimationTimeP");
-
-  Button button = PushButton::New();
-
-  button.SetAnimationTime( ANIMATION_TIME );
-
-  DALI_TEST_EQUALS( button.GetAnimationTime(), ANIMATION_TIME, TEST_LOCATION );
-  END_TEST;
-}
-
 int UtcDaliButtonSetLabelStringWithPropertyMapP(void)
 {
   ToolkitTestApplication application;
@@ -851,121 +834,6 @@ int UtcDaliButtonSetProperty(void)
   END_TEST;
 }
 
-// Deprecated API Tests
-
-int UtcDaliButtonSetDisabledP(void)
-{
-  ToolkitTestApplication application;
-
-  Button button = PushButton::New();
-
-  button.SetDisabled( true );
-
-  DALI_TEST_CHECK( button.IsDisabled() );
-
-  button.SetDisabled( false );
-
-  DALI_TEST_CHECK( !button.IsDisabled() );
-
-  button.SetDisabled( true );
-
-  DALI_TEST_CHECK( button.IsDisabled() );
-
-  button.SetDisabled( false );
-
-  DALI_TEST_CHECK( !button.IsDisabled() );
-  END_TEST;
-}
-
-int UtcDaliButtonSetAutoRepeatingP(void)
-{
-  ToolkitTestApplication application;
-
-  Button button = PushButton::New();
-
-  button.SetAutoRepeating( true );
-
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
-
-  button.SetAutoRepeating( false );
-
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
-
-  button.SetAutoRepeating( true );
-
-  DALI_TEST_CHECK( button.IsAutoRepeating() );
-
-  button.SetAutoRepeating( false );
-
-  DALI_TEST_CHECK( !button.IsAutoRepeating() );
-  END_TEST;
-}
-
-int UtcDaliButtonSetInitialAutoRepeatingDelayP(void)
-{
-  ToolkitTestApplication application;
-
-  Button button = PushButton::New();
-
-  button.SetInitialAutoRepeatingDelay( 0.5f );
-
-  DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.5f, TEST_LOCATION );
-
-  button.SetInitialAutoRepeatingDelay( 0.2f );
-
-  DALI_TEST_EQUALS( button.GetInitialAutoRepeatingDelay(), 0.2f, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliButtonSetNextAutoRepeatingDelayP(void)
-{
-  ToolkitTestApplication application;
-
-  Button button = PushButton::New();
-
-  button.SetNextAutoRepeatingDelay( 0.5f );
-
-  DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.5f, TEST_LOCATION );
-
-  button.SetProperty( Button::Property::NEXT_AUTO_REPEATING_DELAY, 0.2f );
-
-  DALI_TEST_EQUALS( button.GetNextAutoRepeatingDelay(), 0.2f, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliButtonSetTogglableButtonP(void)
-{
-  ToolkitTestApplication application;
-
-  Button button = PushButton::New();
-
-  button.SetTogglableButton( true );
-
-  DALI_TEST_CHECK( button.IsTogglableButton() );
-
-  button.SetTogglableButton( false );
-
-  DALI_TEST_CHECK( !button.IsTogglableButton() );
-  END_TEST;
-}
-
-int UtcDaliButtonSetSelectedP(void)
-{
-  ToolkitTestApplication application;
-
-  Button button = PushButton::New();
-  button.SetTogglableButton( true );
-
-  button.SetSelected( true );
-
-  DALI_TEST_CHECK( button.IsSelected() );
-
-  button.SetSelected( false );
-
-  DALI_TEST_CHECK( !button.IsSelected() );
-  END_TEST;
-}
-
 int UtcDaliButtonEventConsumption(void)
 {
   /**