X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Button.cpp;h=69948dff40cee09a970cfcd2707af20b43269154;hb=refs%2Ftags%2Faccepted%2Ftizen%2Fmobile%2F20150306.082341;hp=fd5c491bf5c0fb78da822b8705fc840d56651f7c;hpb=a881757839b7abb008873a68c67e17b3ba39669b;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 fd5c491..69948df 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -76,7 +76,7 @@ int UtcDaliButtonNew(void)
 
   DALI_TEST_CHECK( pushButton2 );
 
-   pushButton2 = NULL;
+  pushButton2.Reset();
 
   // Test down cast
   Handle handleButton;
@@ -96,10 +96,10 @@ int UtcDaliButtonSetProperty(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty(pushButton.GetPropertyIndex("dimmed"), false);
-  DALI_TEST_CHECK( false == pushButton.IsDimmed() );
-  pushButton.SetProperty(pushButton.GetPropertyIndex("dimmed"), true);
-  DALI_TEST_CHECK( true == pushButton.IsDimmed() );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), false);
+  DALI_TEST_CHECK( false == pushButton.IsDisabled() );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true);
+  DALI_TEST_CHECK( true == pushButton.IsDisabled() );
   END_TEST;
 }
 
@@ -110,21 +110,21 @@ int UtcDaliButtonSetGetDimmed(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetDimmed( true );
+  pushButton.SetDisabled( true );
 
-  DALI_TEST_CHECK( pushButton.IsDimmed() );
+  DALI_TEST_CHECK( pushButton.IsDisabled() );
 
-  pushButton.SetDimmed( false );
+  pushButton.SetDisabled( false );
 
-  DALI_TEST_CHECK( !pushButton.IsDimmed() );
+  DALI_TEST_CHECK( !pushButton.IsDisabled() );
 
-  pushButton.SetDimmed( true );
+  pushButton.SetDisabled( true );
 
-  DALI_TEST_CHECK( pushButton.IsDimmed() );
+  DALI_TEST_CHECK( pushButton.IsDisabled() );
 
-  pushButton.SetDimmed( false );
+  pushButton.SetDisabled( false );
 
-  DALI_TEST_CHECK( !pushButton.IsDimmed() );
+  DALI_TEST_CHECK( !pushButton.IsDisabled() );
   END_TEST;
 }