Updates following boost::function removal from adaptor

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-Button.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index fd5c491..3a6900e 100644 (file)
--- 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;
 }
 
@@ -133,7 +133,7 @@ int UtcDaliButtonSize(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliButtonSize");
 
-  ImageActor image01 = ImageActor::New(CreateBitmapImage());
+  ImageActor image01 = ImageActor::New(CreateBufferImage());
   image01.SetSize( 100, 50 );
 
   PushButton pushButton;