X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-unmanaged%2Futc-Dali-Button.cpp;h=a3a38124e851761d3109bce027287ad3547df2b0;hp=4d85f3fb3c6e96b8ab26c36bc3474058afbd7fa1;hb=dba1997566a1445e0c95459b998c39c9444f19be;hpb=998d982768c7f211d948cfd7921ec27ff739ce49

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
index 4d85f3f..a3a3812 100644
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
@@ -66,7 +66,7 @@ int UtcDaliButtonNew(void)
 
   CheckBoxButton checkBoxButton2( checkBoxButton );
   DALI_TEST_CHECK( checkBoxButton2 );
-  checkBoxButton2 = NULL;
+  checkBoxButton2.Reset();
 
 
   //Additional check to ensure object is created by checking if it's registered
@@ -105,11 +105,11 @@ int UtcDaliButtonProperties(void)
   PushButton pushButton = PushButton::New();
 
   //Test various properties
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("dimmed"), false );
-  DALI_TEST_CHECK( false == checkBoxButton.IsDimmed() );
+  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("disabled"), false );
+  DALI_TEST_CHECK( false == checkBoxButton.IsDisabled() );
 
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("dimmed"), true );
-  DALI_TEST_CHECK( true == checkBoxButton.IsDimmed() );
+  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("disabled"), true );
+  DALI_TEST_CHECK( true == checkBoxButton.IsDisabled() );
   END_TEST;
 }
 
@@ -119,17 +119,17 @@ int UtcDaliButtonSetGetDimmed(void)
   tet_infoline(" UtcDaliButtonSetGetDimmed");
 
   CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  checkBoxButton.SetDimmed( true );
+  checkBoxButton.SetDisabled( true );
 
-  DALI_TEST_CHECK( checkBoxButton.IsDimmed() );
-  checkBoxButton.SetDimmed( false );
+  DALI_TEST_CHECK( checkBoxButton.IsDisabled() );
+  checkBoxButton.SetDisabled( false );
 
-  DALI_TEST_CHECK( !checkBoxButton.IsDimmed() );
-  checkBoxButton.SetDimmed( true );
+  DALI_TEST_CHECK( !checkBoxButton.IsDisabled() );
+  checkBoxButton.SetDisabled( true );
 
-  DALI_TEST_CHECK( checkBoxButton.IsDimmed() );
-  checkBoxButton.SetDimmed( false );
+  DALI_TEST_CHECK( checkBoxButton.IsDisabled() );
+  checkBoxButton.SetDisabled( false );
 
-  DALI_TEST_CHECK( !checkBoxButton.IsDimmed() );
+  DALI_TEST_CHECK( !checkBoxButton.IsDisabled() );
   END_TEST;
 }